Skip to content

[stable11] Backport translation fixes #5760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 6 commits into from
Jul 20, 2017
Merged

[stable11] Backport translation fixes #5760

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
731dee4
Spelling: Shortening and binding
comradekingu Jul 14, 2017
5dc81ab
command-line, Consider narrowing
comradekingu Jul 14, 2017
eb52561
: Bigversal and LDAP
comradekingu Jul 14, 2017
f8a77fa
log out, : Bigversal
comradekingu Jul 14, 2017
ffcd20c
sent, an invitation, - successful
comradekingu Jul 14, 2017
9469c9d
: Bigversal
comradekingu Jul 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
: Bigversal
  • Loading branch information
@comradekingu @MorrisJobke
comradekingu authored and MorrisJobke committed Jul 18, 2017
commit 9469c9da697a58644332292c32a659fb0c3a03e0
4 changes: 2 additions & 2 deletions settings/js/apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,15 +367,15 @@ OC.Settings.Apps = OC.Settings.Apps || {
$.post(OC.webroot + '/index.php/disableapp', {appid: appId}, function() {
OC.Settings.Apps.showErrorMessage(
appId,
t('settings', 'Error: this app cannot be enabled because it makes the server unstable')
t('settings', 'Error: This app can not be enabled because it makes the server unstable')
);
appItem.data('errormsg', t('settings', 'Error while enabling app'));
element.val(t('settings','Enable'));
appItem.addClass('appwarning');
}).fail(function() {
OC.Settings.Apps.showErrorMessage(
appId,
t('settings', 'Error: could not disable broken app')
t('settings', 'Error: Could not disable broken app')
);
appItem.data('errormsg', t('settings', 'Error while disabling broken app'));
element.val(t('settings','Enable'));
Expand Down