diff options
| author | Qingping Hou <dave2008713@gmail.com> | 2013-02-25 17:16:03 -0500 |
|---|---|---|
| committer | Qingping Hou <dave2008713@gmail.com> | 2013-02-25 17:16:03 -0500 |
| commit | 195b52cb63eda3d8e3af6195058a0e1403e4dede (patch) | |
| tree | 4c79947d856f136051a84171eba913b1517a3bd1 /settings | |
| parent | c111a3aa248bee2bff22318c2a3d0da32ea0e451 (diff) | |
| parent | d713948d3f85a6e0a369bf1a9052ce563250e3da (diff) | |
| download | nextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.tar.gz nextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.zip | |
Merge branch 'master' of github.com:owncloud/core into issue_1776
Conflicts:
core/templates/layout.user.php
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/personal.js | 4 | ||||
| -rw-r--r-- | settings/l10n/he.php | 1 | ||||
| -rw-r--r-- | settings/l10n/my_MM.php | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js index 4c8b2542b56..d0a471e56b5 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -42,9 +42,9 @@ $(document).ready(function(){ $.post( 'ajax/changedisplayname.php', post, function(data){ if( data.status == "success" ){ $('#displaynamechanged').show(); - $('#oldDisplayName').val($('#displayName').val()); + $('#oldDisplayName').text($('#displayName').val()); // update displayName on the top right expand button - $('#expandDisplayName').html($('#displayName').val()); + $('#expandDisplayName').text($('#displayName').val()); } else{ $('#newdisplayname').val(data.data.displayName) diff --git a/settings/l10n/he.php b/settings/l10n/he.php index 20e97b3ffda..196dc4d146f 100644 --- a/settings/l10n/he.php +++ b/settings/l10n/he.php @@ -39,6 +39,7 @@ "Forum" => "פורום", "Commercial Support" => "תמיכה בתשלום", "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך", +"Get the apps to sync your files" => "השג את האפליקציות על מנת לסנכרן את הקבצים שלך", "Password" => "ססמה", "Your password was changed" => "הססמה שלך הוחלפה", "Unable to change your password" => "לא ניתן לשנות את הססמה שלך", diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php index de234d96437..a332c4d8ce9 100644 --- a/settings/l10n/my_MM.php +++ b/settings/l10n/my_MM.php @@ -1,3 +1,6 @@ <?php $TRANSLATIONS = array( -"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်" +"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်", +"Security Warning" => "လုံခြုံရေးသတိပေးချက်", +"Password" => "စကားဝှက်", +"New password" => "စကားဝှက်အသစ်" ); |