diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-02 10:11:18 +0200 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-02 10:11:18 +0200 |
commit | 8b08b1b455b474de3fa376dfafa3de63727364ea (patch) | |
tree | 536b2d4ba4f979d69f4f6e73755e06635345f78a /settings | |
parent | 084f76fd14125023d5b7277c558eb86a20ea07d3 (diff) | |
parent | 535ed8369f701a184340a428e82cc8d7cc7588bb (diff) | |
download | nextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.tar.gz nextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.zip |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/private/util.php
Diffstat (limited to 'settings')
-rw-r--r-- | settings/js/apps.js | 4 | ||||
-rw-r--r-- | settings/js/personal.js | 1 | ||||
-rw-r--r-- | settings/l10n/da.php | 6 | ||||
-rw-r--r-- | settings/l10n/fr.php | 3 | ||||
-rw-r--r-- | settings/l10n/hu_HU.php | 19 | ||||
-rw-r--r-- | settings/l10n/ja_JP.php | 9 | ||||
-rw-r--r-- | settings/l10n/lt_LT.php | 6 | ||||
-rw-r--r-- | settings/l10n/nn_NO.php | 14 | ||||
-rw-r--r-- | settings/l10n/pl.php | 7 | ||||
-rw-r--r-- | settings/l10n/sv.php | 13 | ||||
-rw-r--r-- | settings/l10n/uk.php | 4 |
11 files changed, 83 insertions, 3 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index 54810776d2b..a55c55e24cf 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -84,6 +84,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } else { appitem.data('active',false); + element.data('active',false); OC.Settings.Apps.removeNavigation(appid); appitem.removeClass('active'); element.val(t('settings','Enable')); @@ -104,6 +105,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } else { OC.Settings.Apps.addNavigation(appid); appitem.data('active',true); + element.data('active',true); appitem.addClass('active'); element.val(t('settings','Disable')); } @@ -158,7 +160,7 @@ OC.Settings.Apps = OC.Settings.Apps || { if(response.status === 'success'){ var navIds=response.nav_ids; for(var i=0; i< navIds.length; i++){ - $('#apps').children('li[data-id="'+navIds[i]+'"]').remove(); + $('#apps .wrapper').children('li[data-id="'+navIds[i]+'"]').remove(); } } }); diff --git a/settings/js/personal.js b/settings/js/personal.js index eaaca32f5d8..a923b475731 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -34,6 +34,7 @@ function changeDisplayName(){ $('#oldDisplayName').text($('#displayName').val()); // update displayName on the top right expand button $('#expandDisplayName').text($('#displayName').val()); + updateAvatar(); } else{ $('#newdisplayname').val(data.data.displayName); diff --git a/settings/l10n/da.php b/settings/l10n/da.php index 9872d3f5e07..f86559d6752 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Brugeren kan ikke tilføjes til gruppen %s", "Unable to remove user from group %s" => "Brugeren kan ikke fjernes fra gruppen %s", "Couldn't update app." => "Kunne ikke opdatere app'en.", +"Wrong password" => "Forkert kodeord", +"No user supplied" => "Intet brugernavn givet", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt", +"Wrong admin recovery password. Please check the password and try again." => "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.", +"Unable to change password" => "Kunne ikke ændre kodeord", "Update to {appversion}" => "Opdatér til {appversion}", "Disable" => "Deaktiver", "Enable" => "Aktiver", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 55c0e7fe9a8..10a7d764bc8 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -18,6 +18,9 @@ $TRANSLATIONS = array( "Couldn't update app." => "Impossible de mettre à jour l'application", "Wrong password" => "Mot de passe incorrect", "No user supplied" => "Aucun utilisateur fourni", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues", +"Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.", "Unable to change password" => "Impossible de modifier le mot de passe", "Update to {appversion}" => "Mettre à jour vers {appversion}", "Disable" => "Désactiver", diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php index f31826c149f..cba844e7818 100644 --- a/settings/l10n/hu_HU.php +++ b/settings/l10n/hu_HU.php @@ -16,15 +16,25 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "A felhasználó nem adható hozzá ehhez a csoporthoz: %s", "Unable to remove user from group %s" => "A felhasználó nem távolítható el ebből a csoportból: %s", "Couldn't update app." => "A program frissítése nem sikerült.", +"Wrong password" => "Hibás jelszó", +"No user supplied" => "Nincs felhasználó által mellékelve", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Add meg az admin helyreállító jelszót, máskülönben az összes felhasználói adat elveszik.", +"Wrong admin recovery password. Please check the password and try again." => "Hibás admin helyreállítási jelszó. Ellenörizd a jelszót és próbáld újra.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "A back-end nem támogatja a jelszó módosítást, de felhasználó titkosítási kulcsa sikeresen frissítve lett.", +"Unable to change password" => "Nem sikerült megváltoztatni a jelszót", "Update to {appversion}" => "Frissítés erre a verzióra: {appversion}", "Disable" => "Letiltás", "Enable" => "engedélyezve", "Please wait...." => "Kérem várjon...", +"Error while disabling app" => "Hiba az alkalmazás kikapcsolása közben", +"Error while enabling app" => "Hiba az alalmazás engedélyezése közben", "Updating...." => "Frissítés folyamatban...", "Error while updating app" => "Hiba történt a programfrissítés közben", "Error" => "Hiba", "Update" => "Frissítés", "Updated" => "Frissítve", +"Select a profile picture" => "Válassz profil képet", +"Decrypting files... Please wait, this can take some time." => "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ...", "Saving..." => "Mentés...", "deleted" => "törölve", "undo" => "visszavonás", @@ -98,11 +108,20 @@ $TRANSLATIONS = array( "Your email address" => "Az Ön email címe", "Fill in an email address to enable password recovery" => "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!", "Profile picture" => "Profilkép", +"Upload new" => "Új feltöltése", +"Select new from Files" => "Új kiválasztása Fileokból", +"Remove image" => "Kép eltávolítása", +"Either png or jpg. Ideally square but you will be able to crop it." => "Egyaránt png vagy jpg. Az ideális ha négyzet alaku, de késöbb még átszabható", +"Abort" => "Megszakítás", +"Choose as profile image" => "Válassz profil képet", "Language" => "Nyelv", "Help translate" => "Segítsen a fordításban!", "WebDAV" => "WebDAV", "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a címet használja, ha <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV-on keresztül szeretné elérni az állományait</a>", "Encryption" => "Titkosítás", +"The encryption app is no longer enabled, decrypt all your file" => "A titkosító alkalmzás a továbbiakban nincs engedélyezve, kititkosítja az összes fileodat", +"Log-in password" => "Bejelentkezési jelszó", +"Decrypt all Files" => "Kititkosítja az összes file-t", "Login Name" => "Bejelentkezési név", "Create" => "Létrehozás", "Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja", diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php index 12784e3f537..bfaa9827b21 100644 --- a/settings/l10n/ja_JP.php +++ b/settings/l10n/ja_JP.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "ユーザをグループ %s に追加できません", "Unable to remove user from group %s" => "ユーザをグループ %s から削除できません", "Couldn't update app." => "アプリを更新出来ませんでした。", +"Wrong password" => "無効なパスワード", +"No user supplied" => "ユーザが指定されていません", +"Please provide an admin recovery password, otherwise all user data will be lost" => "復元用の管理者パスワードを入力してください。そうでない場合は、全ユーザのデータが失われます。", +"Wrong admin recovery password. Please check the password and try again." => "無効な復元用の管理者パスワード。パスワードを確認して再度実行してください。", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザの暗号化キーは正常に更新されました。", +"Unable to change password" => "パスワードを変更できません", "Update to {appversion}" => "{appversion} に更新", "Disable" => "無効", "Enable" => "有効化", @@ -102,7 +108,10 @@ $TRANSLATIONS = array( "Your email address" => "あなたのメールアドレス", "Fill in an email address to enable password recovery" => "※パスワード回復を有効にするにはメールアドレスの入力が必要です", "Profile picture" => "プロフィール写真", +"Upload new" => "新規にアップロード", +"Select new from Files" => "ファイルから新規に選択", "Remove image" => "画像を削除", +"Either png or jpg. Ideally square but you will be able to crop it." => "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。", "Abort" => "中止", "Choose as profile image" => "プロファイル画像として選択", "Language" => "言語", diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php index a23d21ed7f7..df0247fc27e 100644 --- a/settings/l10n/lt_LT.php +++ b/settings/l10n/lt_LT.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Nepavyko pridėti vartotojo prie grupės %s", "Unable to remove user from group %s" => "Nepavyko ištrinti vartotojo iš grupės %s", "Couldn't update app." => "Nepavyko atnaujinti programos.", +"Wrong password" => "Neteisingas slaptažodis", +"No user supplied" => "Nepateiktas naudotojas", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti", +"Wrong admin recovery password. Please check the password and try again." => "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.", +"Unable to change password" => "Nepavyksta pakeisti slaptažodžio", "Update to {appversion}" => "Atnaujinti iki {appversion}", "Disable" => "Išjungti", "Enable" => "Įjungti", diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php index 822a17e7831..9eb31a887bd 100644 --- a/settings/l10n/nn_NO.php +++ b/settings/l10n/nn_NO.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Klarte ikkje leggja til brukaren til gruppa %s", "Unable to remove user from group %s" => "Klarte ikkje fjerna brukaren frå gruppa %s", "Couldn't update app." => "Klarte ikkje oppdatera programmet.", +"Wrong password" => "Feil passord", +"No user supplied" => "Ingen brukar gitt", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt.", +"Wrong admin recovery password. Please check the password and try again." => "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.", +"Unable to change password" => "Klarte ikkje å endra passordet", "Update to {appversion}" => "Oppdater til {appversion}", "Disable" => "Slå av", "Enable" => "Slå på", @@ -27,6 +33,7 @@ $TRANSLATIONS = array( "Error" => "Feil", "Update" => "Oppdater", "Updated" => "Oppdatert", +"Select a profile picture" => "Vel eit profilbilete", "Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.", "Saving..." => "Lagrar …", "deleted" => "sletta", @@ -100,6 +107,13 @@ $TRANSLATIONS = array( "Email" => "E-post", "Your email address" => "Di epost-adresse", "Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg", +"Profile picture" => "Profilbilete", +"Upload new" => "Last opp ny", +"Select new from Files" => "Vel ny frå Filer", +"Remove image" => "Fjern bilete", +"Either png or jpg. Ideally square but you will be able to crop it." => "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det.", +"Abort" => "Avbryt", +"Choose as profile image" => "Vel som profilbilete", "Language" => "Språk", "Help translate" => "Hjelp oss å omsetja", "WebDAV" => "WebDAV", diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php index d07d1f7a4d2..6cce72df4b6 100644 --- a/settings/l10n/pl.php +++ b/settings/l10n/pl.php @@ -16,6 +16,8 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Nie można dodać użytkownika do grupy %s", "Unable to remove user from group %s" => "Nie można usunąć użytkownika z grupy %s", "Couldn't update app." => "Nie można uaktualnić aplikacji.", +"Wrong password" => "Złe hasło", +"Unable to change password" => "Nie można zmienić hasła", "Update to {appversion}" => "Aktualizacja do {appversion}", "Disable" => "Wyłącz", "Enable" => "Włącz", @@ -27,6 +29,7 @@ $TRANSLATIONS = array( "Error" => "Błąd", "Update" => "Aktualizuj", "Updated" => "Zaktualizowano", +"Select a profile picture" => "Wybierz zdjęcie profilu", "Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.", "Saving..." => "Zapisywanie...", "deleted" => "usunięto", @@ -101,7 +104,11 @@ $TRANSLATIONS = array( "Your email address" => "Twój adres e-mail", "Fill in an email address to enable password recovery" => "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła", "Profile picture" => "Zdjęcie profilu", +"Upload new" => "Wczytaj nowe", +"Select new from Files" => "Wybierz nowe z plików", +"Remove image" => "Usuń zdjęcie", "Abort" => "Anuluj", +"Choose as profile image" => "Wybierz zdjęcie profilu", "Language" => "Język", "Help translate" => "Pomóż w tłumaczeniu", "WebDAV" => "WebDAV", diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php index 5f6313f1829..4f8ad376db7 100644 --- a/settings/l10n/sv.php +++ b/settings/l10n/sv.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Kan inte lägga till användare i gruppen %s", "Unable to remove user from group %s" => "Kan inte radera användare från gruppen %s", "Couldn't update app." => "Kunde inte uppdatera appen.", +"Wrong password" => "Fel lösenord", +"No user supplied" => "Ingen användare angiven", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras", +"Wrong admin recovery password. Please check the password and try again." => "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.", +"Unable to change password" => "Kunde inte ändra lösenord", "Update to {appversion}" => "Uppdatera till {appversion}", "Disable" => "Deaktivera", "Enable" => "Aktivera", @@ -27,6 +33,7 @@ $TRANSLATIONS = array( "Error" => "Fel", "Update" => "Uppdatera", "Updated" => "Uppdaterad", +"Select a profile picture" => "Välj en profilbild", "Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.", "Saving..." => "Sparar...", "deleted" => "raderad", @@ -101,6 +108,12 @@ $TRANSLATIONS = array( "Your email address" => "Din e-postadress", "Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord", "Profile picture" => "Profilbild", +"Upload new" => "Ladda upp ny", +"Select new from Files" => "Välj ny från filer", +"Remove image" => "Radera bild", +"Either png or jpg. Ideally square but you will be able to crop it." => "Antingen png eller jpg. Helst fyrkantig, men du kommer att kunna beskära den.", +"Abort" => "Avbryt", +"Choose as profile image" => "Välj som profilbild", "Language" => "Språk", "Help translate" => "Hjälp att översätta", "WebDAV" => "WebDAV", diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php index 314b7de6574..adb46e3ee84 100644 --- a/settings/l10n/uk.php +++ b/settings/l10n/uk.php @@ -2,7 +2,7 @@ $TRANSLATIONS = array( "Unable to load list from App Store" => "Не вдалося завантажити список з App Store", "Authentication error" => "Помилка автентифікації", -"Unable to change display name" => "Не вдалося змінити зображене ім'я", +"Unable to change display name" => "Не вдалося змінити ім'я", "Group already exists" => "Група вже існує", "Unable to add group" => "Не вдалося додати групу", "Email saved" => "Адресу збережено", @@ -97,7 +97,7 @@ $TRANSLATIONS = array( "Other" => "Інше", "Username" => "Ім'я користувача", "Storage" => "Сховище", -"change display name" => "змінити зображене ім'я", +"change display name" => "змінити ім'я", "set new password" => "встановити новий пароль", "Default" => "За замовчуванням" ); |