diff options
author | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 20:53:45 +0200 |
---|---|---|
committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 20:53:45 +0200 |
commit | 27fcdb3af5d1b1012695a09e04c0a654a1dde710 (patch) | |
tree | 6de492454c862852de3f51bd8834e2012139b5ac | |
parent | 46e5e9bd73a68f7b50bb79f883a8bc6efacaca97 (diff) | |
parent | 3584d48d65900b15dc3ef6831926f4a52e508625 (diff) | |
download | nextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.tar.gz nextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.zip |
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/tests/crypt.php
753 files changed, 8757 insertions, 4945 deletions
diff --git a/.gitignore b/.gitignore index fe89c74ab38..68977ad0775 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ config/mount.php apps/inc.php # ignore all apps except core ones -apps/* +apps* !apps/files !apps/files_encryption !apps/files_external @@ -76,4 +76,4 @@ nbproject data-autotest /tests/coverage* /tests/autoconfig* -/tests/autotest*
\ No newline at end of file +/tests/autotest* diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php index 05ab1722b3e..99739cb4cee 100644 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -20,4 +20,4 @@ OC_Search::registerProvider('OC_Search_Provider_File'); \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook'); \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook'); -\OC_BackgroundJob_RegularTask::register('\OC\Files\Cache\BackgroundWatcher', 'checkNext'); +\OCP\BackgroundJob::addRegularTask('\OC\Files\Cache\BackgroundWatcher', 'checkNext'); diff --git a/apps/files/css/files.css b/apps/files/css/files.css index f788949b1b6..108dcd741c6 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -63,8 +63,12 @@ } #filestable { position: relative; top:37px; width:100%; } tbody tr { background-color:#fff; height:2.5em; } -tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; } -tbody tr.selected { background-color:#eee; } +tbody tr:hover, tbody tr:active { + background-color: rgb(240,240,240); +} +tbody tr.selected { + background-color: rgb(230,230,230); +} tbody a { color:#000; } span.extension, span.uploading, td.date { color:#999; } span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; } @@ -81,7 +85,12 @@ table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text- /* Multiselect bar */ #filestable.multiselect { top:63px; } table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 64px; width:100%; } -table.multiselect thead th { background:rgba(230,230,230,.8); color:#000; font-weight:bold; border-bottom:0; } +table.multiselect thead th { + background-color: rgba(210,210,210,.7); + color: #000; + font-weight: bold; + border-bottom: 0; +} table.multiselect #headerName { width: 100%; } table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; } table td.filename a.name { display:block; height:1.5em; vertical-align:middle; margin-left:3em; } @@ -115,10 +124,12 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; } } #fileList .name { position:relative; /* Firefox needs to explicitly have this default set … */ } #fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */ - background:rgba(248,248,248,.9); box-shadow:-5px 0 7px rgba(248,248,248,.9); + background-color: rgba(240,240,240,0.898); + box-shadow: -5px 0 7px rgba(240,240,240,0.898); } #fileList tr.selected:hover .fileactions, #fileList tr.mouseOver .fileactions { /* slightly darker color for selected rows */ - background:rgba(238,238,238,.9); box-shadow:-5px 0 7px rgba(238,238,238,.9); + background-color: rgba(230,230,230,.9); + box-shadow: -5px 0 7px rgba(230,230,230,.9); } #fileList .fileactions a.action img { position:relative; top:.2em; } #fileList a.action { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; } diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index c24d1fd8244..e19a35bbc5b 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -51,7 +51,7 @@ var FileList={ }else{ simpleSize=t('files', 'Pending'); } - var sizeColor = Math.round(200-Math.pow((size/(1024*1024)),2)); + var sizeColor = Math.round(160-Math.pow((size/(1024*1024)),2)); var lastModifiedTime = Math.round(lastModified.getTime() / 1000); td = $('<td></td>').attr({ "class": "filesize", diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index de6a1542421..8c6b6372655 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} složky", "1 file" => "1 soubor", "{count} files" => "{count} soubory", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Název složky nelze použÃt. Použità názvu 'Shared' je ownCloudem rezervováno", "Unable to rename file" => "Nelze pÅ™ejmenovat soubor", "Upload" => "Odeslat", "File handling" => "Zacházenà se soubory", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index bcc3a4c6c9d..e9a6ad6bdef 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} Ordner", "1 file" => "1 Datei", "{count} files" => "{count} Dateien", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen", "Unable to rename file" => "Konnte Datei nicht umbenennen", "Upload" => "Hochladen", "File handling" => "Dateibehandlung", diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php index 963f25ebedc..b15c7a56499 100644 --- a/apps/files/l10n/he.php +++ b/apps/files/l10n/he.php @@ -1,4 +1,6 @@ <?php $TRANSLATIONS = array( +"Could not move %s - File with this name already exists" => "×œ× × ×™×ª×Ÿ להעביר ×ת %s - קובץ ×‘×©× ×”×–×” כבר ×§×™×™×", +"Could not move %s" => "×œ× × ×™×ª×Ÿ להעביר ×ת %s", "No file was uploaded. Unknown error" => "×œ× ×”×•×¢×œ×” קובץ. טעות בלתי מזוהה.", "There is no error, the file uploaded with success" => "×œ× ×”×ª×¨×—×©×” שגי××”, הקובץ הועלה בהצלחה", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "×”×§×‘×¦×™× ×©× ×©×œ×—×• ×—×•×¨×’×™× ×ž×”×’×•×“×œ שצוין בהגדרה upload_max_filesize שבקובץ php.ini:", @@ -7,6 +9,8 @@ "No file was uploaded" => "×©×•× ×§×•×‘×¥ ×œ× ×”×•×¢×œ×”", "Missing a temporary folder" => "תקיה ×–×ž× ×™×ª חסרה", "Failed to write to disk" => "הכתיבה ×œ×›×•× ×Ÿ × ×›×©×œ×”", +"Not enough storage available" => "×ין די שטח ×¤× ×•×™ ב×חסון", +"Invalid directory." => "תיקייה שגויה.", "Files" => "קבצי×", "Share" => "שתף", "Delete permanently" => "מחק לצמיתות", @@ -19,7 +23,9 @@ "cancel" => "ביטול", "replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}", "undo" => "ביטול", +"perform delete operation" => "ביצוע פעולת מחיקה", "1 file uploading" => "קובץ ×חד × ×©×œ×—", +"files uploading" => "×§×‘×¦×™× ×‘×”×¢×œ××”", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "×”×©× ×©×’×•×™, ×סור להשתמש ×‘×ª×•×•×™× '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.", "Unable to upload your file as it is a directory or has 0 bytes" => "×œ× ×™×›×•×œ להעלות ×ת הקובץ מכיוון שזו תקיה ×ו שמשקל הקובץ 0 בתי×", "Upload cancelled." => "ההעל××” בוטלה.", @@ -33,6 +39,7 @@ "{count} folders" => "{count} תיקיות", "1 file" => "קובץ ×חד", "{count} files" => "{count} קבצי×", +"Unable to rename file" => "×œ× × ×™×ª×Ÿ ×œ×©× ×•×ª ×ת ×©× ×”×§×•×‘×¥", "Upload" => "העל××”", "File handling" => "טיפול בקבצי×", "Maximum upload size" => "גודל העל××” מקסימלי", diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php new file mode 100644 index 00000000000..df57abe28b6 --- /dev/null +++ b/apps/files/l10n/hi.php @@ -0,0 +1,4 @@ +<?php $TRANSLATIONS = array( +"Share" => "साà¤à¤¾ करें", +"Save" => "सहेजें" +); diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php index 3e2ea80c949..5938521beab 100644 --- a/apps/files/l10n/lt_LT.php +++ b/apps/files/l10n/lt_LT.php @@ -1,12 +1,19 @@ <?php $TRANSLATIONS = array( +"Could not move %s - File with this name already exists" => "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja", +"Could not move %s" => "Nepavyko perkelti %s", +"No file was uploaded. Unknown error" => "Failai nebuvo įkelti dÄ—l nežinomos priežasties", "There is no error, the file uploaded with success" => "Failas įkeltas sÄ—kmingai, be klaidų", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Ä®keliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ä®keliamo failo dydis virÅ¡ija MAX_FILE_SIZE nustatymÄ…, kuris naudojamas HTML formoje.", "The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai", "No file was uploaded" => "Nebuvo įkeltas joks failas", "Missing a temporary folder" => "NÄ—ra laikinojo katalogo", "Failed to write to disk" => "Nepavyko įraÅ¡yti į diskÄ…", +"Not enough storage available" => "Nepakanka vietos serveryje", +"Invalid directory." => "Neteisingas aplankas", "Files" => "Failai", "Share" => "Dalintis", +"Delete permanently" => "IÅ¡trinti negrįžtamai", "Delete" => "IÅ¡trinti", "Rename" => "Pervadinti", "Pending" => "Laukiantis", @@ -16,10 +23,21 @@ "cancel" => "atÅ¡aukti", "replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}", "undo" => "anuliuoti", +"perform delete operation" => "iÅ¡trinti", "1 file uploading" => "įkeliamas 1 failas", +"files uploading" => "įkeliami failai", +"'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.", +"File name cannot be empty." => "Failo pavadinimas negali bÅ«ti tuÅ¡Äias.", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.", +"Your storage is full, files can not be updated or synced anymore!" => "JÅ«sų visa vieta serveryje užimta", +"Your storage is almost full ({usedSpacePercent}%)" => "JÅ«sų vieta serveryje beveik visa užimta ({usedSpacePercent}%)", +"Your download is being prepared. This might take some time if the files are big." => "JÅ«sų atsisiuntimas yra paruoÅ¡iamas. tai gali užtrukti jei atsisiunÄiamas didelis failas.", "Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali bÅ«ti 0 bitų arba tai katalogas", +"Not enough space available" => "Nepakanka vietos", "Upload cancelled." => "Ä®kÄ—limas atÅ¡auktas.", "File upload is in progress. Leaving the page now will cancel the upload." => "Failo įkÄ—limas pradÄ—tas. Jei paliksite šį puslapį, įkÄ—limas nutrÅ«ks.", +"URL cannot be empty." => "URL negali bÅ«ti tuÅ¡Äias.", +"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud", "Error" => "Klaida", "Name" => "Pavadinimas", "Size" => "Dydis", @@ -28,6 +46,8 @@ "{count} folders" => "{count} aplankalai", "1 file" => "1 failas", "{count} files" => "{count} failai", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud", +"Unable to rename file" => "Nepavyko pervadinti failo", "Upload" => "Ä®kelti", "File handling" => "Failų tvarkymas", "Maximum upload size" => "Maksimalus įkeliamo failo dydis", @@ -40,12 +60,16 @@ "New" => "Naujas", "Text file" => "Teksto failas", "Folder" => "Katalogas", +"From link" => "IÅ¡ nuorodos", +"Deleted files" => "IÅ¡trinti failai", "Cancel upload" => "AtÅ¡aukti siuntimÄ…", +"You don’t have write permissions here." => "JÅ«s neturite raÅ¡ymo leidimo.", "Nothing in here. Upload something!" => "ÄŒia tuÅ¡Äia. Ä®kelkite kÄ… nors!", "Download" => "Atsisiųsti", "Unshare" => "Nebesidalinti", "Upload too large" => "Ä®kÄ—limui failas per didelis", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis virÅ¡ija maksimalų, kuris leidžiamas Å¡iame serveryje", "Files are being scanned, please wait." => "Skenuojami failai, praÅ¡ome palaukti.", -"Current scanning" => "Å iuo metu skenuojama" +"Current scanning" => "Å iuo metu skenuojama", +"Upgrading filesystem cache..." => "Atnaujinamas sistemos keÅ¡avimas..." ); diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 83412bf2be8..43a8dc70080 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} папок", "1 file" => "1 файл", "{count} files" => "{count} файлов", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ðеправильное Ð¸Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°. Ð˜Ð¼Ñ 'Shared' зарезервировано.", "Unable to rename file" => "Ðевозможно переименовать файл", "Upload" => "Загрузка", "File handling" => "Управление файлами", diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index 82d169d569c..171c95f7a0b 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} mappar", "1 file" => "1 fil", "{count} files" => "{count} filer", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud", "Unable to rename file" => "Kan inte byta namn pÃ¥ filen", "Upload" => "Ladda upp", "File handling" => "Filhantering", diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 1719d25e660..1e94275dcba 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -3,12 +3,12 @@ <?php foreach($_['files'] as $file): $simple_file_size = OCP\simple_file_size($file['size']); // the bigger the file, the darker the shade of grey; megabytes*2 - $simple_size_color = intval(200-$file['size']/(1024*1024)*2); + $simple_size_color = intval(160-$file['size']/(1024*1024)*2); if($simple_size_color<0) $simple_size_color = 0; $relative_modified_date = OCP\relative_modified_date($file['mtime']); // the older the file, the brighter the shade of grey; days*14 $relative_date_color = round((time()-$file['mtime'])/60/60/24*14); - if($relative_date_color>200) $relative_date_color = 200; + if($relative_date_color>160) $relative_date_color = 160; $name = rawurlencode($file['name']); $name = str_replace('%2F', '/', $name); $directory = rawurlencode($file['directory']); diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index f823999dcb0..94fc19fae2a 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -142,6 +142,15 @@ class Hooks { }
/**
+ * @brief If the password can't be changed within ownCloud, than update the key password in advance.
+ */
+ public static function preSetPassphrase($params) {
+ if ( ! \OC_User::canUserChangePassword($params['uid']) ) {
+ self::setPassphrase($params);
+ }
+ }
+
+ /**
* @brief Change a user's encryption passphrase
* @param array $params keys: uid, password
*/
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php index 46e91d1f070..5db1d7e58c5 100644 --- a/apps/files_encryption/l10n/ca.php +++ b/apps/files_encryption/l10n/ca.php @@ -1,4 +1,22 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "La clau de recuperació s'ha activat", +"Could not enable recovery key. Please check your recovery key password!" => "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!", +"Recovery key successfully disabled" => "La clau de recuperació s'ha descativat", +"Could not disable recovery key. Please check your recovery key password!" => "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!", +"Password successfully changed." => "La contrasenya s'ha canviat.", +"Could not change the password. Maybe the old password was not correct." => "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.", "Saving..." => "Desant...", -"Encryption" => "Xifrat" +"Encryption" => "Xifrat", +"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activa la clau de recuperació de contrasenya (permet compartir la clau de recuperació):", +"Recovery account password" => "Contrasenya de recuperació del compte", +"Enabled" => "Activat", +"Disabled" => "Desactivat", +"Change encryption passwords recovery key:" => "Canvia la clau de recuperació de la contrasenya:", +"Old Recovery account password" => "Contrasenya de recuperació anterior", +"New Recovery account password" => "Nova contrasenya de recuperació de compte", +"Change Password" => "Canvia la contrasenya", +"Enable password recovery by sharing all files with your administrator:" => "Activa la recuperació de contrasenya compartint tots els fitxers amb l'administrador:", +"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Activant aquesta opció us permetrà obtenir de nou accés als fitxers encriptats si perdeu la contrasenya", +"File recovery settings updated" => "S'han actualitzat els arranjaments de recuperació de fitxers", +"Could not update file recovery" => "No s'ha pogut actualitzar la recuperació de fitxers" ); diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php index f9b2dd06b6f..e8c365972ca 100644 --- a/apps/files_encryption/l10n/cs_CZ.php +++ b/apps/files_encryption/l10n/cs_CZ.php @@ -1,4 +1,22 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "Záchranný klÃÄ byl úspěšnÄ› povolen", +"Could not enable recovery key. Please check your recovery key password!" => "NepodaÅ™ilo se povolit záchranný klÃÄ. Zkontrolujte prosÃm vaÅ¡e heslo záchranného klÃÄe!", +"Recovery key successfully disabled" => "Záchranný klÃÄ byl úspěšnÄ› zakázán", +"Could not disable recovery key. Please check your recovery key password!" => "Nelze zakázat záchranný klÃÄ. Zkontrolujte prosÃm heslo vaÅ¡eho záchranného klÃÄe.", +"Password successfully changed." => "Heslo bylo úspěšnÄ› zmÄ›nÄ›no.", +"Could not change the password. Maybe the old password was not correct." => "Nelze zmÄ›nit heslo. PravdÄ›podobnÄ› nebylo stávajÃcà heslo zadáno správnÄ›.", "Saving..." => "Ukládám...", -"Encryption" => "Å ifrovánÃ" +"Encryption" => "Å ifrovánÃ", +"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Povolit záchranný klÃÄ Å¡ifrovacÃch hesel (povolà sdÃlený záchranný klÃÄ):", +"Recovery account password" => "Heslo pro obnovu úÄtu", +"Enabled" => "Povoleno", +"Disabled" => "Zakázáno", +"Change encryption passwords recovery key:" => "ZmÄ›nit záchranný klÃÄ Å¡ifrovacÃch hesel:", +"Old Recovery account password" => "StávajÃcà heslo pro obnovu úÄtu", +"New Recovery account password" => "Nové heslo pro obnovu úÄtu", +"Change Password" => "ZmÄ›nit heslo", +"Enable password recovery by sharing all files with your administrator:" => "Povolit obnovu hesla sdÃlenÃm vÅ¡ech souborů s vaÅ¡Ãm správcem:", +"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Povolenà vám umožnà znovu zÃskat pÅ™Ãstup k vaÅ¡im zaÅ¡ifrovaným souborům pokud ztratÃte heslo", +"File recovery settings updated" => "Možnosti obnovy souborů aktualizovány", +"Could not update file recovery" => "Nelze aktualizovat obnovu souborů" ); diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php index 2ab77f480cf..18fe7df6487 100644 --- a/apps/files_encryption/l10n/de.php +++ b/apps/files_encryption/l10n/de.php @@ -1,4 +1,17 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "Wiederherstellungsschlüssel wurde erfolgreich aktiviert", +"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!", +"Recovery key successfully disabled" => "Wiederherstellungsschlüssel deaktiviert.", +"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!", +"Password successfully changed." => "Dein Passwort wurde geändert.", +"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.", "Saving..." => "Speichern...", -"Encryption" => "Verschlüsselung" +"Encryption" => "Verschlüsselung", +"Recovery account password" => "Password zurücksetzen", +"Enabled" => "Aktiviert", +"Disabled" => "Deaktiviert", +"Change encryption passwords recovery key:" => "Wiederherstellungsschlüssel für Passwörter ändern:", +"Change Password" => "Passwort ändern", +"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Wenn Sie diese Einstellung aktivieren, können Sie auch im Falle des Verlustes Ihres Passworts auf verschlüsselte Dateien zugreifen", +"File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert" ); diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php index 5ab283ccab3..48bf3a89a24 100644 --- a/apps/files_encryption/l10n/de_DE.php +++ b/apps/files_encryption/l10n/de_DE.php @@ -1,9 +1,20 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.", +"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!", +"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.", +"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!", "Password successfully changed." => "Das Passwort wurde erfolgreich geändert.", "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.", "Saving..." => "Speichern...", "Encryption" => "Verschlüsselung", +"Recovery account password" => "Account-Passwort wiederherstellen", "Enabled" => "Aktiviert", "Disabled" => "Deaktiviert", -"Change Password" => "Passwort ändern" +"Old Recovery account password" => "Altes Passwort für die Account-Wiederherstellung", +"New Recovery account password" => "Neues Passwort für die Account-Wiederherstellung", +"Change Password" => "Passwort ändern", +"Enable password recovery by sharing all files with your administrator:" => "Aktiviere die Wiederherstellung deines Passwortes durch das Teilen aller Dateien mit dem Administrator:", +"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.", +"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.", +"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden." ); diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php index 7067799cd2e..c73fbf56462 100644 --- a/apps/files_encryption/l10n/el.php +++ b/apps/files_encryption/l10n/el.php @@ -1,4 +1,12 @@ <?php $TRANSLATIONS = array( +"Password successfully changed." => "Ο κωδικός αλλάχτηκε επιτυχώς.", +"Could not change the password. Maybe the old password was not correct." => "Αποτυχία αλλαγής ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î¯ÏƒÏ‰Ï‚ ο παλιός κωδικός να μην ήταν σωστός.", "Saving..." => "Γίνεται αποθήκευση...", -"Encryption" => "ΚÏυπτογÏάφηση" +"Encryption" => "ΚÏυπτογÏάφηση", +"Recovery account password" => "ΕπαναφοÏά ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης λογαÏιασμοÏ", +"Enabled" => "ΕνεÏγοποιημÎνο", +"Disabled" => "ΑπενεÏγοποιημÎνο", +"Change Password" => "Αλλαγή ÎšÏ‰Î´Î¹ÎºÎ¿Ï Î Ïόσβασης", +"Enable password recovery by sharing all files with your administrator:" => "ΕνεÏγοποιήστε την επαναφοÏά ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης με το να μοιÏαστείτε όλα τα αÏχεία με τον διαχειÏιστή σας:", +"File recovery settings updated" => "Οι Ïυθμίσεις επαναφοÏάς αÏχείων ανανεώθηκαν" ); diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php index 7311a78f09b..58adbd716a8 100644 --- a/apps/files_encryption/l10n/es.php +++ b/apps/files_encryption/l10n/es.php @@ -1,4 +1,22 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos", +"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.", +"Recovery key successfully disabled" => "Clave de recuperación deshabilitada", +"Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!", +"Password successfully changed." => "Su contraseña ha sido cambiada", +"Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.", "Saving..." => "Guardando...", -"Encryption" => "Cifrado" +"Encryption" => "Cifrado", +"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Habilitar clave de recuperación de contraseñas ():", +"Recovery account password" => "Recuperar contraseña", +"Enabled" => "Habilitar", +"Disabled" => "Deshabilitado", +"Change encryption passwords recovery key:" => "Cambiar clave de cifrado de contraseñas:", +"Old Recovery account password" => "Contraseña de recuperación actual", +"New Recovery account password" => "Contraseña de recuperación nueva", +"Change Password" => "Cambiar contraseña", +"Enable password recovery by sharing all files with your administrator:" => "Habilitar recuperación de contraseña compartiendo todos los archivos con su administrador", +"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Habilitar esta opción para poder acceder a sus archivos cifrados si pierde su contraseña", +"File recovery settings updated" => "Opciones de recuperación de archivos actualizada", +"Could not update file recovery" => "No se pudo actualizar la recuperación de archivos" ); diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php index 98fb70691df..af4fd1a893f 100644 --- a/apps/files_encryption/l10n/fr.php +++ b/apps/files_encryption/l10n/fr.php @@ -1,4 +1,22 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "Clé de récupération activée avec succès", +"Could not enable recovery key. Please check your recovery key password!" => "Ne peut pas activer la clé de récupération. s'il vous plait vérifiez votre mot de passe de clé de récupération!", +"Recovery key successfully disabled" => "Clé de récupération désactivée avc succès", +"Could not disable recovery key. Please check your recovery key password!" => "Ne peut pas désactiver la clé de récupération. S'il vous plait vérifiez votre mot de passe de clé de récupération!", +"Password successfully changed." => "Mot de passe changé avec succès ", +"Could not change the password. Maybe the old password was not correct." => "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.", "Saving..." => "Enregistrement...", -"Encryption" => "Chiffrement" +"Encryption" => "Chiffrement", +"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activer la clé de récupération par mots de passe de cryptage (autoriser le partage de la clé de récupération) ", +"Recovery account password" => "Rétablissement du compte mot de passe ", +"Enabled" => "Activer", +"Disabled" => "Désactiver", +"Change encryption passwords recovery key:" => "Changer les mots de passe de cryptage par la clé de récupération", +"Old Recovery account password" => "Ancien compte de récupération de mots de passe", +"New Recovery account password" => "Nouveau compte de récupération de mots de passe", +"Change Password" => "Changer de mot de passe", +"Enable password recovery by sharing all files with your administrator:" => "Activer la récupération des mots de passe en partageant les fichiers avec votre administrateur:", +"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "En activant cette option cela vous autorisera à récupérer votre accès aux fichiers cryptés si votre mot de passe est perdu", +"File recovery settings updated" => "Mise à jour des paramètres de récupération de fichiers ", +"Could not update file recovery" => "Ne peut pas remettre à jour les fichiers de récupération" ); diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php index 7f906ae5c03..6d2d3e249c0 100644 --- a/apps/files_encryption/l10n/ja_JP.php +++ b/apps/files_encryption/l10n/ja_JP.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "リカãƒãƒªç”¨ã®ã‚ãƒ¼ã¯æ£å¸¸ã«æœ‰åŠ¹åŒ–ã•れã¾ã—ãŸ", +"Could not enable recovery key. Please check your recovery key password!" => "リカãƒãƒªç”¨ã®ã‚ーを有効ã«ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚リカãƒãƒªç”¨ã®ã‚ーã®ãƒ‘スワードを確èªã—ã¦ä¸‹ã•ã„ï¼", +"Recovery key successfully disabled" => "リカãƒãƒªç”¨ã®ã‚ーをæ£å¸¸ã«ç„¡åŠ¹åŒ–ã—ã¾ã—ãŸ", +"Could not disable recovery key. Please check your recovery key password!" => "リカãƒãƒªç”¨ã®ã‚ーを無効化ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚リカãƒãƒªç”¨ã®ã‚ーã®ãƒ‘スワードを確èªã—ã¦ä¸‹ã•ã„ï¼", "Password successfully changed." => "パスワードを変更ã§ãã¾ã—ãŸã€‚", "Could not change the password. Maybe the old password was not correct." => "パスワードを変更ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚å¤ã„パスワードãŒé–“é•ã£ã¦ã„ã‚‹ã‹ã‚‚ã—れã¾ã›ã‚“。", "Saving..." => "ä¿å˜ä¸...", diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php index 6bc80ff44ab..8e9d02c3b13 100644 --- a/apps/files_encryption/l10n/lt_LT.php +++ b/apps/files_encryption/l10n/lt_LT.php @@ -1,4 +1,22 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "AtkÅ«rimo raktas sÄ—kmingai įjungtas", +"Could not enable recovery key. Please check your recovery key password!" => "Neišėjo įjungti jÅ«sų atkÅ«rimo rakto. PraÅ¡ome jį patikrinti!", +"Recovery key successfully disabled" => "AtkÅ«rimo raktas sÄ—kmingai iÅ¡jungtas", +"Could not disable recovery key. Please check your recovery key password!" => "Neišėjo iÅ¡jungti jÅ«sų atkÅ«rimo rakto. PraÅ¡ome jį patikrinti!", +"Password successfully changed." => "Slaptažodis sÄ—kmingai pakeistas", +"Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali bÅ«ti, kad buvo neteisingai suvestas senasis.", "Saving..." => "Saugoma...", -"Encryption" => "Å ifravimas" +"Encryption" => "Å ifravimas", +"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Ä®jungti Å¡ifravimo slaptažodžio atstatymo raktÄ… (leidžia dalintis su atstatymo raktu):", +"Recovery account password" => "Atstatymo vartotojo slaptažodis", +"Enabled" => "Ä®jungta", +"Disabled" => "IÅ¡jungta", +"Change encryption passwords recovery key:" => "Pakeisti Å¡ifravimo slaptažodžio atstatymo raktÄ…:", +"Old Recovery account password" => "Seno atstatymo vartotojo slaptažodis", +"New Recovery account password" => "naujo atstatymo vartotojo slaptažodis", +"Change Password" => "Pakeisti slaptažodį", +"Enable password recovery by sharing all files with your administrator:" => "Ä®jungti slaptažodžio atkÅ«rimÄ… dalinantis visais failas su administratoriumi:", +"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ä®jungus Å¡iÄ… funkcijÄ… jums bus suteiktas priÄ—jimas prie Å¡ifruotos informacijos ir pamirÅ¡us slaptažodį.", +"File recovery settings updated" => "Failų atstatymo nustatymai pakeisti", +"Could not update file recovery" => "Neišėjo atnaujinti failų atkÅ«rimo" ); diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php index ebcbdfab15f..9c462917cf3 100644 --- a/apps/files_encryption/l10n/nl.php +++ b/apps/files_encryption/l10n/nl.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "Herstelsleutel succesvol geactiveerd", +"Could not enable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!", +"Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd", +"Could not disable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!", "Password successfully changed." => "Wachtwoord succesvol gewijzigd.", "Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.", "Saving..." => "Opslaan", diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php index ce8814c233e..e5fa0b55cad 100644 --- a/apps/files_encryption/l10n/pt_BR.php +++ b/apps/files_encryption/l10n/pt_BR.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "Recuperação de chave habilitada com sucesso", +"Could not enable recovery key. Please check your recovery key password!" => "ImpossÃvel habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!", +"Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso", +"Could not disable recovery key. Please check your recovery key password!" => "ImpossÃvel desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!", "Password successfully changed." => "Senha alterada com sucesso.", "Could not change the password. Maybe the old password was not correct." => "Não foi possÃvel alterar a senha. Talvez a senha antiga não estava correta.", "Saving..." => "Salvando...", diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php index e1bb17ecaa7..eede4804cf6 100644 --- a/apps/files_encryption/l10n/pt_PT.php +++ b/apps/files_encryption/l10n/pt_PT.php @@ -1,9 +1,22 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "Chave de recuperação activada com sucesso", +"Could not enable recovery key. Please check your recovery key password!" => "Não foi possÃvel activar a chave de recuperação. Por favor verifique a password da chave de recuperação!", +"Recovery key successfully disabled" => "Chave de recuperação descativada com sucesso", +"Could not disable recovery key. Please check your recovery key password!" => "Não foi possÃvel desactivar a chave de recuperação. Por favor verifique a password da chave de recuperação.", "Password successfully changed." => "Password alterada com sucesso.", "Could not change the password. Maybe the old password was not correct." => "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta.", "Saving..." => "A guardar...", "Encryption" => "Encriptação", +"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave de recuperação das passwords de encriptação (permitir partilha da chave de recuperação):", +"Recovery account password" => "Password de recuperação de conta", "Enabled" => "Activado", "Disabled" => "Desactivado", -"Change Password" => "Mudar a Password" +"Change encryption passwords recovery key:" => "Alterar a chave de recuperação da password de encriptação:", +"Old Recovery account password" => "Password de recuperação de conta antiga:", +"New Recovery account password" => "Nova password de recuperação de conta", +"Change Password" => "Mudar a Password", +"Enable password recovery by sharing all files with your administrator:" => "Activar a recuperação de password ao partilhar todos os ficheiros com o administrador:", +"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Activar esta opção, tornar-lhe-a possÃvel a obtenção de acesso aos seus ficheiros encriptados caso perca a password.", +"File recovery settings updated" => "Actualizadas as definições de recuperação de ficheiros", +"Could not update file recovery" => "Não foi possÃvel actualizar a recuperação de ficheiros" ); diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php index 966963b5549..efcfc105073 100644 --- a/apps/files_encryption/l10n/sv.php +++ b/apps/files_encryption/l10n/sv.php @@ -1,4 +1,22 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "Ã…terställningsnyckeln har framgÃ¥ngsrikt aktiverats", +"Could not enable recovery key. Please check your recovery key password!" => "Kunde inte aktivera Ã¥terställningsnyckeln. Vänligen kontrollera ditt lösenord för Ã¥terställningsnyckeln!", +"Recovery key successfully disabled" => "Ã…terställningsnyckeln har framgÃ¥ngsrikt inaktiverats", +"Could not disable recovery key. Please check your recovery key password!" => "Kunde inte inaktivera Ã¥terställningsnyckeln. Vänligen kontrollera ditt lösenord för Ã¥terställningsnyckeln!", +"Password successfully changed." => "Ändringen av lösenordet lyckades.", +"Could not change the password. Maybe the old password was not correct." => "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.", "Saving..." => "Sparar...", -"Encryption" => "Kryptering" +"Encryption" => "Kryptering", +"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Aktivera Ã¥terställningsnyckel för krypterade lösenord. (tillÃ¥t delning till Ã¥terställningsnyckeln):", +"Recovery account password" => "Ã…terställning av kontolösenord", +"Enabled" => "Aktiverad", +"Disabled" => "Inaktiverad", +"Change encryption passwords recovery key:" => "Ändra Ã¥terställningsnyckeln för krypterade lösenord:", +"Old Recovery account password" => "Gamla lösenordet för Ã¥terställningskontot", +"New Recovery account password" => "Nytt Ã¥terställningslösenord för kontot", +"Change Password" => "Byt lösenord", +"Enable password recovery by sharing all files with your administrator:" => "Aktivera lösenordsÃ¥terställning genom att dela alla filer med din administratör:", +"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Aktivera det här alternativet för att kunna Ã¥terfÃ¥ tillgÃ¥ng till dina krypterade filer om du skulle förlora/glömma ditt lösenord", +"File recovery settings updated" => "Inställningarna för filÃ¥terställning har uppdaterats", +"Could not update file recovery" => "Kunde inte uppdatera filÃ¥terställning" ); diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php index 917ff0a0eae..fc0847ed85d 100644 --- a/apps/files_encryption/l10n/tr.php +++ b/apps/files_encryption/l10n/tr.php @@ -1,4 +1,22 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "Kurtarma anahtarı baÅŸarıyla etkinleÅŸtirildi", +"Could not enable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı etkinleÅŸtirilemedi. Lütfen kurtarma anahtarı parolanızı kontrol edin!", +"Recovery key successfully disabled" => "Kurtarma anahtarı baÅŸarıyla devre dışı bırakıldı", +"Could not disable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!", +"Password successfully changed." => "Åžifreniz baÅŸarıyla deÄŸiÅŸtirildi.", +"Could not change the password. Maybe the old password was not correct." => "Parola deÄŸiÅŸtirilemedi. Eski parolanız doÄŸru olmayabilir", "Saving..." => "Kaydediliyor...", -"Encryption" => "Åžifreleme" +"Encryption" => "Åžifreleme", +"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Åžifreli parola kurtarma anahtarını etkinleÅŸtir(kurtarma anahtarı paylaşımına izin ver)", +"Recovery account password" => "Kurtarma hesabı parolası", +"Enabled" => "EtkinleÅŸtirildi", +"Disabled" => "Devre dışı", +"Change encryption passwords recovery key:" => "Åžifreli parolalar kurtarma anahtarını deÄŸiÅŸtir:", +"Old Recovery account password" => "Eski kurtarma hesabı parolası", +"New Recovery account password" => "Yeni kurtarma hesabı parolası", +"Change Password" => "Parola deÄŸiÅŸtir", +"Enable password recovery by sharing all files with your administrator:" => "Parola kurtarmasını tüm paylaşılan dosyaları sistem yöneticiniz ile paylaÅŸarak kurtarmayı etkinleÅŸtir:", +"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Bu seçeneÄŸi etkinleÅŸtirmekle eÄŸer parolanızı kaybederseniz ÅŸifreli dosyalara eriÅŸimi elde etmiÅŸ olursunuz", +"File recovery settings updated" => "Dosya kurtarma ayarları güncellendi", +"Could not update file recovery" => "Dosya kurtarma güncellenemedi" ); diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php index 0af5bdc9a67..3e76060b1de 100644 --- a/apps/files_encryption/l10n/vi.php +++ b/apps/files_encryption/l10n/vi.php @@ -1,4 +1,10 @@ <?php $TRANSLATIONS = array( +"Password successfully changed." => "Äã đổi máºt khẩu.", +"Could not change the password. Maybe the old password was not correct." => "Không thể đổi máºt khẩu. Có lẽ do máºt khẩu cÅ© không đúng.", "Saving..." => "Äang lưu...", -"Encryption" => "Mã hóa" +"Encryption" => "Mã hóa", +"Recovery account password" => "Máºt khẩu cho tà i khoản cứu há»™", +"Enabled" => "Báºt", +"Disabled" => "Tắt", +"Change Password" => "Äổi Máºt khẩu" ); diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php index e565fce801c..59582e6fd52 100644 --- a/apps/files_encryption/l10n/zh_CN.php +++ b/apps/files_encryption/l10n/zh_CN.php @@ -1,4 +1,22 @@ <?php $TRANSLATIONS = array( +"Recovery key successfully enabled" => "æ¢å¤å¯†é’¥æˆåŠŸå¯ç”¨", +"Could not enable recovery key. Please check your recovery key password!" => "ä¸èƒ½å¯ç”¨æ¢å¤å¯†é’¥ã€‚请检查æ¢å¤å¯†é’¥å¯†ç ï¼", +"Recovery key successfully disabled" => "æ¢å¤å¯†é’¥æˆåŠŸç¦ç”¨", +"Could not disable recovery key. Please check your recovery key password!" => "ä¸èƒ½ç¦ç”¨æ¢å¤å¯†é’¥ã€‚请检查æ¢å¤å¯†é’¥å¯†ç ï¼", +"Password successfully changed." => "密ç 修改æˆåŠŸã€‚", +"Could not change the password. Maybe the old password was not correct." => "ä¸èƒ½ä¿®æ”¹å¯†ç 。旧密ç å¯èƒ½ä¸æ£ç¡®ã€‚", "Saving..." => "ä¿å˜ä¸", -"Encryption" => "åŠ å¯†" +"Encryption" => "åŠ å¯†", +"Enable encryption passwords recovery key (allow sharing to recovery key):" => "å¯ç”¨åŠ å¯†å¯†ç æ¢å¤å¯†é’¥ï¼ˆå…许共享æ¢å¤å¯†é’¥ï¼‰ï¼š", +"Recovery account password" => "æ¢å¤è´¦æˆ·å¯†ç ", +"Enabled" => "å¼€å¯", +"Disabled" => "ç¦ç”¨", +"Change encryption passwords recovery key:" => "å˜æ›´åŠ å¯†å¯†ç æ¢å¤å¯†é’¥ï¼š", +"Old Recovery account password" => "æ—§æ¢å¤è´¦å·å¯†ç ", +"New Recovery account password" => "æ–°æ¢å¤è´¦å·å¯†ç ", +"Change Password" => "修改密ç ", +"Enable password recovery by sharing all files with your administrator:" => "通过与系统管ç†å‘˜å…±äº«å…¨éƒ¨æ–‡ä»¶å¯ç”¨å¯†ç æ¢å¤ï¼š", +"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "å¯ç”¨è¯¥é€‰é¡¹å°†å…è®¸ä½ ä¸¢å¤±å¯†ç æ—¶é‡æ–°å–å¾—åŠ å¯†è¿‡çš„æ–‡ä»¶ã€‚", +"File recovery settings updated" => "文件æ¢å¤è®¾ç½®å·²æ›´æ–°", +"Could not update file recovery" => "ä¸èƒ½æ›´æ–°æ–‡ä»¶æ¢å¤" ); diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php index e078ab35541..184e1782494 100755 --- a/apps/files_encryption/lib/helper.php +++ b/apps/files_encryption/lib/helper.php @@ -48,6 +48,7 @@ class Helper { \OCP\Util::connectHook('OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login'); \OCP\Util::connectHook('OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase'); + \OCP\Util::connectHook('OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'preSetPassphrase'); \OCP\Util::connectHook('OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser'); \OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser'); } diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index 3d85edf9841..6d720a3ff49 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -289,7 +289,7 @@ class Util { */ public function recoveryEnabledForUser() { - $sql = 'SELECT `recovery_enabled` FROM `*PREFIX*encryption` WHERE uid = ?'; + $sql = 'SELECT `recovery_enabled` FROM `*PREFIX*encryption` WHERE `uid` = ?'; $args = array($this->userId); @@ -347,7 +347,7 @@ class Util { // Create a new record instead } else { - $sql = 'UPDATE `*PREFIX*encryption` SET recovery_enabled = ? WHERE uid = ?'; + $sql = 'UPDATE `*PREFIX*encryption` SET `recovery_enabled` = ? WHERE `uid` = ?'; $args = array( $enabled, @@ -1048,7 +1048,7 @@ class Util { */ public function setMigrationStatus($status) { - $sql = 'UPDATE `*PREFIX*encryption` SET migration_status = ? WHERE uid = ?'; + $sql = 'UPDATE `*PREFIX*encryption` SET `migration_status` = ? WHERE `uid` = ?'; $args = array( $status, @@ -1077,7 +1077,7 @@ class Util { */ public function getMigrationStatus() { - $sql = 'SELECT `migration_status` FROM `*PREFIX*encryption` WHERE uid = ?'; + $sql = 'SELECT `migration_status` FROM `*PREFIX*encryption` WHERE `uid` = ?'; $args = array($this->userId); diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php index e153a49a2c7..341904b1189 100755 --- a/apps/files_encryption/tests/crypt.php +++ b/apps/files_encryption/tests/crypt.php @@ -103,6 +103,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { \OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1); } + /** + * @medium + */ function testGenerateKey() { # TODO: use more accurate (larger) string length for test confirmation @@ -114,6 +117,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @large * @return String */ function testGenerateIv() { @@ -127,6 +131,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @large * @depends testGenerateIv */ function testConcatIv($iv) { @@ -159,6 +164,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @medium * @depends testConcatIv */ function testSplitIv($testConcatIv) { @@ -175,6 +181,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @medium * @return string padded */ function testAddPadding() { @@ -190,6 +197,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @medium * @depends testAddPadding */ function testRemovePadding($padded) { @@ -200,6 +208,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } + /** + * @medium + */ function testEncrypt() { $random = openssl_random_pseudo_bytes(13); @@ -212,6 +223,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } + /** + * @medium + */ function testDecrypt() { $random = openssl_random_pseudo_bytes(13); @@ -226,6 +240,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } + /** + * @medium + */ function testSymmetricEncryptFileContent() { # TODO: search in keyfile for actual content as IV will ensure this test always passes @@ -241,6 +258,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } + /** + * @medium + */ function testSymmetricStreamEncryptShortFileContent() { $filename = 'tmp-' . time() . '.test'; @@ -291,6 +311,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief Test that data that is written by the crypto stream wrapper * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual @@ -377,6 +398,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief Test that data that is read by the crypto stream wrapper */ function testSymmetricStreamDecryptShortFileContent() { @@ -406,6 +428,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $this->view->unlink($this->userId . '/files/' . $filename); } + /** + * @medium + */ function testSymmetricStreamDecryptLongFileContent() { $filename = 'tmp-' . time(); @@ -425,6 +450,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $this->view->unlink($this->userId . '/files/' . $filename); } + /** + * @medium + */ function testSymmetricEncryptFileContentKeyfile() { # TODO: search in keyfile for actual content as IV will ensure this test always passes @@ -440,6 +468,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } + /** + * @medium + */ function testIsEncryptedContent() { $this->assertFalse(Encryption\Crypt::isCatfileContent($this->dataUrl)); @@ -452,6 +483,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } + /** + * @large + */ function testMultiKeyEncrypt() { # TODO: search in keyfile for actual content as IV will ensure this test always passes @@ -476,6 +510,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } + /** + * @medium + */ function testKeyEncrypt() { // Generate keypair @@ -494,6 +531,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief test encryption using legacy blowfish method */ function testLegacyEncryptShort() { @@ -510,6 +548,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief test decryption using legacy blowfish method * @depends testLegacyEncryptShort */ @@ -522,6 +561,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief test encryption using legacy blowfish method */ function testLegacyEncryptLong() { @@ -538,6 +578,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief test decryption using legacy blowfish method * @depends testLegacyEncryptLong */ @@ -551,6 +592,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief test generation of legacy encryption key * @depends testLegacyDecryptShort */ @@ -569,6 +611,27 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { } + /** + * @medium + * @brief test decryption using legacy blowfish method + * @depends testLegacyEncryptLong + */ + function testLegacyKeyRecryptKeyfileEncrypt($crypted) { + + $recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey)); + + $this->assertNotEquals($this->dataLong, $recrypted['data']); + + return $recrypted; + + # TODO: search inencrypted text for actual content to ensure it + # genuine transformation + + } + + /** + * @medium + */ function testRenameFile() { $filename = 'tmp-' . time(); @@ -597,6 +660,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $view->unlink($newFilename); } + /** + * @medium + */ function testMoveFileIntoFolder() { $filename = 'tmp-' . time(); @@ -627,6 +693,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $view->unlink($newFolder); } + /** + * @medium + */ function testMoveFolder() { $view = new \OC\Files\View('/' . $this->userId . '/files'); @@ -662,6 +731,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $view->unlink('/newfolder'); } + /** + * @medium + */ function testChangePassphrase() { $filename = 'tmp-' . time(); @@ -696,6 +768,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $view->unlink($filename); } + /** + * @medium + */ function testViewFilePutAndGetContents() { $filename = '/tmp-' . time(); @@ -727,6 +802,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $view->unlink($filename); } + /** + * @large + */ function testTouchExistingFile() { $filename = '/tmp-' . time(); $view = new \OC\Files\View('/' . $this->userId . '/files'); @@ -748,6 +826,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $view->unlink($filename); } + /** + * @medium + */ function testTouchFile() { $filename = '/tmp-' . time(); $view = new \OC\Files\View('/' . $this->userId . '/files'); @@ -769,6 +850,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $view->unlink($filename); } + /** + * @medium + */ function testFopenFile() { $filename = '/tmp-' . time(); $view = new \OC\Files\View('/' . $this->userId . '/files'); diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php index 40ae1659a55..19ba9a8117f 100644 --- a/apps/files_encryption/tests/keymanager.php +++ b/apps/files_encryption/tests/keymanager.php @@ -103,6 +103,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { \OC_FileProxy::$enabled = true; } + /** + * @medium + */ function testGetPrivateKey() { $key = Encryption\Keymanager::getPrivateKey($this->view, $this->userId); @@ -119,6 +122,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { } + /** + * @medium + */ function testGetPublicKey() { $publiceKey = Encryption\Keymanager::getPublicKey($this->view, $this->userId); @@ -132,6 +138,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { $this->assertArrayHasKey('key', $sslInfo); } + /** + * @medium + */ function testSetFileKey() { # NOTE: This cannot be tested until we are able to break out @@ -165,6 +174,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { } + /** + * @medium + */ function testGetUserKeys() { $keys = Encryption\Keymanager::getUserKeys($this->view, $this->userId); @@ -188,6 +200,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { $this->assertArrayHasKey('key', $sslInfoPrivate); } + /** + * @medium + */ function testFixPartialFilePath() { $partFilename = 'testfile.txt.part'; @@ -202,6 +217,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { $this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($filename)); } + /** + * @medium + */ function testRecursiveDelShareKeys() { // generate filename diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php index 6d92881ceb0..15dd5058ebb 100755 --- a/apps/files_encryption/tests/share.php +++ b/apps/files_encryption/tests/share.php @@ -129,6 +129,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { } /** + * @medium * @param bool $withTeardown */ function testShareFile($withTeardown = true) { @@ -205,6 +206,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { } /** + * @medium * @param bool $withTeardown */ function testReShareFile($withTeardown = true) { @@ -275,6 +277,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { } /** + * @medium * @param bool $withTeardown * @return array */ @@ -363,6 +366,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { } /** + * @medium * @param bool $withTeardown */ function testReShareFolder($withTeardown = true) { @@ -534,7 +538,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { // some hacking to simulate public link $GLOBALS['app'] = 'files_sharing'; $GLOBALS['fileOwner'] = \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1; - \OC_User::setUserId(''); + \OC_User::setUserId(false); // get file contents $retrievedCryptedFile = file_get_contents('crypt://' . $this->filename); @@ -564,6 +568,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { . $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey')); } + /** + * @medium + */ function testShareFileWithGroup() { // login as admin \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1); @@ -639,6 +646,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { } + /** + * @large + */ function testRecoveryFile() { // login as admin \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1); @@ -741,6 +751,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { $this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')); } + /** + * @large + */ function testRecoveryForUser() { // login as admin \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1); @@ -837,6 +850,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { $this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')); } + /** + * @medium + */ function testFailShareFile() { // login as admin \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1); diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php index 3d978767542..50ac41e4536 100644 --- a/apps/files_encryption/tests/stream.php +++ b/apps/files_encryption/tests/stream.php @@ -140,6 +140,9 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase { $view->unlink($filename); } + /** + * @medium + */ function testStreamSetTimeout() { $filename = '/tmp-' . time(); $view = new \OC\Files\View('/' . $this->userId . '/files'); diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php index 29f8fb5a396..ade968fbece 100755 --- a/apps/files_encryption/tests/trashbin.php +++ b/apps/files_encryption/tests/trashbin.php @@ -113,6 +113,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief test delete file */ function testDeleteFile() { @@ -184,6 +185,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief test restore file * * @depends testDeleteFile @@ -215,6 +217,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief test delete file forever */ function testPermanentDeleteFile() { diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php index b36d7e41172..b945fb4c0f3 100755 --- a/apps/files_encryption/tests/util.php +++ b/apps/files_encryption/tests/util.php @@ -118,6 +118,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief test that paths set during User construction are correct */ function testKeyPaths() { @@ -132,6 +133,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief test setup of encryption directories */ function testSetupServerSide() { @@ -139,6 +141,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { } /** + * @medium * @brief test checking whether account is ready for encryption, */ function testUserIsReady() { @@ -159,6 +162,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { // } /** + * @medium * @brief test checking whether account is not ready for encryption, */ function testIsLegacyUser() { @@ -186,6 +190,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { $this->assertEquals($this->legacyKey, \OC::$session->get('legacyKey')); } + /** + * @medium + */ function testRecoveryEnabledForUser() { $util = new Encryption\Util($this->view, $this->userId); @@ -206,6 +213,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { } + /** + * @medium + */ function testGetUidAndFilename() { \OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1); @@ -232,6 +242,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { $this->view->unlink($this->userId . '/files/' . $filename); } + /** + * @medium + */ function testIsSharedPath() { $sharedPath = '/user1/files/Shared/test'; $path = '/user1/files/test'; @@ -241,6 +254,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { $this->assertFalse($this->util->isSharedPath($path)); } + /** + * @large + */ function testEncryptLegacyFiles() { \Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER); diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php index 43fd6752c4a..ae349bfcd3a 100644 --- a/apps/files_external/ajax/addRootCertificate.php +++ b/apps/files_external/ajax/addRootCertificate.php @@ -29,8 +29,12 @@ if ($isValid == false) { // add the certificate if it could be verified if ( $isValid ) { + // disable proxy to prevent multiple fopen calls + $proxyStatus = \OC_FileProxy::$enabled; + \OC_FileProxy::$enabled = false; $view->file_put_contents($filename, $data); OC_Mount_Config::createCertificateBundle(); + \OC_FileProxy::$enabled = $proxyStatus; } else { OCP\Util::writeLog('files_external', 'Couldn\'t import SSL root certificate ('.$filename.'), allowed formats: PEM and DER', diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index ac408786ff6..3e605c59a93 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -88,7 +88,7 @@ OC.MountConfig={ url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), data: { mountPoint: mountPoint, - class: backendClass, + 'class': backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, @@ -103,7 +103,7 @@ OC.MountConfig={ url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), data: { mountPoint: mountPoint, - class: backendClass, + 'class': backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, @@ -247,15 +247,18 @@ $(document).ready(function() { OC.MountConfig.saveStorage($(this).parent().parent()); }); + $('#sslCertificate').on('click', 'td.remove>img', function() { + var $tr = $(this).parent().parent(); + var row = this.parentNode.parentNode; + $.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), {cert: row.id}); + $tr.remove(); + return true; + }); + $('#externalStorage').on('click', 'td.remove>img', function() { var tr = $(this).parent().parent(); var mountPoint = $(tr).find('.mountPoint input').val(); - if ( ! mountPoint) { - var row=this.parentNode.parentNode; - $.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), { cert: row.id }); - $(tr).remove(); - return true; - } + if ($('#externalStorage').data('admin') === true) { var isPersonal = false; var multiselect = $(tr).find('.chzn-select').val(); diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php index 45d3589228f..80e68ab6e06 100644 --- a/apps/files_external/l10n/sv.php +++ b/apps/files_external/l10n/sv.php @@ -6,6 +6,7 @@ "Error configuring Google Drive storage" => "Fel vid konfigurering av Google Drive", "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Varning:</b> \"smb-klienten\" är inte installerad. Montering av CIFS/SMB delningar är inte möjligt. Kontakta din systemadministratör för att fÃ¥ den installerad.", "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Varning:</b> Stöd för FTP i PHP är inte aktiverat eller installerat. Montering av FTP-delningar är inte möjligt. Kontakta din systemadministratör för att fÃ¥ det installerat.", +"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Varning:<b> Curl-stöd i PHP är inte aktiverat eller installerat. Montering av ownCloud / WebDAV eller GoogleDrive är inte möjligt. Vänligen be din administratör att installera det.", "External Storage" => "Extern lagring", "Folder name" => "Mappnamn", "External storage" => "Extern lagring", diff --git a/apps/files_external/l10n/zh_CN.GB2312.php b/apps/files_external/l10n/zh_CN.GB2312.php index c74323db175..47298f8007d 100644 --- a/apps/files_external/l10n/zh_CN.GB2312.php +++ b/apps/files_external/l10n/zh_CN.GB2312.php @@ -6,6 +6,7 @@ "Error configuring Google Drive storage" => "é…ç½® Google Drive å˜å‚¨å¤±è´¥", "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>注æ„:</b>“SMBå®¢æˆ·ç«¯â€æœªå®‰è£…。CIFS/SMB分享ä¸å¯ç”¨ã€‚è¯·å‘æ‚¨çš„系统管ç†å‘˜è¯·æ±‚安装该客户端。", "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>注æ„:</b>PHPçš„FTP支æŒå°šæœªå¯ç”¨æˆ–未安装。FTP分享ä¸å¯ç”¨ã€‚è¯·å‘æ‚¨çš„系统管ç†å‘˜è¯·æ±‚安装。", +"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>è¦å‘Šï¼š</b> PHP çš„ Curl æ”¯æŒæ²¡æœ‰å®‰è£…或打开。挂载 ownCloudã€WebDAV 或 Google Drive 的功能将ä¸å¯ç”¨ã€‚请询问您的系统管ç†å‘˜åŽ»å®‰è£…å®ƒã€‚", "External Storage" => "外部å˜å‚¨", "Folder name" => "文件夹å", "External storage" => "外部å˜å‚¨", diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index 655c3c9a816..81a6c956385 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -57,12 +57,22 @@ class SMB extends \OC\Files\Storage\StreamWrapper{ public function stat($path) { if ( ! $path and $this->root=='/') {//mtime doesn't work for shares - $mtime=$this->shareMTime(); $stat=stat($this->constructUrl($path)); + if (empty($stat)) { + return false; + } + $mtime=$this->shareMTime(); $stat['mtime']=$mtime; return $stat; } else { - return stat($this->constructUrl($path)); + $stat = stat($this->constructUrl($path)); + + // smb4php can return an empty array if the connection could not be established + if (empty($stat)) { + return false; + } + + return $stat; } } diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php index 1d4f30c713d..bac594b485f 100644 --- a/apps/files_external/tests/config.php +++ b/apps/files_external/tests/config.php @@ -1,4 +1,13 @@ <?php + +// in case there are private configurations in the users home -> use them +$privateConfigFile = $_SERVER['HOME'] . '/owncloud-extfs-test-config.php'; +if (file_exists($privateConfigFile)) { + $config = include($privateConfigFile); + return $config; +} + +// this is now more a template now for your private configurations return array( 'ftp'=>array( 'run'=>false, diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php index 96ab48cd2c5..40ed115599f 100644 --- a/apps/files_sharing/l10n/lt_LT.php +++ b/apps/files_sharing/l10n/lt_LT.php @@ -1,6 +1,9 @@ <?php $TRANSLATIONS = array( "Password" => "Slaptažodis", "Submit" => "IÅ¡saugoti", +"%s shared the folder %s with you" => "%s pasidalino su jumis %s aplanku", +"%s shared the file %s with you" => "%s pasidalino su jumis %s failu", "Download" => "Atsisiųsti", +"No preview available for" => "PeržiÅ«ra nÄ—ra galima", "web services under your control" => "jÅ«sų valdomos web paslaugos" ); diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php index 288518e1a41..1e0953b013a 100644 --- a/apps/files_trashbin/l10n/bg_BG.php +++ b/apps/files_trashbin/l10n/bg_BG.php @@ -1,5 +1,5 @@ <?php $TRANSLATIONS = array( -"Couldn't delete %s permanently" => "Ðевъзможно изтриване на %s завинаги", +"Couldn't delete %s permanently" => "Ðевъзможно перманентното изтриване на %s", "Couldn't restore %s" => "Ðевъзможно възтановÑване на %s", "perform restore operation" => "извършване на дейÑтвие по възÑтановÑване", "Error" => "Грешка", diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php index e31fdb952ea..853d4e1925a 100644 --- a/apps/files_trashbin/l10n/he.php +++ b/apps/files_trashbin/l10n/he.php @@ -1,17 +1,18 @@ <?php $TRANSLATIONS = array( -"Couldn't delete %s permanently" => "בלתי ×פשרי למחוק ×ת %s לצמיתות", -"Couldn't restore %s" => "בלתי ×פשרי לשחזר ×ת %s", -"perform restore operation" => "בצע פעולת שחזור", +"Couldn't delete %s permanently" => "×œ× × ×™×ª×Ÿ למחוק ×ת %s לצמיתות", +"Couldn't restore %s" => "×œ× × ×™×ª×Ÿ לשחזר ×ת %s", +"perform restore operation" => "ביצוע פעולת שחזור", "Error" => "שגי××”", -"delete file permanently" => "מחק קובץ לצמיתות", -"Delete permanently" => "מחק לצמיתות", +"delete file permanently" => "מחיקת קובץ לצמיתות", +"Delete permanently" => "מחיקה לצמיתות", "Name" => "ש×", "Deleted" => "× ×ž×—×§", "1 folder" => "תיקייה ×חת", "{count} folders" => "{count} תיקיות", "1 file" => "קובץ ×חד", "{count} files" => "{count} קבצי×", -"Nothing in here. Your trash bin is empty!" => "×©×•× ×“×‘×¨ ×›×ן. סל המחזור שלך ריק!", -"Restore" => "שחזר", -"Delete" => "מחיקה" +"Nothing in here. Your trash bin is empty!" => "×ין ×›×ן ×©×•× ×“×‘×¨. סל המיחזור שלך ריק!", +"Restore" => "שחזור", +"Delete" => "מחיקה", +"Deleted Files" => "×§×‘×¦×™× ×©× ×ž×—×§×•" ); diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php index 011de161e42..7df63bd7f28 100644 --- a/apps/files_trashbin/l10n/lt_LT.php +++ b/apps/files_trashbin/l10n/lt_LT.php @@ -1,9 +1,18 @@ <?php $TRANSLATIONS = array( +"Couldn't delete %s permanently" => "Nepavyko negrįžtamai iÅ¡trinti %s", +"Couldn't restore %s" => "Nepavyko atkurti %s", +"perform restore operation" => "atkurti", "Error" => "Klaida", +"delete file permanently" => "failÄ… iÅ¡trinti negrįžtamai", +"Delete permanently" => "IÅ¡trinti negrįžtamai", "Name" => "Pavadinimas", +"Deleted" => "IÅ¡trinti", "1 folder" => "1 aplankalas", "{count} folders" => "{count} aplankalai", "1 file" => "1 failas", "{count} files" => "{count} failai", -"Delete" => "IÅ¡trinti" +"Nothing in here. Your trash bin is empty!" => "Nieko nÄ—ra. JÅ«sų Å¡iukÅ¡liadėžė tuÅ¡Äia!", +"Restore" => "Atstatyti", +"Delete" => "IÅ¡trinti", +"Deleted Files" => "IÅ¡trinti failai" ); diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php index ad2e261d539..577389eb081 100644 --- a/apps/files_versions/l10n/he.php +++ b/apps/files_versions/l10n/he.php @@ -1,3 +1,11 @@ <?php $TRANSLATIONS = array( -"Versions" => "גרס×ות" +"Could not revert: %s" => "×œ× × ×™×ª×Ÿ להחזיר: %s", +"success" => "הושל×", +"File %s was reverted to version %s" => "הקובץ %s הוחזר לגרסה %s", +"failure" => "× ×›×©×œ", +"File %s could not be reverted to version %s" => "×œ× × ×™×ª×Ÿ להחזיר ×ת הקובץ %s לגרסה %s", +"No old versions available" => "×ין גרס×ות ×™×©× ×•×ª ×–×ž×™× ×•×ª", +"No path specified" => "×œ× ×¦×•×™×Ÿ × ×ª×™×‘", +"Versions" => "גרס×ות", +"Revert a file to a previous version by clicking on its revert button" => "× ×™×ª×Ÿ להחזיר קובץ לגרסה קודמת על ידי לחיצה על לחצן ההחזרה שלו" ); diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php index bcd21bc599c..83170976309 100644 --- a/apps/files_versions/l10n/sv.php +++ b/apps/files_versions/l10n/sv.php @@ -7,5 +7,5 @@ "No old versions available" => "Inga gamla versioner finns tillgängliga", "No path specified" => "Ingen sökväg angiven", "Versions" => "Versioner", -"Revert a file to a previous version by clicking on its revert button" => "Ã…terställ en fil till en tidigare version genom att klicka pÃ¥ knappen" +"Revert a file to a previous version by clicking on its revert button" => "Ã…terställ en fil till en tidigare version genom att klicka pÃ¥ Ã¥terställningsknappen" ); diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index 81eaa0404b7..593e846bc03 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -49,7 +49,7 @@ $entry = array( 'name' => 'LDAP' ); -OCP\Backgroundjob::addRegularTask('OCA\user_ldap\lib\Jobs', 'updateGroups'); +OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs'); if(OCP\App::isEnabled('user_webdavauth')) { OCP\Util::writeLog('user_ldap', 'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour', diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js index f47d49cf222..52d5dbc48d9 100644 --- a/apps/user_ldap/js/settings.js +++ b/apps/user_ldap/js/settings.js @@ -14,7 +14,7 @@ var LdapConfiguration = { //deal with Checkboxes if($(elementID).is('input[type=checkbox]')) { - if(configvalue === 1) { + if(parseInt(configvalue) === 1) { $(elementID).attr('checked', 'checked'); } else { $(elementID).removeAttr('checked'); diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php index dd7373eb690..65c7c76b5d7 100644 --- a/apps/user_ldap/l10n/cs_CZ.php +++ b/apps/user_ldap/l10n/cs_CZ.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"Failed to clear the mappings." => "Selhalo zruÅ¡enà mapovánÃ.", "Failed to delete the server configuration" => "Selhalo smazánà nastavenà serveru", "The configuration is valid and the connection could be established!" => "Nastavenà je v pořádku a spojenà bylo navázáno.", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurace je v pořádku, ale spojenà selhalo. Zkontrolujte, prosÃm, nastavenà serveru a pÅ™ihlaÅ¡ovacà údaje.", @@ -7,6 +8,7 @@ "Take over settings from recent server configuration?" => "PÅ™evzÃt nastavenà z nedávného nastavenà serveru?", "Keep settings?" => "Ponechat nastavenÃ?", "Cannot add server configuration" => "Nelze pÅ™idat nastavenà serveru", +"mappings cleared" => "mapovánà zruÅ¡eno", "Success" => "ÚspÄ›ch", "Error" => "Chyba", "Connection test succeeded" => "Test spojenà byl úspěšný", @@ -72,6 +74,13 @@ "Email Field" => "Pole e-mailu", "User Home Folder Naming Rule" => "Pravidlo pojmenovánà domovské složky uživatele", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživatelské jméno (výchozÃ). Jinak uveÄte LDAP/AD parametr.", +"Internal Username" => "Internà uživatelské jméno", +"Internal Username Attribute:" => "Atribut internÃho uživatelského jména:", +"Override UUID detection" => "Nastavit ruÄnÄ› UUID atribut", +"UUID Attribute:" => "Atribut UUID:", +"Username-LDAP User Mapping" => "Mapovánà uživatelských jmen z LDAPu", +"Clear Username-LDAP User Mapping" => "ZruÅ¡it mapovánà uživatelských jmen LDAPu", +"Clear Groupname-LDAP Group Mapping" => "ZruÅ¡it mapovánà názvů skupin LDAPu", "Test Configuration" => "VyzkouÅ¡et nastavenÃ", "Help" => "NápovÄ›da" ); diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php index e22c5b5bdd9..8aa64477e41 100644 --- a/apps/user_ldap/l10n/de_DE.php +++ b/apps/user_ldap/l10n/de_DE.php @@ -74,6 +74,8 @@ "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.", "Internal Username" => "Interner Benutzername", "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Übereinstimmungen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port für Remote-URLs - zum Beispiel für alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich einzig und allein nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.", +"Override UUID detection" => "UUID-Erkennung überschreiben", +"UUID Attribute:" => "UUID-Attribut:", "Test Configuration" => "Testkonfiguration", "Help" => "Hilfe" ); diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php index a06d0bd5355..361ae5e0403 100644 --- a/apps/user_ldap/l10n/hu_HU.php +++ b/apps/user_ldap/l10n/hu_HU.php @@ -75,6 +75,12 @@ "User Home Folder Naming Rule" => "A home könyvtár elérési útvonala", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Hagyja üresen, ha a felhasználónevet kÃvánja használni. EllenkezÅ‘ esetben adjon meg egy LDAP/AD attribútumot!", "Internal Username" => "BelsÅ‘ felhasználónév", +"Internal Username Attribute:" => "A belsÅ‘ felhasználónév attribútuma:", +"Override UUID detection" => "Az UUID-felismerés felülbÃrálása", +"UUID Attribute:" => "UUID attribútum:", +"Username-LDAP User Mapping" => "Felhasználó - LDAP felhasználó hozzárendelés", +"Clear Username-LDAP User Mapping" => "A felhasználó - LDAP felhasználó hozzárendelés törlése", +"Clear Groupname-LDAP Group Mapping" => "A csoport - LDAP csoport hozzárendelés törlése", "Test Configuration" => "A beállÃtások tesztelése", "Help" => "Súgó" ); diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php index dadac9eedaa..6ea474f56df 100644 --- a/apps/user_ldap/l10n/is.php +++ b/apps/user_ldap/l10n/is.php @@ -1,6 +1,8 @@ <?php $TRANSLATIONS = array( +"Keep settings?" => "Geyma stillingar ?", "Error" => "Villa", "Host" => "Netþjónn", "Password" => "Lykilorð", +"Test Configuration" => "Prúfa uppsetningu", "Help" => "Hjálp" ); diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php index c935d387ccc..c75aae3ea4f 100644 --- a/apps/user_ldap/l10n/nl.php +++ b/apps/user_ldap/l10n/nl.php @@ -75,10 +75,13 @@ "User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.", "Internal Username" => "Interne gebruikersnaam", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standaard wordt de interne gebruikersnaam aangemaakt op basis van de UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle * DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van voor ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op nieuw in kaart gebracht (toegevoegde) LDAP-gebruikers.", "Internal Username Attribute:" => "Interne gebruikersnaam attribuut:", "Override UUID detection" => "Negeren UUID detectie", +"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standaard herkent ownCloud het UUID attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij dit hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw in kaart gebrachte (toegevoegde) LDAP-gebruikers en-groepen.", "UUID Attribute:" => "UUID Attribuut:", "Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling", +"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, zal elke LDAP-gebruiker ook een interne gebruikersnaam krijgen. Dit vereist een mapping van de ownCloud gebruikersnaam naar een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Ook de 'DN' wordt gecached om het aantal LDAP transacties te verminderen, maar deze wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden door ownCloud. De interne ownCloud naam wordt overal in ownCloud gebruikt. Wissen van de koppeling zal overal overblijfsel laten staan. Het wissen van Mappings is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze Mappings nooit in een productieomgeving plaatsvinden. Maak ze alleen leeg in een test-of ontwikkelomgeving.", "Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling", "Clear Groupname-LDAP Group Mapping" => "Leegmaken Groepsnaam-LDAP groep vertaling", "Test Configuration" => "Test configuratie", diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php index 7edfe0919eb..5495ab99404 100644 --- a/apps/user_ldap/l10n/pl.php +++ b/apps/user_ldap/l10n/pl.php @@ -75,6 +75,7 @@ "User Home Folder Naming Rule" => "ReguÅ‚y nazewnictwa folderu domowego użytkownika", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pozostaw puste dla user name (domyÅ›lnie). W przeciwnym razie podaj atrybut LDAP/AD.", "Internal Username" => "WewnÄ™trzna nazwa użytkownika", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "DomyÅ›lnie, wewnÄ™trzna nazwa użytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator użytkownika. To daje pewność, że nazwa użytkownika jest niepowtarzalna a znaki nie muszÄ… być konwertowane. WewnÄ™trzna nazwa użytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. PozostaÅ‚e znaki zamieniane sÄ… na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa siÄ™ powtarza na koÅ„cu dodawana / zwiÄ™kszana jest cyfra. WewnÄ™trzna nazwa użytkownika sÅ‚uży do wewnÄ™trznej identyfikacji użytkownika. Jest to również domyÅ›lna nazwa głównego folderu w ownCloud. Jest to również klucz zdalnego URL, na przykÅ‚ad dla wszystkich usÅ‚ug *DAV. DziÄ™ki temu ustawieniu można modyfikować domyÅ›lne zachowania. Aby osiÄ…gnąć podobny efekt jak w ownCloud 5 wpisz atrybut nazwy użytkownika w poniższym polu. Pozostaw puste dla domyÅ›lnego zachowania. Zmiany bÄ™dÄ… miaÅ‚y wpÅ‚yw tylko na nowo stworzonych (dodane) użytkowników LDAP.", "Internal Username Attribute:" => "WewnÄ™trzny atrybut nazwy uzżytkownika:", "Override UUID detection" => "ZastÄ…p wykrywanie UUID", "UUID Attribute:" => "Atrybuty UUID:", diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php index ed1e0f376db..308fd34760a 100644 --- a/apps/user_ldap/l10n/pt_PT.php +++ b/apps/user_ldap/l10n/pt_PT.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"Failed to clear the mappings." => "Falhou a limpar os mapas", "Failed to delete the server configuration" => "Erro ao eliminar as configurações do servidor", "The configuration is valid and the connection could be established!" => "A configuração está correcta e foi possÃvel estabelecer a ligação!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração está correcta, mas não foi possÃvel estabelecer o \"laço\", por favor, verifique as configurações do servidor e as credenciais.", @@ -7,6 +8,7 @@ "Take over settings from recent server configuration?" => "Assumir as configurações da configuração do servidor mais recente?", "Keep settings?" => "Manter as definições?", "Cannot add server configuration" => "Não foi possÃvel adicionar as configurações do servidor.", +"mappings cleared" => "Mapas limpos", "Success" => "Sucesso", "Error" => "Erro", "Connection test succeeded" => "Teste de conecção passado com sucesso.", @@ -72,6 +74,13 @@ "Email Field" => "Campo de email", "User Home Folder Naming Rule" => "Regra da pasta inicial do utilizador", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.", +"Internal Username" => "Nome de utilizador interno", +"Internal Username Attribute:" => "Atributo do nome de utilizador interno", +"Override UUID detection" => "Passar a detecção do UUID", +"UUID Attribute:" => "Atributo UUID:", +"Username-LDAP User Mapping" => "Mapeamento do utilizador LDAP", +"Clear Username-LDAP User Mapping" => "Limpar mapeamento do utilizador-LDAP", +"Clear Groupname-LDAP Group Mapping" => "Limpar o mapeamento do nome de grupo LDAP", "Test Configuration" => "Testar a configuração", "Help" => "Ajuda" ); diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php index eed6d373b9f..0573be3993f 100644 --- a/apps/user_ldap/l10n/ru.php +++ b/apps/user_ldap/l10n/ru.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"Failed to clear the mappings." => "Ðе удалоÑÑŒ очиÑтить ÑоотвеÑтвиÑ.", "Failed to delete the server configuration" => "Ðе удалоÑÑŒ удалить конфигурацию Ñервера", "The configuration is valid and the connection could be established!" => "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð¸ подключение может быть уÑтановлено!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð²ÐµÑ€Ð½Ð°, но Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ неудачно. ПожалуйÑта, проверьте наÑтройки Ñервера и учетные данные.", @@ -7,6 +8,7 @@ "Take over settings from recent server configuration?" => "ПринÑть наÑтройки из поÑледней конфигурации Ñервера?", "Keep settings?" => "Сохранить наÑтройки?", "Cannot add server configuration" => "Ðе получилоÑÑŒ добавить конфигурацию Ñервера", +"mappings cleared" => "СоответÑÑ‚Ð²Ð¸Ñ Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ñ‹", "Success" => "УÑпешно", "Error" => "Ошибка", "Connection test succeeded" => "Проверка ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ ÑƒÐ´Ð°Ð»Ð°ÑÑŒ", @@ -72,6 +74,13 @@ "Email Field" => "Поле адреÑÑа Ñллектронной почты", "User Home Folder Naming Rule" => "Правило Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð”Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¹ Папки ПользователÑ", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ОÑтавьте Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿ÑƒÑтым (по умолчанию). Иначе укажите атрибут LDAP/AD.", +"Internal Username" => "Внутреннее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ", +"Internal Username Attribute:" => "Ðттрибут Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ³Ð¾ имени:", +"Override UUID detection" => "Переопределить нахождение UUID", +"UUID Attribute:" => "Ðттрибут Ð´Ð»Ñ UUID:", +"Username-LDAP User Mapping" => "СоответÑÑ‚Ð²Ð¸Ñ Ð˜Ð¼Ñ-Пользователь LDAP", +"Clear Username-LDAP User Mapping" => "ОчиÑтить ÑоответÑÑ‚Ð²Ð¸Ñ Ð˜Ð¼Ñ-Пользователь LDAP", +"Clear Groupname-LDAP Group Mapping" => "ОчиÑтить ÑоответÑÑ‚Ð²Ð¸Ñ Ð“Ñ€ÑƒÐ¿Ð¿Ð°-Группа LDAP", "Test Configuration" => "ТеÑÑ‚Ð¾Ð²Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ", "Help" => "Помощь" ); diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php index eb30bd22f01..6ab8a9e5a6e 100644 --- a/apps/user_ldap/l10n/sv.php +++ b/apps/user_ldap/l10n/sv.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"Failed to clear the mappings." => "Fel vid rensning av mappningar", "Failed to delete the server configuration" => "Misslyckades med att radera serverinställningen", "The configuration is valid and the connection could be established!" => "Inställningen är giltig och anslutningen kunde upprättas!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurationen är riktig, men Bind felade. Var vänlig och kontrollera serverinställningar och logininformation.", @@ -7,6 +8,7 @@ "Take over settings from recent server configuration?" => "Ta över inställningar frÃ¥n tidigare serverkonfiguration?", "Keep settings?" => "BehÃ¥ll inställningarna?", "Cannot add server configuration" => "Kunde inte lägga till serverinställning", +"mappings cleared" => "mappningar rensade", "Success" => "Lyckat", "Error" => "Fel", "Connection test succeeded" => "Anslutningstestet lyckades", @@ -72,6 +74,16 @@ "Email Field" => "E-postfält", "User Home Folder Naming Rule" => "Namnregel för hemkatalog", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut.", +"Internal Username" => "Internt Användarnamn", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Som standard skapas det interna användarnamnet frÃ¥n UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillÃ¥tna: [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas pÃ¥ vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärrÃ¥tkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet Ã¥sidosättas. För att uppnÃ¥ ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att pÃ¥verka nyligen mappade (tillagda) LDAP-användare", +"Internal Username Attribute:" => "Internt Användarnamn Attribut:", +"Override UUID detection" => "Ã…sidosätt UUID detektion", +"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat pÃ¥ detta UUID, om inte annat anges ovan. Du kan Ã¥sidosätta inställningen och passera ett attribut som du själv väljer. Du mÃ¥ste se till att attributet som du väljer kan hämtas för bÃ¥de användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att pÃ¥verka nyligen mappade (tillagda) LDAP-användare och grupper.", +"UUID Attribute:" => "UUID Attribut:", +"Username-LDAP User Mapping" => "Användarnamn-LDAP User Mapping", +"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning frÃ¥n ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den pÃ¥verkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast pÃ¥ i testmiljö!", +"Clear Username-LDAP User Mapping" => "Rensa Användarnamn-LDAP User Mapping", +"Clear Groupname-LDAP Group Mapping" => "Rensa Gruppnamn-LDAP Group Mapping", "Test Configuration" => "Testa konfigurationen", "Help" => "Hjälp" ); diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php index 7b8389227ae..675fe4dfc75 100644 --- a/apps/user_ldap/l10n/zh_CN.php +++ b/apps/user_ldap/l10n/zh_CN.php @@ -1,4 +1,5 @@ <?php $TRANSLATIONS = array( +"Failed to clear the mappings." => "æ¸…é™¤æ˜ å°„å¤±è´¥ã€‚", "Failed to delete the server configuration" => "æœªèƒ½åˆ é™¤æœåС噍é…ç½®", "The configuration is valid and the connection could be established!" => "é…置有效,能够建立连接ï¼", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "é…置有效但绑定失败。请检查æœåŠ¡å™¨è®¾ç½®å’Œè®¤è¯ä¿¡æ¯ã€‚", @@ -7,6 +8,7 @@ "Take over settings from recent server configuration?" => "从近期的æœåС噍é…ç½®ä¸å¯¼å…¥è®¾ç½®ï¼Ÿ", "Keep settings?" => "ä¿ç•™è®¾ç½®å—?", "Cannot add server configuration" => "æ— æ³•æ·»åŠ æœåС噍é…ç½®", +"mappings cleared" => "æ¸…é™¤æ˜ å°„", "Success" => "æˆåŠŸ", "Error" => "错误", "Connection test succeeded" => "连接测试æˆåŠŸ", @@ -72,6 +74,16 @@ "Email Field" => "ç”µé‚®å—æ®µ", "User Home Folder Naming Rule" => "用户主目录命å规则", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "将用户å称留空(默认)。å¦åˆ™æŒ‡å®šä¸€ä¸ªLDAP/AD属性", +"Internal Username" => "内部用户å", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "默认情况下内部用户å具有唯一识别属性æ¥ç¡®ä¿ç”¨æˆ·å的唯一性和属性ä¸ç”¨è½¬æ¢ã€‚å†…éƒ¨ç”¨æˆ·åæœ‰ä¸¥æ ¼çš„å—符é™åˆ¶ï¼Œåªå…许使用 [ a-zA-Z0-9_.@- ]。其他å—符会被ASCIIç å–ä»£æˆ–è€…è¢«æ´»åŠ›ã€‚å½“å†²çªæ—¶ä¼šå¢žåŠ æˆ–è€…å‡å°‘一个数å—。内部用户åè¢«ç”¨äºŽå†…éƒ¨è¯†åˆ«ç”¨æˆ·ï¼ŒåŒæ—¶ä¹Ÿä½œä¸ºownCloudä¸ç”¨æˆ·æ ¹æ–‡ä»¶å¤¹çš„默认å。也作为远程URLs的一部分,比如为了所有的*DAVæœåŠ¡ã€‚åœ¨è¿™ç§è®¾ç½®ä¸‹ï¼Œé»˜è®¤è¡Œä¸ºå¯ä»¥è¢«è¶…越。实现一个类似的行为,owncloud 5输入用户的显示å称属性在以下领域之å‰ã€‚让它空ç€çš„默认行为。更改åªå¯¹æ–°æ˜ 射的影å“ï¼ˆå¢žåŠ ï¼‰çš„LDAP用户。", +"Internal Username Attribute:" => "内部用户å属性:", +"Override UUID detection" => "è¶…è¶ŠUUID检测", +"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "默认ownCloud自动检测UUID属性。UUIDå±žæ€§ç”¨æ¥æ— 误的识别LDAPç”¨æˆ·å’Œç»„ã€‚åŒæ—¶å†…部用户å也基于UUID创建,如果没有上述的指定。也å¯ä»¥è¶…越设置直接指定一ç§å±žæ€§ã€‚但一定è¦ç¡®ä¿æŒ‡å®šçš„属性å–å¾—çš„ç”¨æˆ·å’Œç»„æ˜¯å”¯ä¸€çš„ã€‚é»˜è®¤è¡Œä¸ºç©ºã€‚å˜æ›´åŸºäºŽæ–°æ˜ å°„(å¢žåŠ )LDAP用户和组æ‰ä¼šç”Ÿæ•ˆã€‚", +"UUID Attribute:" => "UUID属性:", +"Username-LDAP User Mapping" => "用户å-LDAPç”¨æˆ·æ˜ å°„", +"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud使用用户åå˜å‚¨å’Œåˆ†é…æ•°æ®(å…ƒ)。为了准确地识别和确认用户,æ¯ä¸ªç”¨æˆ·éƒ½æœ‰ä¸€ä¸ªå†…部用户å。需è¦ä»ŽownCloudç”¨æˆ·åæ˜ 射到LDAPç”¨æˆ·ã€‚åˆ›å»ºçš„ç”¨æˆ·åæ˜ 射到LDAP用户的UUID。æ¤å¤–,DN是缓å˜ä»¥åŠå‡å°‘LDAP交互,但它ä¸ç”¨äºŽè¯†åˆ«ã€‚如果DNå˜åŒ–,ownCloud也会å˜åŒ–。内部ownCloudå在ownCloudçš„å„å¤„ä½¿ç”¨ã€‚æ¸…é™¤æ˜ å°„å°†ä¸€ç‰‡æ··ä¹±ã€‚æ¸…é™¤æ˜ å°„ä¸æ˜¯å¸¸ç”¨çš„é…置,它影å“到所有LDAPé…ç½®ï¼åƒä¸‡ä¸è¦åœ¨æ£å¼çŽ¯å¢ƒä¸æ¸…é™¤æ˜ å°„ã€‚åªæœ‰åœ¨æµ‹è¯•或试验阶段å¯ä»¥æ¸…é™¤æ˜ å°„ã€‚", +"Clear Username-LDAP User Mapping" => "清除用户-LDAPç”¨æˆ·æ˜ å°„", +"Clear Groupname-LDAP Group Mapping" => "清除组用户-LDAPçº§æ˜ å°„", "Test Configuration" => "测试é…ç½®", "Help" => "帮助" ); diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 409f3758792..31150a5bec5 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -621,6 +621,10 @@ class Connection { if(empty($host)) { return false; } + if(strpos($host, '://') !== false) { + //ldap_connect ignores port paramater when URLs are passed + $host .= ':' . $port; + } $this->ldapConnectionRes = ldap_connect($host, $port); if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) { if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) { diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php index 07d13a806a6..10ed40ebd6a 100644 --- a/apps/user_ldap/lib/helper.php +++ b/apps/user_ldap/lib/helper.php @@ -118,7 +118,13 @@ class Helper { return false; } - $query = \OCP\DB::prepare('TRUNCATE '.$table); + if(strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false) { + $query = \OCP\DB::prepare('DELETE FROM '.$table); + } else { + $query = \OCP\DB::prepare('TRUNCATE '.$table); + } + + $res = $query->execute(); if(\OCP\DB::isError($res)) { diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php index 094d11db3d5..60ecc0da33d 100644 --- a/apps/user_ldap/lib/jobs.php +++ b/apps/user_ldap/lib/jobs.php @@ -23,20 +23,22 @@ namespace OCA\user_ldap\lib; -class Jobs { +class Jobs extends \OC\BackgroundJob\TimedJob { static private $groupsFromDB; static private $groupBE; static private $connector; + public function __construct(){ + $this->interval = self::getRefreshInterval(); + } + + public function run($argument){ + Jobs::updateGroups(); + } + static public function updateGroups() { \OCP\Util::writeLog('user_ldap', 'Run background job "updateGroups"', \OCP\Util::DEBUG); - $lastUpdate = \OCP\Config::getAppValue('user_ldap', 'bgjUpdateGroupsLastRun', 0); - if((time() - $lastUpdate) < self::getRefreshInterval()) { - \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – last run too fresh, aborting.', \OCP\Util::DEBUG); - //komm runter Werner die Maurer geben ein aus - return; - } $knownGroups = array_keys(self::getKnownGroups()); $actualGroups = self::getGroupBE()->getGroups(); @@ -45,7 +47,6 @@ class Jobs { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.', \OCP\Util::INFO); - \OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time()); return; } @@ -53,8 +54,6 @@ class Jobs { self::handleCreatedGroups(array_diff($actualGroups, $knownGroups)); self::handleRemovedGroups(array_diff($knownGroups, $actualGroups)); - \OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time()); - \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Finished.', \OCP\Util::DEBUG); } diff --git a/apps/user_webdavauth/l10n/he.php b/apps/user_webdavauth/l10n/he.php new file mode 100644 index 00000000000..9ab6b83bc7c --- /dev/null +++ b/apps/user_webdavauth/l10n/he.php @@ -0,0 +1,5 @@ +<?php $TRANSLATIONS = array( +"WebDAV Authentication" => "הזדהות מול WebDAV", +"URL: http://" => "כתובת: http://‎", +"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "מערכת ownCloud תשלח ×ת פרטי המשתמש לכתובת זו. התוסף יבדוק ×ת התגובה ×•×™×ª×¨×’× ×ת ×”×§×•×“×™× 401 ו־403 כתגובה לציון פרטי גישה ×©×’×•×™×™× ×•×ת כל ש×ר התגובות כפרטי גישה × ×›×•× ×™×." +); diff --git a/apps/user_webdavauth/l10n/is.php b/apps/user_webdavauth/l10n/is.php index 8fe0d974b32..bb59ef5e445 100644 --- a/apps/user_webdavauth/l10n/is.php +++ b/apps/user_webdavauth/l10n/is.php @@ -1,3 +1,4 @@ <?php $TRANSLATIONS = array( +"WebDAV Authentication" => "WebDAV Auðkenni", "URL: http://" => "Vefslóð: http://" ); diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css new file mode 100644 index 00000000000..c300b031afd --- /dev/null +++ b/core/css/jquery.ocdialog.css @@ -0,0 +1,48 @@ +.oc-dialog { + background: white; + color: #333333; + border-radius: 3px; box-shadow: 0 0 7px #888888; + padding: 15px; + z-index: 1000; + font-size: 100%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + min-width: 200px; +} +.oc-dialog-title { + background: white; + font-weight: bold; + font-size: 110%; + margin-bottom: 10px; +} +.oc-dialog-content { + z-index: 1000; + background: white; +} +.oc-dialog-separator { +} +.oc-dialog-buttonrow { + background: white; + float: right; + position: relative; + bottom: 0; + display: block; + margin-top: 10px; +} + +.oc-dialog-close { + position:absolute; + top:7px; right:7px; + height:20px; width:20px; + background:url('../img/actions/delete.svg') no-repeat center; +} + +.oc-dialog-dim { + background-color: #000; + opacity: .20;filter:Alpha(Opacity=20); + z-index: 999; + position: absolute; + top: 0; left: 0; + width: 100%; height: 100%; +} diff --git a/core/css/multiselect.css b/core/css/multiselect.css index def4e60d74d..a2d1b20d3a5 100644 --- a/core/css/multiselect.css +++ b/core/css/multiselect.css @@ -1,84 +1,105 @@ -/* Copyright (c) 2011, Jan-Christoph Borchardt, http://jancborchardt.net - This file is licensed under the Affero General Public License version 3 or later. - See the COPYING-README file. */ +/* Copyright (c) 2011, Jan-Christoph Borchardt, http: //jancborchardt.net +This file is licensed under the Affero General Public License version 3 or later. +See the COPYING-README file. */ - ul.multiselectoptions { - background-color:#fff; - border:1px solid #ddd; - border-top:none; - box-shadow:0 1px 1px #ddd; - padding-top:.5em; - position:absolute; - max-height: 20em; - overflow-y: auto; - z-index:49; - } +ul.multiselectoptions { + background-color: #fff; + border: 1px solid #ddd; + border-top: none; + box-shadow: 0 1px 1px #ddd; + padding-top: .5em; + position: absolute; + max-height: 20em; + overflow-y: auto; + z-index: 49; +} - ul.multiselectoptions.down { - border-bottom-left-radius:.5em; - border-bottom-right-radius:.5em; - } +ul.multiselectoptions.down { + border-bottom-left-radius: .5em; + border-bottom-right-radius: .5em; + width: 100%; /* do not cut off group names */ + -webkit-box-shadow: 0px 0px 20px rgba(29,45,68,.4); + -moz-box-shadow: 0px 0px 20px rgba(29,45,68,.4); + box-shadow: 0px 0px 20px rgba(29,45,68,.4); +} - ul.multiselectoptions.up { - border-top-left-radius:.5em; - border-top-right-radius:.5em; - } +ul.multiselectoptions.up { + border-top-left-radius: .5em; + border-top-right-radius: .5em; +} - ul.multiselectoptions>li { - overflow:hidden; - white-space:nowrap; - } +ul.multiselectoptions>li { + overflow: hidden; + white-space: nowrap; +} - ul.multiselectoptions>li>input[type="checkbox"] { - margin-top: 3px; - margin-right: 5px; - margin-left: 3px; - } +ul.multiselectoptions > li > input[type="checkbox"] { + margin: 10px 7px; + vertical-align: middle; +} +ul.multiselectoptions > li input[type='checkbox']+label { + font-weight: normal; + display: inline-block; + width: 100%; + padding: 5px 27px; + margin-left: -27px; /* to have area around checkbox clickable as well */ +} +ul.multiselectoptions > li input[type='checkbox']:checked+label { + font-weight: bold; +} - div.multiselect { - display:inline-block; - max-width:400px; - min-width:100px; - padding-right:.6em; - position:relative; - vertical-align:bottom; - } +div.multiselect { + display: inline-block; + max-width: 400px; + min-width: 150px; + padding-right: .6em; + position: relative; + vertical-align: bottom; +} - div.multiselect.active { - background-color:#fff; - position:relative; - z-index:50; - } +div.multiselect.active { + background-color: #fff; + position: relative; + z-index: 50; +} - div.multiselect.up { - border-top:0 none; - border-top-left-radius:0; - border-top-right-radius:0; - } +div.multiselect.up { + border-top: 0 none; + border-top-left-radius: 0; + border-top-right-radius: 0; +} - div.multiselect.down { - border-bottom:none; - border-bottom-left-radius:0; - border-bottom-right-radius:0; - } +div.multiselect.down { + border-bottom: none; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} - div.multiselect>span:first-child { - float:left; - margin-right:2em; - overflow:hidden; - text-overflow:ellipsis; - width:90%; - } +div.multiselect>span:first-child { + float: left; + margin-right: 2em; + overflow: hidden; + text-overflow: ellipsis; + width: 90%; +} - div.multiselect>span:last-child { - position:absolute; - right:.8em; - } +div.multiselect>span:last-child { + position: absolute; + right: .8em; +} - ul.multiselectoptions input.new { - border-top-left-radius:0; - border-top-right-radius:0; - padding-bottom:.2em; - padding-top:.2em; - margin:0; - } +ul.multiselectoptions input.new { + padding-bottom: .2em; + padding-top: .2em; + margin: 0; +} + +ul.multiselectoptions > li.creator { + padding: 10px; + font-weight: bold; +} +ul.multiselectoptions > li.creator > input { + width: 95% !important; /* do not constrain size of text input */ + padding: 5px; + margin: -5px; +} diff --git a/core/css/styles.css b/core/css/styles.css index 70a840d6890..58e750da4fa 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -37,7 +37,7 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC /* INPUTS */ -input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], +input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea, select, button, .button, #quota, div.jp-progress, .pager li a { @@ -48,11 +48,11 @@ button, .button, -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } input[type="hidden"] { height:0; width:0; } -input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], textarea { +input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea { background:#f8f8f8; color:#555; cursor:text; font-family: inherit; /* use default ownCloud font instead of default textarea monospace */ } -input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"] { +input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; } @@ -61,6 +61,7 @@ input[type="password"]:hover, input[type="password"]:focus, input[type="password input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active, .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active, input[type="email"]:hover, input[type="email"]:focus, input[type="email"]:active, +input[type="url"]:hover, input[type="url"]:focus, input[type="url"]:active, textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; @@ -140,7 +141,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b padding:0 70px 0 0.5em; margin:0; -moz-box-sizing:border-box; box-sizing:border-box; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; - background:#f7f7f7; border-bottom:1px solid #eee; z-index:50; + background:#eee; border-bottom:1px solid #e7e7e7; z-index:50; } #controls .button { display:inline-block; } @@ -354,14 +355,27 @@ tr .action { width:16px; height:16px; } tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } tbody tr:hover, tr:active { background-color:#f8f8f8; } -#body-settings .personalblock, #body-settings .helpblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } +#body-settings .personalblock, #body-settings .helpblock { + padding: .5em 1em; + margin: 1em; + background-color: rgb(240,240,240); + color: #555; + text-shadow: #fff 0 1px 0; + -moz-border-radius: .5em; -webkit-border-radius: .5em; border-radius: .5em; +} #body-settings .personalblock#quota { position:relative; padding:0; } #body-settings #controls+.helpblock { position:relative; margin-top:3em; } .personalblock > legend { margin-top:2em; } .personalblock > legend, th, dt, label { font-weight:bold; } code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; } -#quota div, div.jp-play-bar, div.jp-seek-bar { padding:0; background:#e6e6e6; font-weight:normal; white-space:nowrap; -moz-border-radius-bottomleft:.4em; -webkit-border-bottom-left-radius:.4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft:.4em; -webkit-border-top-left-radius:.4em; border-top-left-radius:.4em; } +#quota div, div.jp-play-bar, div.jp-seek-bar { + padding: 0; + background-color: rgb(220,220,220); + font-weight: normal; + white-space: nowrap; + -moz-border-radius-bottomleft: .4em; -webkit-border-bottom-left-radius: .4em; border-bottom-left-radius:.4em; + -moz-border-radius-topleft: .4em; -webkit-border-top-left-radius: .4em; border-top-left-radius: .4em; } #quotatext {padding:.6em 1em;} div.jp-play-bar, div.jp-seek-bar { padding:0; } @@ -391,7 +405,12 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin #oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; } #oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; } #oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;} -#oc-dialog-filepicker-content .filelist {height:270px; overflow-y:auto; background-color:white; width:100%;} +#oc-dialog-filepicker-content .filelist { + overflow-y:auto; + max-height: 300px; + background-color:white; + width:100%; +} #oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; } #oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; } #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;} @@ -421,12 +440,22 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;} .help-includes {overflow: hidden; width: 100%; height: 100%; -moz-box-sizing: border-box; box-sizing: border-box; padding-top: 2.8em; } .help-iframe {width: 100%; height: 100%; margin: 0;padding: 0; border: 0; overflow: auto;} + /* ---- BREADCRUMB ---- */ div.crumb { float:left; display:block; background:url('../img/breadcrumb.svg') no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; -moz-box-sizing:border-box; box-sizing:border-box; } div.crumb:first-child { padding:10px 20px 10px 5px; } div.crumb.last { font-weight:bold; background:none; padding-right:10px; } div.crumb a{ padding: 0.9em 0 0.7em 0; } +/* some feedback for hover/tap on breadcrumbs */ +div.crumb:hover, +div.crumb:focus, +div.crumb:active { + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; + filter:alpha(opacity=70); + opacity:.7; +} + /* ---- APP STYLING ---- */ diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js new file mode 100644 index 00000000000..7413927e3b2 --- /dev/null +++ b/core/js/jquery.ocdialog.js @@ -0,0 +1,217 @@ +(function($) { + $.widget('oc.ocdialog', { + options: { + width: 'auto', + height: 'auto', + closeButton: true, + closeOnEscape: true, + modal: false + }, + _create: function() { + var self = this; + + this.originalCss = { + display: this.element[0].style.display, + width: this.element[0].style.width, + height: this.element[0].style.height, + }; + + this.originalTitle = this.element.attr('title'); + this.options.title = this.options.title || this.originalTitle; + + this.$dialog = $('<div class="oc-dialog" />') + .attr({ + // Setting tabIndex makes the div focusable + tabIndex: -1, + role: 'dialog' + }) + .insertBefore(this.element); + this.$dialog.append(this.element.detach()); + this.element.removeAttr('title').addClass('oc-dialog-content').appendTo(this.$dialog); + + this.$dialog.css({ + display: 'inline-block', + position: 'fixed' + }); + + $(document).on('keydown keyup', function(event) { + if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) { + return; + } + // Escape + if(event.keyCode === 27 && self.options.closeOnEscape) { + self.close(); + return false; + } + // Enter + if(event.keyCode === 13) { + event.stopImmediatePropagation(); + if(event.type === 'keyup') { + event.preventDefault(); + return false; + } + // If no button is selected we trigger the primary + if(self.$buttonrow && self.$buttonrow.find($(event.target)).length === 0) { + var $button = self.$buttonrow.find('button.primary'); + if($button) { + $button.trigger('click'); + } + } else if(self.$buttonrow) { + $(event.target).trigger('click'); + } + return false; + } + }); + $(window).resize(function() { + self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body'); + var pos = self.parent.position(); + self.$dialog.css({ + left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2, + top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2 + }); + }); + + this._setOptions(this.options); + $(window).trigger('resize'); + this._createOverlay(); + }, + _init: function() { + this.$dialog.focus(); + this._trigger('open'); + }, + _setOption: function(key, value) { + var self = this; + switch(key) { + case 'title': + var $title = $('<h3 class="oc-dialog-title">' + this.options.title + + '</h3>'); //<hr class="oc-dialog-separator" />'); + if(this.$title) { + this.$title.replaceWith($title); + } else { + this.$title = $title.prependTo(this.$dialog); + } + this._setSizes(); + break; + case 'buttons': + var $buttonrow = $('<div class="oc-dialog-buttonrow" />'); + if(this.$buttonrow) { + this.$buttonrow.replaceWith($buttonrow); + } else { + this.$buttonrow = $buttonrow.appendTo(this.$dialog); + } + $.each(value, function(idx, val) { + var $button = $('<button>').text(val.text); + if(val.defaultButton) { + $button.addClass('primary'); + self.$defaultButton = $button; + } + self.$buttonrow.append($button); + $button.click(function() { + val.click.apply(self.element[0], arguments); + }); + }); + this.$buttonrow.find('button') + .on('focus', function(event) { + self.$buttonrow.find('button').removeClass('primary'); + $(this).addClass('primary'); + }); + this._setSizes(); + break; + case 'closeButton': + if(value) { + var $closeButton = $('<a class="oc-dialog-close svg"></a>'); + this.$dialog.prepend($closeButton); + $closeButton.on('click', function() { + self.close(); + }); + } + break; + case 'width': + this.$dialog.css('width', value); + break; + case 'height': + this.$dialog.css('height', value); + break; + case 'close': + this.closeCB = value; + break; + } + //this._super(key, value); + $.Widget.prototype._setOption.apply(this, arguments ); + }, + _setOptions: function(options) { + //this._super(options); + $.Widget.prototype._setOptions.apply(this, arguments); + }, + _setSizes: function() { + var content_height = this.$dialog.height(); + if(this.$title) { + content_height -= this.$title.outerHeight(true); + } + if(this.$buttonrow) { + content_height -= this.$buttonrow.outerHeight(true); + } + this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body'); + content_height = Math.min(content_height, this.parent.height()-20) + this.element.css({ + height: content_height + 'px', + width: this.$dialog.innerWidth()-20 + 'px' + }); + }, + _createOverlay: function() { + if(!this.options.modal) { + return; + } + + var self = this; + this.overlay = $('<div>') + .addClass('oc-dialog-dim') + .appendTo($('#content')); + this.overlay.on('click keydown keyup', function(event) { + if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) { + event.preventDefault(); + event.stopPropagation(); + return; + } + }); + }, + _destroyOverlay: function() { + if (!this.options.modal) { + return; + } + + if (this.overlay) { + this.overlay.off('click keydown keyup'); + this.overlay.remove(); + this.overlay = null; + } + }, + widget: function() { + return this.$dialog + }, + close: function() { + this._destroyOverlay(); + var self = this; + // Ugly hack to catch remaining keyup events. + setTimeout(function() { + self._trigger('close', self); + self.$dialog.hide(); + }, 200); + }, + destroy: function() { + if(this.$title) { + this.$title.remove() + } + if(this.$buttonrow) { + this.$buttonrow.remove() + } + + if(this.originalTitle) { + this.element.attr('title', this.originalTitle); + } + this.element.removeClass('oc-dialog-content') + .css(this.originalCss).detach().insertBefore(this.$dialog); + this.$dialog.remove(); + } + }); +}(jQuery)); diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 463c397d8cd..48d521e1856 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -176,10 +176,10 @@ }); button.parent().data('preventHide',false); if(settings.createText){ - var li=$('<li class="creator">+ <em>'+settings.createText+'<em></li>'); + var li=$('<li class="creator">+ '+settings.createText+'</li>'); li.click(function(event){ li.empty(); - var input=$('<input class="new">'); + var input=$('<input type="text" class="new">'); li.append(input); input.focus(); input.css('width',button.innerWidth()); diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index e1d3657724e..f4bc174b5eb 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -72,7 +72,7 @@ var OCdialogs = { var dialog_name = 'oc-dialog-filepicker-content'; var dialog_id = '#' + dialog_name; if(self.$filePicker) { - self.$filePicker.dialog('close'); + self.$filePicker.ocdialog('close'); } self.$filePicker = $tmpl.octemplate({ dialog_name: dialog_name, @@ -110,26 +110,29 @@ var OCdialogs = { datapath += '/' + self.$filelist.find('.filepicker_element_selected .filename').text(); } callback(datapath); - self.$filePicker.dialog('close'); + self.$filePicker.ocdialog('close'); } }; var buttonlist = [{ text: t('core', 'Choose'), - click: functionToCall + click: functionToCall, + defaultButton: true }, { text: t('core', 'Cancel'), - click: function(){self.$filePicker.dialog('close'); } + click: function(){self.$filePicker.ocdialog('close'); } }]; - self.$filePicker.dialog({ + self.$filePicker.ocdialog({ closeOnEscape: true, width: (4/9)*$(document).width(), height: 420, modal: modal, buttons: buttonlist, close: function(event, ui) { - self.$filePicker.dialog('destroy').remove(); + try { + $(this).ocdialog('destroy').remove(); + } catch(e) {} self.$filePicker = null; } }); @@ -161,30 +164,32 @@ var OCdialogs = { text: t('core', 'Yes'), click: function(){ if (callback !== undefined) { callback(true) }; - $(dialog_id).dialog('close'); - } + $(dialog_id).ocdialog('close'); + }, + defaultButton: true }, { text: t('core', 'No'), click: function(){ if (callback !== undefined) { callback(false) }; - $(dialog_id).dialog('close'); + $(dialog_id).ocdialog('close'); } }]; break; case OCdialogs.OK_BUTTON: var functionToCall = function() { - $(dialog_id).dialog('close'); + $(dialog_id).ocdialog('close'); if(callback !== undefined) { callback() }; }; buttonlist[0] = { text: t('core', 'Ok'), - click: functionToCall + click: functionToCall, + defaultButton: true }; break; }; - $(dialog_id).dialog({ + $(dialog_id).ocdialog({ closeOnEscape: true, modal: modal, buttons: buttonlist diff --git a/core/js/octemplate.js b/core/js/octemplate.js index e032506c0b1..e69c6cc56e0 100644 --- a/core/js/octemplate.js +++ b/core/js/octemplate.js @@ -60,11 +60,11 @@ var self = this; if(typeof this.options.escapeFunction === 'function') { - $.each(this.vars, function(key, val) { - if(typeof val === 'string') { - self.vars[key] = self.options.escapeFunction(val); + for (var key = 0; key < this.vars.length; key++) { + if(typeof this.vars[key] === 'string') { + this.vars[key] = self.options.escapeFunction(this.vars[key]); } - }); + } } var _html = this._build(this.vars); diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index 06cf7c214be..7a561cf0168 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -46,6 +46,7 @@ "years ago" => "pÅ™ed lety", "Choose" => "Vybrat", "Cancel" => "ZruÅ¡it", +"Error loading file picker template" => "Chyba pÅ™i naÄÃtánà šablony výbÄ›ru souborů", "Yes" => "Ano", "No" => "Ne", "Ok" => "Ok", diff --git a/core/l10n/da.php b/core/l10n/da.php index 4e9f742e80d..4c030bbf7cc 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -88,6 +88,8 @@ "The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.", "ownCloud password reset" => "Nulstil ownCloud kodeord", "Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}", +"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linket til at nulstille dit kodeord er blevet sendt til din e-post. <br> Hvis du ikke modtager den inden for en rimelig tid, sÃ¥ tjek dine spam / junk mapper.<br> Hvis det ikke er der, sÃ¥ spørg din lokale administrator.", +"Request failed!<br>Did you make sure your email/username was right?" => "Anmodning mislykkedes!<br>Er du sikker pÃ¥ at din e-post / brugernavn var korrekt?", "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.", "Username" => "Brugernavn", "Request reset" => "Anmod om nulstilling", @@ -123,6 +125,7 @@ "Database host" => "Databasehost", "Finish setup" => "Afslut opsætning", "web services under your control" => "Webtjenester under din kontrol", +"%s is available. Get more information on how to update." => "%s er tilgængelig. FÃ¥ mere information om, hvordan du opdaterer.", "Log out" => "Log ud", "Automatic logon rejected!" => "Automatisk login afvist!", "If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!", diff --git a/core/l10n/de.php b/core/l10n/de.php index 62e9925b945..feecee81bf7 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -46,6 +46,7 @@ "years ago" => "Vor Jahren", "Choose" => "Auswählen", "Cancel" => "Abbrechen", +"Error loading file picker template" => "Dateiauswahltemplate konnte nicht geladen werden", "Yes" => "Ja", "No" => "Nein", "Ok" => "OK", diff --git a/core/l10n/el.php b/core/l10n/el.php index 11295105e31..e11e2263e12 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -125,6 +125,7 @@ "Database host" => "Διακομιστής βάσης δεδομÎνων", "Finish setup" => "ΟλοκλήÏωση εγκατάστασης", "web services under your control" => "υπηÏεσίες δικτÏου υπό τον Îλεγχό σας", +"%s is available. Get more information on how to update." => "%s είναι διαθÎσιμη. Δείτε πεÏισσότεÏες πληÏοφοÏίες στο πώς να αναβαθμίσετε.", "Log out" => "ΑποσÏνδεση", "Automatic logon rejected!" => "ΑποÏÏίφθηκε η αυτόματη σÏνδεση!", "If you did not change your password recently, your account may be compromised!" => "Εάν δεν αλλάξατε το συνθηματικό σας Ï€Ïοσφάτως, ο λογαÏιασμός μποÏεί να Îχει διαÏÏεÏσει!", diff --git a/core/l10n/eo.php b/core/l10n/eo.php index 72cdf90c61e..af1a39ce2ec 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -5,6 +5,7 @@ "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "La uzanto %s kunhavigis la dosierujon “%s†kun vi. Äœi elÅuteblas el tie ĉi: %s", "Category type not provided." => "Ne proviziÄis tipon de kategorio.", "No category to add?" => "Ĉu neniu kategorio estas aldonota?", +"This category already exists: %s" => "Tiu kategorio jam ekzistas: %s", "Object type not provided." => "Ne proviziÄis tipon de objekto.", "%s ID not provided." => "Ne proviziÄis ID-on de %s.", "Error adding %s to favorites." => "Eraro dum aldono de %s al favoratoj.", @@ -52,6 +53,7 @@ "Error" => "Eraro", "The app name is not specified." => "Ne indikiÄis nomo de la aplikaĵo.", "The required file {file} is not installed!" => "La necesa dosiero {file} ne instaliÄis!", +"Shared" => "Dividita", "Share" => "Kunhavigi", "Error while sharing" => "Eraro dum kunhavigo", "Error while unsharing" => "Eraro dum malkunhavigo", @@ -82,6 +84,8 @@ "Error setting expiration date" => "Eraro dum agordado de limdato", "Sending ..." => "Sendante...", "Email sent" => "La retpoÅtaĵo sendiÄis", +"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La Äisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>.", +"The update was successful. Redirecting you to ownCloud now." => "La Äisdatigo estis sukcesa. Alidirektante nun al ownCloud.", "ownCloud password reset" => "La pasvorto de ownCloud restariÄis.", "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}", "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoÅte por rekomencigi vian pasvorton.", @@ -101,6 +105,7 @@ "Edit categories" => "Redakti kategoriojn", "Add" => "Aldoni", "Security Warning" => "Sekureca averto", +"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.", "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>", "Advanced" => "Progresinta", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index b01625a887b..05660a12513 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -46,6 +46,7 @@ "years ago" => "il y a plusieurs années", "Choose" => "Choisir", "Cancel" => "Annuler", +"Error loading file picker template" => "Erreur de chargement du modèle du sélecteur de fichier", "Yes" => "Oui", "No" => "Non", "Ok" => "Ok", diff --git a/core/l10n/he.php b/core/l10n/he.php index eb2c3f3d153..e74bde3e922 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -46,6 +46,7 @@ "years ago" => "×©× ×™×", "Choose" => "בחירה", "Cancel" => "ביטול", +"Error loading file picker template" => "שגי××” ×‘×˜×¢×™× ×ª ×ª×‘× ×™×ª בחירת הקבצי×", "Yes" => "כן", "No" => "ל×", "Ok" => "בסדר", @@ -88,6 +89,8 @@ "The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון ×”×¡×ª×™×™× ×‘×”×¦×œ×—×”. עכשיו ×ž× ×ª×‘ ×ותך ×ל ownCloud.", "ownCloud password reset" => "×יפוס הססמה של ownCloud", "Use the following link to reset your password: {link}" => "יש להשתמש בקישור ×”×‘× ×›×“×™ ל×פס ×ת הססמה שלך: {link}", +"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "הקישור ל×יפוס הססמה שלך × ×©×œ×— ×ליך בדו×״ל.<br>×× ×œ× ×§×™×‘×œ×ª ×ת הקישור תוך זמן סביר, מוטב לבדוק ×ת תיבת הזבל שלך.<br>×× ×”×”×•×“×¢×” ×œ× ×©×, כד××™ לש×ול ×ת ×ž× ×”×œ הרשת שלך .", +"Request failed!<br>Did you make sure your email/username was right?" => "הבקשה × ×›×©×œ×”!<br>×”×× ×›×ª×•×‘×ª הדו×״ל/×©× ×”×ž×©×ª×ž×© שלך × ×›×•× ×™×?", "You will receive a link to reset your password via Email." => "יישלח לתיבת הדו×״ל שלך קישור ל×יפוס הססמה.", "Username" => "×©× ×ž×©×ª×ž×©", "Request reset" => "בקשת ×יפוס", @@ -106,6 +109,7 @@ "Add" => "הוספה", "Security Warning" => "×זהרת ×בטחה", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "גרסת ×”Ö¾PHP פגיעה ×‘×¤× ×™ התקפת בית NULL/ריק (CVE-2006-7243)", +"Please update your PHP installation to use ownCloud securely." => "× × ×œ×¢×“×›×Ÿ ×ת ×”×ª×§× ×ª ×”Ö¾PHP שלך כדי להשתמש ב־PHP בבטחה.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "×ין מחולל ×ž×¡×¤×¨×™× ×קר××™×™× ×ž×ובטח, × × ×œ×”×¤×¢×™×œ ×ת ההרחבה OpenSSL ב־PHP.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "×œ×œ× ×ž×—×•×œ×œ ×ž×¡×¤×¨×™× ×קר××™×™× ×ž×ובטח תוקף יכול ×œ× ×‘× ×ת מחרוזות ×יפוס הססמה ולהשתלט על החשבון שלך.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "תיקיית וקבצי המידע שלך ×›× ×¨××” × ×’×™×©×™× ×ž×”××™× ×˜×¨× ×˜ מכיוון שקובץ ×”.htaccess ×œ× ×¢×•×‘×“.", @@ -122,6 +126,7 @@ "Database host" => "שרת בסיס × ×ª×•× ×™×", "Finish setup" => "×¡×™×•× ×”×ª×§× ×”", "web services under your control" => "שירותי רשת תחת השליטה שלך", +"%s is available. Get more information on how to update." => "%s ×–×ž×™× ×” להורדה. × ×™×ª×Ÿ ללחוץ כדי לקבל מידע × ×•×¡×£ כיצד לעדכן.", "Log out" => "×”×ª× ×ª×§×•×ª", "Automatic logon rejected!" => "בקשת ×”×›× ×™×¡×” ×”×וטומטית × ×“×—×ª×”!", "If you did not change your password recently, your account may be compromised!" => "×× ×œ× ×©×™× ×™×ª ×ת ססמתך ל××—×¨×•× ×”, יתכן ×©×—×©×‘×•× ×š × ×¤×’×¢!", diff --git a/core/l10n/hi.php b/core/l10n/hi.php index 7d55c5b6b2f..cb265e13191 100644 --- a/core/l10n/hi.php +++ b/core/l10n/hi.php @@ -1,5 +1,20 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "उपयोगकरà¥à¤¤à¤¾ %s ने आप के साथ à¤à¤• फ़ाइल सहà¤à¤¾à¤œà¥€à¤¤ किया", +"January" => "जनवरी", +"February" => "फरवरी", +"March" => "मारà¥à¤š", +"April" => "अपà¥à¤°à¥ˆà¤²", +"May" => "मई", +"June" => "जून", +"July" => "जà¥à¤²à¤¾à¤ˆ", +"August" => "अगसà¥à¤¤", +"September" => "सितमà¥à¤¬à¤°", +"October" => "अकà¥à¤Ÿà¥‚बर", +"November" => "नवंबर", +"December" => "दिसमà¥à¤¬à¤°", "Settings" => "सेटिंगà¥à¤¸", +"Share" => "साà¤à¤¾ करें", +"Share with" => "के साथ साà¤à¤¾", "Password" => "पासवरà¥à¤¡", "Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवरà¥à¤¡ बदलने के लिये किजीये: {link}", "You will receive a link to reset your password via Email." => "पासवरà¥à¤¡ बदलने कि लिंक आपको ई-मेल दà¥à¤µà¤¾à¤°à¤¾ à¤à¥‡à¤œà¥€ जायेगी|", diff --git a/core/l10n/is.php b/core/l10n/is.php index bd8b58b2904..7c6ae25be71 100644 --- a/core/l10n/is.php +++ b/core/l10n/is.php @@ -52,6 +52,7 @@ "Error" => "Villa", "The app name is not specified." => "Nafn forrits ekki tilgreint", "The required file {file} is not installed!" => "Umbeðina skráin {file} ekki tiltæk!", +"Shared" => "Deilt", "Share" => "Deila", "Error while sharing" => "Villa við deilingu", "Error while unsharing" => "Villa við að hætta deilingu", @@ -82,6 +83,7 @@ "Error setting expiration date" => "Villa við að setja gildistÃma", "Sending ..." => "Sendi ...", "Email sent" => "Tölvupóstur sendur", +"The update was successful. Redirecting you to ownCloud now." => "Uppfærslan heppnaðist. Beini þér til ownCloud nú.", "ownCloud password reset" => "endursetja ownCloud lykilorð", "Use the following link to reset your password: {link}" => "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}", "You will receive a link to reset your password via Email." => "Þú munt fá veftengil à tölvupósti til að endursetja lykilorðið.", @@ -115,6 +117,7 @@ "Database host" => "Netþjónn gagnagrunns", "Finish setup" => "Virkja uppsetningu", "web services under your control" => "vefþjónusta undir þinni stjórn", +"%s is available. Get more information on how to update." => "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir.", "Log out" => "Útskrá", "Automatic logon rejected!" => "Sjálfvirkri innskráningu hafnað!", "If you did not change your password recently, your account may be compromised!" => "Ef þú breyttir ekki lykilorðinu þÃnu fyrir skömmu, er mögulegt að einhver annar hafi komist inn á aðganginn þinn.", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 1cd400117c8..9b41c6e131f 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -1,8 +1,16 @@ <?php $TRANSLATIONS = array( "User %s shared a file with you" => "Vartotojas %s pasidalino su jumis failu", "User %s shared a folder with you" => "Vartotojas %s su jumis pasidalino aplanku", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Vartotojas %s pasidalino failu \"%s\" su jumis. Jį atsisiųsti galite Äia: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Vartotojas %s pasidalino aplanku \"%s\" su jumis. Jį atsisiųsti galite Äia: %s", +"Category type not provided." => "Kategorija nenurodyta.", "No category to add?" => "NepridÄ—site jokios kategorijos?", +"This category already exists: %s" => "Å i kategorija jau egzistuoja: %s", +"Object type not provided." => "Objekto tipas nenurodytas.", +"%s ID not provided." => "%s ID nenurodytas.", +"Error adding %s to favorites." => "Klaida perkeliant %s į jÅ«sų mÄ—gstamiausius.", "No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.", +"Error removing %s from favorites." => "Klaida iÅ¡trinant %s iÅ¡ jÅ«sų mÄ—gstamiausius.", "Sunday" => "Sekmadienis", "Monday" => "Pirmadienis", "Tuesday" => "Antradienis", @@ -26,19 +34,27 @@ "seconds ago" => "prieÅ¡ sekundÄ™", "1 minute ago" => "PrieÅ¡ 1 minutÄ™", "{minutes} minutes ago" => "PrieÅ¡ {count} minutes", +"1 hour ago" => "prieÅ¡ 1 valandÄ…", +"{hours} hours ago" => "prieÅ¡ {hours} valandas", "today" => "Å¡iandien", "yesterday" => "vakar", "{days} days ago" => "PrieÅ¡ {days} dienas", "last month" => "praeitÄ… mÄ—nesį", +"{months} months ago" => "prieÅ¡ {months} mÄ—nesių", "months ago" => "prieÅ¡ mÄ—nesį", "last year" => "praeitais metais", "years ago" => "prieÅ¡ metus", "Choose" => "Pasirinkite", "Cancel" => "AtÅ¡aukti", +"Error loading file picker template" => "Klaida pakraunant failų narÅ¡yklÄ™", "Yes" => "Taip", "No" => "Ne", "Ok" => "Gerai", +"The object type is not specified." => "Objekto tipas nenurodytas.", "Error" => "Klaida", +"The app name is not specified." => "Nenurodytas programos pavadinimas.", +"The required file {file} is not installed!" => "Reikalingas {file} failas nÄ—ra įraÅ¡ytas!", +"Shared" => "Dalinamasi", "Share" => "Dalintis", "Error while sharing" => "Klaida, dalijimosi metu", "Error while unsharing" => "Klaida, kai atÅ¡aukiamas dalijimasis", @@ -49,6 +65,8 @@ "Share with link" => "Dalintis nuoroda", "Password protect" => "Apsaugotas slaptažodžiu", "Password" => "Slaptažodis", +"Email link to person" => "Nusiųsti nuorodÄ… paÅ¡tu", +"Send" => "Siųsti", "Set expiration date" => "Nustatykite galiojimo laikÄ…", "Expiration date" => "Galiojimo laikas", "Share via email:" => "Dalintis per el. paÅ¡tÄ…:", @@ -65,8 +83,14 @@ "Password protected" => "Apsaugota slaptažodžiu", "Error unsetting expiration date" => "Klaida nuimant galiojimo laikÄ…", "Error setting expiration date" => "Klaida nustatant galiojimo laikÄ…", +"Sending ..." => "SiunÄiama...", +"Email sent" => "LaiÅ¡kas iÅ¡siųstas", +"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atnaujinimas buvo nesÄ—kmingas. PApie tai praÅ¡ome praneÅ¡ti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>.", +"The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sÄ—kmingas. Nukreipiame į jÅ«sų ownCloud.", "ownCloud password reset" => "ownCloud slaptažodžio atkÅ«rimas", "Use the following link to reset your password: {link}" => "Slaptažodio atkÅ«rimui naudokite Å¡iÄ… nuorodÄ…: {link}", +"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "NuorodÄ… su jÅ«sų slaptažodžio atkÅ«rimu buvo nusiųsta jums į paÅ¡tÄ….<br>Jei jo negausite per atitinkamÄ… laikÄ…, pasižiÅ«rÄ—kite brukalo aplankale.<br> Jei jo ir ten nÄ—ra, teiraukitÄ—s administratoriaus.", +"Request failed!<br>Did you make sure your email/username was right?" => "Klaida!<br>Ar tikrai jÅ«sų el paÅ¡tas/vartotojo vardas buvo teisingi?", "You will receive a link to reset your password via Email." => "Elektroniniu paÅ¡tu gausite nuorodÄ…, su kuria galÄ—site iÅ¡ naujo nustatyti slaptažodį.", "Username" => "Prisijungimo vardas", "Request reset" => "PraÅ¡yti nustatymo iÅ¡ najo", @@ -84,8 +108,12 @@ "Edit categories" => "Redaguoti kategorijas", "Add" => "PridÄ—ti", "Security Warning" => "Saugumo praneÅ¡imas", +"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "JÅ«sų PHP versija yra pažeidžiama prieÅ¡ NULL Byte atakÄ… (CVE-2006-7243)", +"Please update your PHP installation to use ownCloud securely." => "PraÅ¡ome atnaujinti savo PHP norint naudotis savo ownCloud saugiai.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Saugaus atsitiktinių skaiÄių generatoriaus nÄ—ra, praÅ¡ome įjungti PHP OpenSSL modulį.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Be saugaus atsitiktinių skaiÄių generatoriaus, piktavaliai gali atspÄ—ti JÅ«sų slaptažodį ir pasisavinti paskyrÄ….", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "JÅ«sų failai yra tikriausiai prieinami per internetÄ… nes .htaccess failas neveikia.", +"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Norint gauti daugiau informacijos apie tai kaip tinkamai nustatyit savo serverį, praÅ¡ome perskaityti <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacijÄ…</a>.", "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrÄ…</strong>", "Advanced" => "IÅ¡plÄ—stiniai", "Data folder" => "Duomenų katalogas", @@ -98,6 +126,7 @@ "Database host" => "Duomenų bazÄ—s serveris", "Finish setup" => "Baigti diegimÄ…", "web services under your control" => "jÅ«sų valdomos web paslaugos", +"%s is available. Get more information on how to update." => "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimÄ….", "Log out" => "Atsijungti", "Automatic logon rejected!" => "Automatinis prisijungimas atmestas!", "If you did not change your password recently, your account may be compromised!" => "Jei paskutinių metu nekeitÄ—te savo slaptažodžio, JÅ«sų paskyra gali bÅ«ti pavojuje!", @@ -105,6 +134,8 @@ "Lost your password?" => "PamirÅ¡ote slaptažodį?", "remember" => "prisiminti", "Log in" => "Prisijungti", +"Alternative Logins" => "AlternatyvÅ«s prisijungimai", "prev" => "atgal", -"next" => "kitas" +"next" => "kitas", +"Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versijÄ…. tai gali Å¡iek tiek užtrukti." ); diff --git a/core/l10n/sv.php b/core/l10n/sv.php index d4154678b65..841ffe0d5da 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -46,6 +46,7 @@ "years ago" => "Ã¥r sedan", "Choose" => "Välj", "Cancel" => "Avbryt", +"Error loading file picker template" => "Fel vid inläsning av filväljarens mall", "Yes" => "Ja", "No" => "Nej", "Ok" => "Ok", @@ -88,6 +89,8 @@ "The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud", "ownCloud password reset" => "ownCloud lösenordsÃ¥terställning", "Use the following link to reset your password: {link}" => "Använd följande länk för att Ã¥terställa lösenordet: {link}", +"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Länken för att Ã¥terställa ditt lösenorden har skickats till din e-postadress<br>Om du inte har erhÃ¥llit meddelandet inom kort, vänligen kontrollera din skräppost-mapp<br>Om den inte finns där, vänligen kontakta din administratör.", +"Request failed!<br>Did you make sure your email/username was right?" => "Begäran misslyckades!<br>Är du helt säker pÃ¥ att din e-postadress/användarnamn är korrekt?", "You will receive a link to reset your password via Email." => "Du fÃ¥r en länk att Ã¥terställa ditt lösenord via e-post.", "Username" => "Användarnamn", "Request reset" => "Begär Ã¥terställning", @@ -123,6 +126,7 @@ "Database host" => "Databasserver", "Finish setup" => "Avsluta installation", "web services under your control" => "webbtjänster under din kontroll", +"%s is available. Get more information on how to update." => "%s är tillgänglig. FÃ¥ mer information om hur du gÃ¥r tillväga för att uppdatera", "Log out" => "Logga ut", "Automatic logon rejected!" => "Automatisk inloggning inte tillÃ¥ten!", "If you did not change your password recently, your account may be compromised!" => "Om du inte har ändrat ditt lösenord nyligen sÃ¥ kan ditt konto vara manipulerat!", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index 47574a01259..16943914e7e 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -46,6 +46,7 @@ "years ago" => "yıl önce", "Choose" => "seç", "Cancel" => "İptal", +"Error loading file picker template" => "Seçici ÅŸablon dosya yüklemesinde hata", "Yes" => "Evet", "No" => "Hayır", "Ok" => "Tamam", diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php index 2e0d0da6f2f..b4bc6fb3ef7 100644 --- a/core/l10n/zh_CN.GB2312.php +++ b/core/l10n/zh_CN.GB2312.php @@ -7,7 +7,9 @@ "No category to add?" => "æ²¡æœ‰åˆ†ç±»æ·»åŠ äº†?", "This category already exists: %s" => "æ¤åˆ†ç±»å·²å˜åœ¨ï¼š%s", "Object type not provided." => "未选择对象类型。", +"Error adding %s to favorites." => "åœ¨æ·»åŠ %s 到收è—夹时å‘生错误。", "No categories selected for deletion." => "没有选ä¸è¦åˆ 除的分类。", +"Error removing %s from favorites." => "在移除收è—夹ä¸çš„ %s æ—¶å‘生错误。", "Sunday" => "星期天", "Monday" => "星期一", "Tuesday" => "星期二", @@ -124,7 +126,7 @@ "If you did not change your password recently, your account may be compromised!" => "如果您最近没有修改您的密ç ,那您的å¸å·å¯èƒ½è¢«æ”»å‡»äº†ï¼", "Please change your password to secure your account again." => "请修改您的密ç ä»¥ä¿æŠ¤è´¦æˆ·ã€‚", "Lost your password?" => "忘记密ç ?", -"remember" => "备忘", +"remember" => "è®°ä½ç™»å½•", "Log in" => "登陆", "Alternative Logins" => "备选登录", "prev" => "åŽé€€", @@ -1,24 +1,24 @@ <?php /** -* ownCloud -* -* @author Jakob Sack -* @copyright 2012 Jakob Sack owncloud@jakobsack.de -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ + * ownCloud + * + * @author Jakob Sack + * @copyright 2012 Jakob Sack owncloud@jakobsack.de + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ // Unfortunately we need this class for shutdown function class TemporaryCronClass { @@ -30,86 +30,95 @@ class TemporaryCronClass { // We use this function to handle (unexpected) shutdowns function handleUnexpectedShutdown() { // Delete lockfile - if( !TemporaryCronClass::$keeplock && file_exists( TemporaryCronClass::$lockfile )) { - unlink( TemporaryCronClass::$lockfile ); + if (!TemporaryCronClass::$keeplock && file_exists(TemporaryCronClass::$lockfile)) { + unlink(TemporaryCronClass::$lockfile); } - + // Say goodbye if the app did not shutdown properly - if( !TemporaryCronClass::$sent ) { - if( OC::$CLI ) { - echo 'Unexpected error!'.PHP_EOL; - } - else{ - OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!'))); + if (!TemporaryCronClass::$sent) { + if (OC::$CLI) { + echo 'Unexpected error!' . PHP_EOL; + } else { + OC_JSON::error(array('data' => array('message' => 'Unexpected error!'))); } } } -require_once 'lib/base.php'; - -session_write_close(); +try { -// Don't do anything if ownCloud has not been installed -if( !OC_Config::getValue( 'installed', false )) { - exit( 0 ); -} - -// Handle unexpected errors -register_shutdown_function('handleUnexpectedShutdown'); + require_once 'lib/base.php'; -// Delete temp folder -OC_Helper::cleanTmpNoClean(); + session_write_close(); -// Exit if background jobs are disabled! -$appmode = OC_BackgroundJob::getExecutionType(); -if( $appmode == 'none' ) { - TemporaryCronClass::$sent = true; - if( OC::$CLI ) { - echo 'Background Jobs are disabled!'.PHP_EOL; + // Don't do anything if ownCloud has not been installed + if (!OC_Config::getValue('installed', false)) { + exit(0); } - else{ - OC_JSON::error( array( 'data' => array( 'message' => 'Background jobs disabled!'))); - } - exit( 1 ); -} -if( OC::$CLI ) { - // Create lock file first - TemporaryCronClass::$lockfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ).'/cron.lock'; - - // We call ownCloud from the CLI (aka cron) - if( $appmode != 'cron' ) { - // Use cron in feature! - OC_BackgroundJob::setExecutionType('cron' ); - } + // Handle unexpected errors + register_shutdown_function('handleUnexpectedShutdown'); - // check if backgroundjobs is still running - if( file_exists( TemporaryCronClass::$lockfile )) { - TemporaryCronClass::$keeplock = true; + // Delete temp folder + OC_Helper::cleanTmpNoClean(); + + // Exit if background jobs are disabled! + $appmode = OC_BackgroundJob::getExecutionType(); + if ($appmode == 'none') { TemporaryCronClass::$sent = true; - echo "Another instance of cron.php is still running!"; - exit( 1 ); + if (OC::$CLI) { + echo 'Background Jobs are disabled!' . PHP_EOL; + } else { + OC_JSON::error(array('data' => array('message' => 'Background jobs disabled!'))); + } + exit(1); } - // Create a lock file - touch( TemporaryCronClass::$lockfile ); + if (OC::$CLI) { + // Create lock file first + TemporaryCronClass::$lockfile = OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/cron.lock'; - // Work - OC_BackgroundJob_Worker::doAllSteps(); -} -else{ - // We call cron.php from some website - if( $appmode == 'cron' ) { - // Cron is cron :-P - OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!'))); - } - else{ - // Work and success :-) - OC_BackgroundJob_Worker::doNextStep(); - OC_JSON::success(); + // We call ownCloud from the CLI (aka cron) + if ($appmode != 'cron') { + // Use cron in feature! + OC_BackgroundJob::setExecutionType('cron'); + } + + // check if backgroundjobs is still running + if (file_exists(TemporaryCronClass::$lockfile)) { + TemporaryCronClass::$keeplock = true; + TemporaryCronClass::$sent = true; + echo "Another instance of cron.php is still running!"; + exit(1); + } + + // Create a lock file + touch(TemporaryCronClass::$lockfile); + + // Work + $jobList = new \OC\BackgroundJob\JobList(); + $jobs = $jobList->getAll(); + foreach ($jobs as $job) { + $job->execute($jobList); + } + } else { + // We call cron.php from some website + if ($appmode == 'cron') { + // Cron is cron :-P + OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!'))); + } else { + // Work and success :-) + $jobList = new \OC\BackgroundJob\JobList(); + $job = $jobList->getNext(); + $job->execute($jobList); + $jobList->setLastJob($job); + OC_JSON::success(); + } } -} -// done! -TemporaryCronClass::$sent = true; -exit(); + // done! + TemporaryCronClass::$sent = true; + exit(); + +} catch (Exception $ex) { + \OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL); +}
\ No newline at end of file diff --git a/db_structure.xml b/db_structure.xml index a902374e01f..cefb7fc52c9 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -70,7 +70,7 @@ <name>id</name> <type>text</type> <default></default> - <notnull>true</notnull> + <notnull>false</notnull> <length>64</length> </field> @@ -220,7 +220,7 @@ <name>path</name> <type>text</type> <default></default> - <notnull>true</notnull> + <notnull>false</notnull> <length>512</length> </field> @@ -244,7 +244,7 @@ <name>name</name> <type>text</type> <default></default> - <notnull>true</notnull> + <notnull>false</notnull> <length>250</length> </field> @@ -859,7 +859,7 @@ <table> - <name>*dbprefix*queuedtasks</name> + <name>*dbprefix*jobs</name> <declaration> @@ -874,35 +874,35 @@ </field> <field> - <name>app</name> + <name>class</name> <type>text</type> <default></default> <notnull>true</notnull> - <length>255</length> + <length>256</length> </field> <field> - <name>klass</name> + <name>argument</name> <type>text</type> <default></default> <notnull>true</notnull> - <length>255</length> + <length>256</length> </field> <field> - <name>method</name> - <type>text</type> + <name>last_run</name> + <type>integer</type> <default></default> - <notnull>true</notnull> - <length>255</length> + <notnull>false</notnull> </field> - <field> - <name>parameters</name> - <type>text</type> - <notnull>true</notnull> - <length>255</length> - </field> + <index> + <name>job_class_index</name> + <field> + <name>class</name> + <sorting>ascending</sorting> + </field> + </index> </declaration> diff --git a/index.php b/index.php index bf0b287a64b..a064aa5c76f 100755 --- a/index.php +++ b/index.php @@ -23,6 +23,15 @@ $RUNTIME_NOAPPS = true; //no apps, yet -require_once 'lib/base.php'; +try { + + require_once 'lib/base.php'; -OC::handleRequest(); + OC::handleRequest(); + +} catch (Exception $ex) { + //show the user a detailed error page + OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR); + \OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL); + OC_Template::printExceptionErrorPage($ex); +}
\ No newline at end of file diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po index f900a6a4fb7..3718c8a3485 100644 --- a/l10n/af_ZA/core.po +++ b/l10n/af_ZA/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 00:02+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "" diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po index 93535390531..a031b68eb03 100644 --- a/l10n/af_ZA/lib.po +++ b/l10n/af_ZA/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 00:03+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: af_ZA\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Hulp" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Persoonlik" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Instellings" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Gebruikers" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Toepassings" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po index 868778c6d74..abaa4467902 100644 --- a/l10n/af_ZA/settings.po +++ b/l10n/af_ZA/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:02+0200\n" -"PO-Revision-Date: 2013-05-25 00:02+0000\n" +"POT-Creation-Date: 2013-06-11 01:57+0200\n" +"PO-Revision-Date: 2013-06-10 23:57+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -324,11 +324,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:235 templates/personal.php:105 +#: templates/admin.php:235 templates/personal.php:111 msgid "Version" msgstr "" -#: templates/admin.php:237 templates/personal.php:108 +#: templates/admin.php:237 templates/personal.php:114 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Wagwoord" @@ -423,39 +423,39 @@ msgstr "Nuwe wagwoord" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" -#: templates/personal.php:68 +#: templates/personal.php:71 msgid "Email" msgstr "" -#: templates/personal.php:70 +#: templates/personal.php:73 msgid "Your email address" msgstr "" -#: templates/personal.php:71 +#: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" msgstr "" -#: templates/personal.php:77 templates/personal.php:78 +#: templates/personal.php:83 templates/personal.php:84 msgid "Language" msgstr "" -#: templates/personal.php:89 +#: templates/personal.php:95 msgid "Help translate" msgstr "" -#: templates/personal.php:94 +#: templates/personal.php:100 msgid "WebDAV" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:102 msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/ar/core.po b/l10n/ar/core.po index 4128086cd9a..3441571d520 100644 --- a/l10n/ar/core.po +++ b/l10n/ar/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "سنة مضت" msgid "Choose" msgstr "اختيار" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "الغاء" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "نعم" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "لا" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "مواÙÙ‚" diff --git a/l10n/ar/files.po b/l10n/ar/files.po index 0c3ab9f8d25..88a6f57929d 100644 --- a/l10n/ar/files.po +++ b/l10n/ar/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po index aa0a1d4d005..73d8a9c9722 100644 --- a/l10n/ar/files_external.po +++ b/l10n/ar/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po index f8f9ba572e1..67b581a05da 100644 --- a/l10n/ar/files_sharing.po +++ b/l10n/ar/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po index 83cef465aa3..17a6649ddb6 100644 --- a/l10n/ar/files_trashbin.po +++ b/l10n/ar/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po index 4c378f62b3d..af53a511ca0 100644 --- a/l10n/ar/lib.po +++ b/l10n/ar/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "المساعدة" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "شخصي" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "إعدادات" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "المستخدمين" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "التطبيقات" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "المدير" diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po index dfe16004cf7..9987d44ff99 100644 --- a/l10n/ar/settings.po +++ b/l10n/ar/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "تراجع" msgid "Unable to remove user" msgstr "تعذر ØØ°Ù المستخدم" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "مجموعات" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "مدير المجموعة" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "إلغاء" @@ -399,7 +399,7 @@ msgstr "Ø§ØØµÙ„ على التطبيقات لمزامنة Ù…Ù„ÙØ§ØªÙƒ" msgid "Show First Run Wizard again" msgstr "ابدأ خطوات بداية التشغيل من جديد" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "كلمة المرور" @@ -423,7 +423,7 @@ msgstr "كلمات سر جديدة" msgid "Change password" msgstr "عدل كلمة السر" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "اسم Ø§Ù„ØØ³Ø§Ø¨" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud ÙÙŠ مدير Ø§Ù„Ù…Ù„ÙØ§Øª" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "اسم الدخول" @@ -463,34 +463,40 @@ msgstr "اسم الدخول" msgid "Create" msgstr "انشئ" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "ÙˆØØ¯Ø© التخزين Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠØ©" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "غير Ù…ØØ¯ÙˆØ¯" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "شيء آخر" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "ÙˆØØ¯Ø© التخزين" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "تغيير اسم Ø§Ù„ØØ³Ø§Ø¨" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "اعداد كلمة مرور جديدة" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Ø§ÙØªØ±Ø§Ø¶ÙŠ" diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po index c28fd961708..27fc477b48b 100644 --- a/l10n/ar/user_ldap.po +++ b/l10n/ar/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/be/settings.po b/l10n/be/settings.po index 77d13b3886c..3efffd109da 100644 --- a/l10n/be/settings.po +++ b/l10n/be/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:02+0200\n" -"PO-Revision-Date: 2013-05-25 00:02+0000\n" +"POT-Creation-Date: 2013-06-11 01:57+0200\n" +"PO-Revision-Date: 2013-06-10 23:57+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -324,11 +324,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:235 templates/personal.php:105 +#: templates/admin.php:235 templates/personal.php:111 msgid "Version" msgstr "" -#: templates/admin.php:237 templates/personal.php:108 +#: templates/admin.php:237 templates/personal.php:114 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "" @@ -423,39 +423,39 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" -#: templates/personal.php:68 +#: templates/personal.php:71 msgid "Email" msgstr "" -#: templates/personal.php:70 +#: templates/personal.php:73 msgid "Your email address" msgstr "" -#: templates/personal.php:71 +#: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" msgstr "" -#: templates/personal.php:77 templates/personal.php:78 +#: templates/personal.php:83 templates/personal.php:84 msgid "Language" msgstr "" -#: templates/personal.php:89 +#: templates/personal.php:95 msgid "Help translate" msgstr "" -#: templates/personal.php:94 +#: templates/personal.php:100 msgid "WebDAV" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:102 msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po index 9a8a0e7377a..7f23971b429 100644 --- a/l10n/bg_BG/core.po +++ b/l10n/bg_BG/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "поÑледните години" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Отказ" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Да" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ðе" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Добре" diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po index 686806697cf..46d9c1c6c6c 100644 --- a/l10n/bg_BG/files.po +++ b/l10n/bg_BG/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po index 2724bfff37b..83b8906cbb3 100644 --- a/l10n/bg_BG/files_external.po +++ b/l10n/bg_BG/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po index 9ba189937e5..d3d99043e10 100644 --- a/l10n/bg_BG/files_sharing.po +++ b/l10n/bg_BG/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po index d8dbed08b23..8d94958f90a 100644 --- a/l10n/bg_BG/files_trashbin.po +++ b/l10n/bg_BG/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Димитър КръÑтев <dimitar.t.krastev@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: Димитър КръÑтев <dimitar.t.krastev@gmail.com>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: ajax/delete.php:42 #, php-format msgid "Couldn't delete %s permanently" -msgstr "Ðевъзможно изтриване на %s завинаги" +msgstr "Ðевъзможно перманентното изтриване на %s" #: ajax/undelete.php:42 #, php-format diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po index 2b6dc3bc0d9..bfedf4b5777 100644 --- a/l10n/bg_BG/lib.po +++ b/l10n/bg_BG/lib.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Димитър КръÑтев <dimitar.t.krastev@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: Димитър КръÑтев <dimitar.t.krastev@gmail.com>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,27 +18,27 @@ msgstr "" "Language: bg_BG\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Помощ" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Лични" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "ÐаÑтройки" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Потребители" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "ПриложениÑ" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Ðдмин" @@ -111,7 +112,7 @@ msgstr "%s, не можете да ползвате точки в името нР#: setup.php:64 #, php-format msgid "%s set the database host." -msgstr "" +msgstr "%s задай хоÑÑ‚ на базата данни." #: setup.php:132 setup.php:329 setup.php:374 msgid "PostgreSQL username and/or password not valid" @@ -123,7 +124,7 @@ msgstr "Ðеобходимо е да влезете в вÑъщеÑтвуващ #: setup.php:155 msgid "Oracle connection could not be established" -msgstr "" +msgstr "Oracle връзка не можа да Ñе оÑъщеÑтви" #: setup.php:237 msgid "MySQL username and/or password not valid" @@ -142,7 +143,7 @@ msgstr "Грешка в базата от данни: \"%s\"" #: setup.php:585 setup.php:601 setup.php:609 setup.php:618 #, php-format msgid "Offending command was: \"%s\"" -msgstr "" +msgstr "Проблемната команда беше: \"%s\"" #: setup.php:308 #, php-format @@ -169,7 +170,7 @@ msgstr "Ðевалидно Oracle потребителÑко име и/или п #: setup.php:592 setup.php:624 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" -msgstr "" +msgstr "Проблемната команда беше: \"%s\", име: %s, парола: %s" #: setup.php:644 #, php-format @@ -180,7 +181,7 @@ msgstr "Ðевалидно MS SQL потребителÑко име и/или п msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "ВашиÑÑ‚ web Ñървър вÑе още не е удачно наÑтроен да позволÑва ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° файлове, защото WebDAV интерфейÑÑŠÑ‚ изглежда не работи." #: setup.php:868 #, php-format diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po index 3e5f0890bdc..c88d22ac9da 100644 --- a/l10n/bg_BG/settings.po +++ b/l10n/bg_BG/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "възтановÑване" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Групи" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Изтриване" @@ -190,7 +190,7 @@ msgstr "" msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "ВашиÑÑ‚ web Ñървър вÑе още не е удачно наÑтроен да позволÑва ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° файлове, защото WebDAV интерфейÑÑŠÑ‚ изглежда не работи." #: templates/admin.php:33 #, php-format @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "Покажи наÑтройките за първоначално зареждане отново" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Парола" @@ -423,7 +423,7 @@ msgstr "Ðова парола" msgid "Change password" msgstr "ПромÑна на паролата" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Екранно име" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Потребител" @@ -463,34 +463,40 @@ msgstr "Потребител" msgid "Create" msgstr "Създаване" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Хранилище по подразбиране" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ðеограничено" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Други" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Хранилище" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "По подразбиране" diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po index 63f3d6341a4..a8a9b0ae76d 100644 --- a/l10n/bg_BG/user_ldap.po +++ b/l10n/bg_BG/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po index 4e540efe2c1..19e77f12741 100644 --- a/l10n/bn_BD/core.po +++ b/l10n/bn_BD/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "বছর পূরà§à¦¬à§‡" msgid "Choose" msgstr "বেছে নিন" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "বাতির" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "হà§à¦¯à¦¾à¦" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "না" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "তথাসà§à¦¤à§" diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po index 7a49c7fdf11..a30f0a31709 100644 --- a/l10n/bn_BD/files.po +++ b/l10n/bn_BD/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po index b9856f89988..32d039ff17b 100644 --- a/l10n/bn_BD/files_external.po +++ b/l10n/bn_BD/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po index 36b91dbbdc7..f5115942446 100644 --- a/l10n/bn_BD/files_sharing.po +++ b/l10n/bn_BD/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po index 859fdc8dba3..211f3350341 100644 --- a/l10n/bn_BD/files_trashbin.po +++ b/l10n/bn_BD/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po index 71713f6fac6..ed003580a46 100644 --- a/l10n/bn_BD/lib.po +++ b/l10n/bn_BD/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: bn_BD\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "সহায়িকা" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "বà§à¦¯à¦•à§à¦¤à¦¿à¦—ত" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "নিয়ামকসমূহ" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•ারী" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "অà§à¦¯à¦¾à¦ª" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "পà§à¦°à¦¶à¦¾à¦¸à¦¨" diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po index 8e2af0fe033..d41ab646fba 100644 --- a/l10n/bn_BD/settings.po +++ b/l10n/bn_BD/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "কà§à¦°à¦¿à§Ÿà¦¾ পà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "গোষà§à¦ ীসমূহ" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "গোষà§à¦ à§€ পà§à¦°à¦¶à¦¾à¦¸à¦•" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "মà§à¦›à§‡" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "পà§à¦°à¦¥à¦®à¦¬à¦¾à¦° চালানোর যাদà§à¦•র পূনরায় পà§à¦°à¦¦à¦°à§à¦¶à¦¨ কর" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "কূটশবà§à¦¦" @@ -423,7 +423,7 @@ msgstr "নতà§à¦¨ কূটশবà§à¦¦" msgid "Change password" msgstr "কূটশবà§à¦¦ পরিবরà§à¦¤à¦¨ করà§à¦¨" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "আপনার ownCloud ঠসংযà§à¦•à§à¦¤ হতে à¦à¦‡ ঠিকানাটি আপনার ফাইল বà§à¦¯à¦¬à¦¸à§à¦¥à¦¾à¦ªà¦•ে বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "তৈরী কর" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ সংরকà§à¦·à¦£à¦¾à¦—ার" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "অসীম" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "অনà§à¦¯à¦¾à¦¨à§à¦¯" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "সংরকà§à¦·à¦£à¦¾à¦—ার" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤" diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po index 89d30bf5b27..5b1e57a6443 100644 --- a/l10n/bn_BD/user_ldap.po +++ b/l10n/bn_BD/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ca/core.po b/l10n/ca/core.po index cb2a1ec5fde..e8aa633e6b0 100644 --- a/l10n/ca/core.po +++ b/l10n/ca/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -218,23 +218,23 @@ msgstr "anys enrere" msgid "Choose" msgstr "Escull" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Cancel·la" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Error en carregar la plantilla del seleccionador de fitxers" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "SÃ" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "No" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "D'acord" diff --git a/l10n/ca/files.po b/l10n/ca/files.po index 48c97b4e87d..bad7f54ff8e 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po index 10fc22da5c6..ba235e5b616 100644 --- a/l10n/ca/files_encryption.po +++ b/l10n/ca/files_encryption.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# rogerc, 2013 # Jordi Vilalta Prat <jvprat@jvprat.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:23+0000\n" +"Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,29 +21,29 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "La clau de recuperació s'ha activat" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "La clau de recuperació s'ha descativat" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "La contrasenya s'ha canviat." #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta." #: js/settings-admin.js:11 msgid "Saving..." @@ -55,50 +56,50 @@ msgstr "Xifrat" #: templates/settings-admin.php:9 msgid "" "Enable encryption passwords recovery key (allow sharing to recovery key):" -msgstr "" +msgstr "Activa la clau de recuperació de contrasenya (permet compartir la clau de recuperació):" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "Contrasenya de recuperació del compte" #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" -msgstr "" +msgstr "Activat" #: templates/settings-admin.php:28 templates/settings-personal.php:26 msgid "Disabled" -msgstr "" +msgstr "Desactivat" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" -msgstr "" +msgstr "Canvia la clau de recuperació de la contrasenya:" #: templates/settings-admin.php:39 msgid "Old Recovery account password" -msgstr "" +msgstr "Contrasenya de recuperació anterior" #: templates/settings-admin.php:46 msgid "New Recovery account password" -msgstr "" +msgstr "Nova contrasenya de recuperació de compte" #: templates/settings-admin.php:51 msgid "Change Password" -msgstr "" +msgstr "Canvia la contrasenya" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" -msgstr "" +msgstr "Activa la recuperació de contrasenya compartint tots els fitxers amb l'administrador:" #: templates/settings-personal.php:11 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files if your password is lost" -msgstr "" +msgstr "Activant aquesta opció us permetrà obtenir de nou accés als fitxers encriptats si perdeu la contrasenya" #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "S'han actualitzat els arranjaments de recuperació de fitxers" #: templates/settings-personal.php:28 msgid "Could not update file recovery" -msgstr "" +msgstr "No s'ha pogut actualitzar la recuperació de fitxers" diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po index b7e4057a963..4202bcede87 100644 --- a/l10n/ca/files_external.po +++ b/l10n/ca/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po index 35e498e1347..b2b6ad1bec6 100644 --- a/l10n/ca/files_sharing.po +++ b/l10n/ca/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po index d9221e27024..f36679d87f0 100644 --- a/l10n/ca/files_trashbin.po +++ b/l10n/ca/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po index 64442b32d2a..8e5de2da714 100644 --- a/l10n/ca/lib.po +++ b/l10n/ca/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Ajuda" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personal" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Configuració" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Usuaris" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplicacions" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administració" diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po index 6b9d10a21d0..4aa5099f541 100644 --- a/l10n/ca/settings.po +++ b/l10n/ca/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -138,16 +138,16 @@ msgstr "desfés" msgid "Unable to remove user" msgstr "No s'ha pogut eliminar l'usuari" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grups" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grup Admin" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Esborra" @@ -401,7 +401,7 @@ msgstr "Obtén les aplicacions per sincronitzar fitxers" msgid "Show First Run Wizard again" msgstr "Torna a mostrar l'assistent de primera execució" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Contrasenya" @@ -425,7 +425,7 @@ msgstr "Contrasenya nova" msgid "Change password" msgstr "Canvia la contrasenya" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Nom a mostrar" @@ -457,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Nom d'accés" @@ -465,34 +465,40 @@ msgstr "Nom d'accés" msgid "Create" msgstr "Crea" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "Recuperació de contrasenya d'administrador" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Emmagatzemament per defecte" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Il·limitat" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Un altre" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Emmagatzemament" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "canvia el nom a mostrar" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "estableix nova contrasenya" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Per defecte" diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po index 90451de9db0..338f63d885e 100644 --- a/l10n/ca/user_ldap.po +++ b/l10n/ca/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index 37a3d5a4a86..ea188f5a367 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Honza K. <honza889@gmail.com>, 2013 # Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -217,23 +218,23 @@ msgstr "pÅ™ed lety" msgid "Choose" msgstr "Vybrat" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "ZruÅ¡it" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" -msgstr "" +msgstr "Chyba pÅ™i naÄÃtánà šablony výbÄ›ru souborů" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ano" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ne" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 40cd969ed08..1360e93381d 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -3,13 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Honza K. <honza889@gmail.com>, 2013 +# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -217,7 +219,7 @@ msgstr "{count} soubory" #: lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" -msgstr "" +msgstr "Název složky nelze použÃt. Použità názvu 'Shared' je ownCloudem rezervováno" #: lib/app.php:73 msgid "Unable to rename file" diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po index 6c2fa91ab96..3109e60cfd9 100644 --- a/l10n/cs_CZ/files_encryption.po +++ b/l10n/cs_CZ/files_encryption.po @@ -3,13 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Honza K. <honza889@gmail.com>, 2013 +# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 13:50+0000\n" +"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,29 +21,29 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Záchranný klÃÄ byl úspěšnÄ› povolen" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "NepodaÅ™ilo se povolit záchranný klÃÄ. Zkontrolujte prosÃm vaÅ¡e heslo záchranného klÃÄe!" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Záchranný klÃÄ byl úspěšnÄ› zakázán" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Nelze zakázat záchranný klÃÄ. Zkontrolujte prosÃm heslo vaÅ¡eho záchranného klÃÄe." #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "Heslo bylo úspěšnÄ› zmÄ›nÄ›no." #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "Nelze zmÄ›nit heslo. PravdÄ›podobnÄ› nebylo stávajÃcà heslo zadáno správnÄ›." #: js/settings-admin.js:11 msgid "Saving..." @@ -54,50 +56,50 @@ msgstr "Å ifrovánÃ" #: templates/settings-admin.php:9 msgid "" "Enable encryption passwords recovery key (allow sharing to recovery key):" -msgstr "" +msgstr "Povolit záchranný klÃÄ Å¡ifrovacÃch hesel (povolà sdÃlený záchranný klÃÄ):" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "Heslo pro obnovu úÄtu" #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" -msgstr "" +msgstr "Povoleno" #: templates/settings-admin.php:28 templates/settings-personal.php:26 msgid "Disabled" -msgstr "" +msgstr "Zakázáno" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" -msgstr "" +msgstr "ZmÄ›nit záchranný klÃÄ Å¡ifrovacÃch hesel:" #: templates/settings-admin.php:39 msgid "Old Recovery account password" -msgstr "" +msgstr "StávajÃcà heslo pro obnovu úÄtu" #: templates/settings-admin.php:46 msgid "New Recovery account password" -msgstr "" +msgstr "Nové heslo pro obnovu úÄtu" #: templates/settings-admin.php:51 msgid "Change Password" -msgstr "" +msgstr "ZmÄ›nit heslo" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" -msgstr "" +msgstr "Povolit obnovu hesla sdÃlenÃm vÅ¡ech souborů s vaÅ¡Ãm správcem:" #: templates/settings-personal.php:11 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files if your password is lost" -msgstr "" +msgstr "Povolenà vám umožnà znovu zÃskat pÅ™Ãstup k vaÅ¡im zaÅ¡ifrovaným souborům pokud ztratÃte heslo" #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "Možnosti obnovy souborů aktualizovány" #: templates/settings-personal.php:28 msgid "Could not update file recovery" -msgstr "" +msgstr "Nelze aktualizovat obnovu souborů" diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po index d00da7edfa8..d71735e4609 100644 --- a/l10n/cs_CZ/files_external.po +++ b/l10n/cs_CZ/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po index c120ac0126d..c56c7025577 100644 --- a/l10n/cs_CZ/files_sharing.po +++ b/l10n/cs_CZ/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po index b6a7b8ec88b..704051fb678 100644 --- a/l10n/cs_CZ/files_trashbin.po +++ b/l10n/cs_CZ/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po index 8901d279c3b..01a43939e56 100644 --- a/l10n/cs_CZ/lib.po +++ b/l10n/cs_CZ/lib.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,27 +18,27 @@ msgstr "" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "NápovÄ›da" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "OsobnÃ" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "NastavenÃ" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Uživatelé" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplikace" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administrace" @@ -123,7 +124,7 @@ msgstr "MusÃte zadat existujÃcà úÄet, Äi správce." #: setup.php:155 msgid "Oracle connection could not be established" -msgstr "" +msgstr "Spojenà s Oracle nemohlo být navázáno" #: setup.php:237 msgid "MySQL username and/or password not valid" diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index 6cf64ada117..27e39b977a5 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -136,16 +137,16 @@ msgstr "zpÄ›t" msgid "Unable to remove user" msgstr "Nelze odebrat uživatele" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Skupiny" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Správa skupiny" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Smazat" @@ -399,7 +400,7 @@ msgstr "ZÃskat aplikace pro synchronizaci vaÅ¡ich souborů" msgid "Show First Run Wizard again" msgstr "Znovu zobrazit průvodce prvnÃm spuÅ¡tÄ›nÃm" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Heslo" @@ -423,7 +424,7 @@ msgstr "Nové heslo" msgid "Change password" msgstr "ZmÄ›nit heslo" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Zobrazované jméno" @@ -455,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Použijte tuto adresu pro pÅ™ipojenà k vaÅ¡emu ownCloud skrze správce souborů" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "PÅ™ihlaÅ¡ovacà jméno" @@ -463,34 +464,40 @@ msgstr "PÅ™ihlaÅ¡ovacà jméno" msgid "Create" msgstr "VytvoÅ™it" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" -msgstr "" +msgstr "Heslo obnovy správce" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "Zadejte heslo obnovy pro obnovenà souborů uživatele pÅ™i zmÄ›nÄ› hesla" -#: templates/users.php:38 +#: templates/users.php:42 msgid "Default Storage" msgstr "Výchozà úložiÅ¡tÄ›" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "NeomezenÄ›" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Jiný" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "ÚložiÅ¡tÄ›" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "zmÄ›nit zobrazované jméno" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "nastavit nové heslo" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "VýchozÃ" diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index 1bab1b19b4f..164c9e79768 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/user_ldap.po @@ -3,13 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Honza K. <honza889@gmail.com>, 2013 +# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +21,7 @@ msgstr "" #: ajax/clearMappings.php:34 msgid "Failed to clear the mappings." -msgstr "" +msgstr "Selhalo zruÅ¡enà mapovánÃ." #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" @@ -59,7 +61,7 @@ msgstr "Nelze pÅ™idat nastavenà serveru" #: js/settings.js:111 msgid "mappings cleared" -msgstr "" +msgstr "mapovánà zruÅ¡eno" #: js/settings.js:112 msgid "Success" @@ -342,7 +344,7 @@ msgstr "Ponechte prázdné pro uživatelské jméno (výchozÃ). Jinak uveÄte L #: templates/settings.php:101 msgid "Internal Username" -msgstr "" +msgstr "Internà uživatelské jméno" #: templates/settings.php:102 msgid "" @@ -362,11 +364,11 @@ msgstr "" #: templates/settings.php:103 msgid "Internal Username Attribute:" -msgstr "" +msgstr "Atribut internÃho uživatelského jména:" #: templates/settings.php:104 msgid "Override UUID detection" -msgstr "" +msgstr "Nastavit ruÄnÄ› UUID atribut" #: templates/settings.php:105 msgid "" @@ -381,11 +383,11 @@ msgstr "" #: templates/settings.php:106 msgid "UUID Attribute:" -msgstr "" +msgstr "Atribut UUID:" #: templates/settings.php:107 msgid "Username-LDAP User Mapping" -msgstr "" +msgstr "Mapovánà uživatelských jmen z LDAPu" #: templates/settings.php:108 msgid "" @@ -404,11 +406,11 @@ msgstr "" #: templates/settings.php:109 msgid "Clear Username-LDAP User Mapping" -msgstr "" +msgstr "ZruÅ¡it mapovánà uživatelských jmen LDAPu" #: templates/settings.php:109 msgid "Clear Groupname-LDAP Group Mapping" -msgstr "" +msgstr "ZruÅ¡it mapovánà názvů skupin LDAPu" #: templates/settings.php:111 msgid "Test Configuration" diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po index a818cd9ffbd..dc39105a5e7 100644 --- a/l10n/cy_GB/core.po +++ b/l10n/cy_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "blwyddyn yn ôl" msgid "Choose" msgstr "Dewisiwch" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Diddymu" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ie" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Na" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Iawn" diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po index a2106f62ed6..248a4552ca5 100644 --- a/l10n/cy_GB/files.po +++ b/l10n/cy_GB/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po index 6d1cd4e53bf..db2ab484c96 100644 --- a/l10n/cy_GB/files_external.po +++ b/l10n/cy_GB/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po index 7dd07b906ee..d5e8162d9ac 100644 --- a/l10n/cy_GB/files_sharing.po +++ b/l10n/cy_GB/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po index dfa0633d70e..5c3f290a67e 100644 --- a/l10n/cy_GB/files_trashbin.po +++ b/l10n/cy_GB/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po index 10fbc229593..c437a9d11ac 100644 --- a/l10n/cy_GB/lib.po +++ b/l10n/cy_GB/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: cy_GB\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Cymorth" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personol" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Gosodiadau" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Defnyddwyr" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Pecynnau" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Gweinyddu" diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po index 44a137be4da..f84626907a2 100644 --- a/l10n/cy_GB/settings.po +++ b/l10n/cy_GB/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "dadwneud" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grwpiau" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Dileu" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Cyfrinair" @@ -423,7 +423,7 @@ msgstr "Cyfrinair newydd" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Arall" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po index cf24e32578d..0dc7e5dc83c 100644 --- a/l10n/cy_GB/user_ldap.po +++ b/l10n/cy_GB/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/da/core.po b/l10n/da/core.po index 9eaa431a2ca..c4cf2f91af6 100644 --- a/l10n/da/core.po +++ b/l10n/da/core.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Peter Jespersen <flywheeldk@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: Peter Jespersen <flywheeldk@gmail.com>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -216,23 +217,23 @@ msgstr "Ã¥r siden" msgid "Choose" msgstr "Vælg" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Annuller" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nej" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "OK" @@ -405,11 +406,11 @@ msgid "" "The link to reset your password has been sent to your email.<br>If you do " "not receive it within a reasonable amount of time, check your spam/junk " "folders.<br>If it is not there ask your local administrator ." -msgstr "" +msgstr "Linket til at nulstille dit kodeord er blevet sendt til din e-post. <br> Hvis du ikke modtager den inden for en rimelig tid, sÃ¥ tjek dine spam / junk mapper.<br> Hvis det ikke er der, sÃ¥ spørg din lokale administrator." #: lostpassword/templates/lostpassword.php:12 msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "" +msgstr "Anmodning mislykkedes!<br>Er du sikker pÃ¥ at din e-post / brugernavn var korrekt?" #: lostpassword/templates/lostpassword.php:15 msgid "You will receive a link to reset your password via Email." @@ -567,7 +568,7 @@ msgstr "Webtjenester under din kontrol" #: templates/layout.user.php:37 #, php-format msgid "%s is available. Get more information on how to update." -msgstr "" +msgstr "%s er tilgængelig. FÃ¥ mere information om, hvordan du opdaterer." #: templates/layout.user.php:62 msgid "Log out" diff --git a/l10n/da/files.po b/l10n/da/files.po index f056e111c6d..eea893fecb0 100644 --- a/l10n/da/files.po +++ b/l10n/da/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po index 237b3be5ebe..4406ce7b6cc 100644 --- a/l10n/da/files_external.po +++ b/l10n/da/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po index c21955e111c..14f93b8eff2 100644 --- a/l10n/da/files_sharing.po +++ b/l10n/da/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po index 4e42d13ee44..537aa7e9cc5 100644 --- a/l10n/da/files_trashbin.po +++ b/l10n/da/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/da/lib.po b/l10n/da/lib.po index f5b0d330eee..de52b9d5a25 100644 --- a/l10n/da/lib.po +++ b/l10n/da/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Hjælp" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personligt" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Indstillinger" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Brugere" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Apps" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index e5f19536622..c761ed1efd9 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -137,16 +137,16 @@ msgstr "fortryd" msgid "Unable to remove user" msgstr "Kan ikke fjerne bruger" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupper" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Gruppe Administrator" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Slet" @@ -400,7 +400,7 @@ msgstr "Hent applikationerne for at synkronisere dine filer" msgid "Show First Run Wizard again" msgstr "Vis Første Kørsels Guiden igen." -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Kodeord" @@ -424,7 +424,7 @@ msgstr "Nyt kodeord" msgid "Change password" msgstr "Skift kodeord" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Skærmnavn" @@ -456,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Loginnavn" @@ -464,34 +464,40 @@ msgstr "Loginnavn" msgid "Create" msgstr "Ny" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Standard opbevaring" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ubegrænset" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Andet" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Opbevaring" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "skift skærmnavn" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "skift kodeord" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Standard" diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po index 4ebfe129017..f3657f500e8 100644 --- a/l10n/da/user_ldap.po +++ b/l10n/da/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/de/core.po b/l10n/de/core.po index 0a2daa748c7..26d0ee600cb 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -5,14 +5,15 @@ # Translators: # arkascha <foss@christian-reiner.info>, 2013 # Marcel Kühlhorn <susefan93@gmx.de>, 2013 +# ninov <ninovdl@ymail.com>, 2013 # Mirodin <blobbyjj@ymail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: ninov <ninovdl@ymail.com>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -219,23 +220,23 @@ msgstr "Vor Jahren" msgid "Choose" msgstr "Auswählen" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Abbrechen" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" -msgstr "" +msgstr "Dateiauswahltemplate konnte nicht geladen werden" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nein" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "OK" diff --git a/l10n/de/files.po b/l10n/de/files.po index 79e6d686e38..53c74030dbd 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -4,13 +4,14 @@ # # Translators: # Marcel Kühlhorn <susefan93@gmx.de>, 2013 +# ninov <ninovdl@ymail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: ninov <ninovdl@ymail.com>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -218,7 +219,7 @@ msgstr "{count} Dateien" #: lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" -msgstr "" +msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen" #: lib/app.php:73 msgid "Unable to rename file" diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po index 59cfb0e8e2c..90339bb580a 100644 --- a/l10n/de/files_encryption.po +++ b/l10n/de/files_encryption.po @@ -3,13 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# iLennart21 <a12s34d56f78@live.com>, 2013 +# Stephan Köninger <mail@stekoe.de>, 2013 +# ninov <ninovdl@ymail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:23+0000\n" +"Last-Translator: ninov <ninovdl@ymail.com>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,29 +22,29 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Wiederherstellungsschlüssel wurde erfolgreich aktiviert" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Wiederherstellungsschlüssel deaktiviert." #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "Dein Passwort wurde geändert." #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch." #: js/settings-admin.js:11 msgid "Saving..." @@ -58,19 +61,19 @@ msgstr "" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "Password zurücksetzen" #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" -msgstr "" +msgstr "Aktiviert" #: templates/settings-admin.php:28 templates/settings-personal.php:26 msgid "Disabled" -msgstr "" +msgstr "Deaktiviert" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" -msgstr "" +msgstr "Wiederherstellungsschlüssel für Passwörter ändern:" #: templates/settings-admin.php:39 msgid "Old Recovery account password" @@ -82,7 +85,7 @@ msgstr "" #: templates/settings-admin.php:51 msgid "Change Password" -msgstr "" +msgstr "Passwort ändern" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" @@ -92,11 +95,11 @@ msgstr "" msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files if your password is lost" -msgstr "" +msgstr "Wenn Sie diese Einstellung aktivieren, können Sie auch im Falle des Verlustes Ihres Passworts auf verschlüsselte Dateien zugreifen" #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert" #: templates/settings-personal.php:28 msgid "Could not update file recovery" diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po index 6d70a2862e2..2ad51443ea3 100644 --- a/l10n/de/files_external.po +++ b/l10n/de/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Mirodin <blobbyjj@ymail.com>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po index 39b0fd437ba..b8513cd97b6 100644 --- a/l10n/de/files_sharing.po +++ b/l10n/de/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Mirodin <blobbyjj@ymail.com>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po index 7529a21c1e8..b31d8481e26 100644 --- a/l10n/de/files_trashbin.po +++ b/l10n/de/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Mirodin <blobbyjj@ymail.com>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" diff --git a/l10n/de/lib.po b/l10n/de/lib.po index c46cf7e35af..1a48973ae23 100644 --- a/l10n/de/lib.po +++ b/l10n/de/lib.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# ninov <ninovdl@ymail.com>, 2013 # Mirodin <blobbyjj@ymail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: Mirodin <blobbyjj@ymail.com>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: ninov <ninovdl@ymail.com>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,27 +19,27 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Hilfe" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Persönlich" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Einstellungen" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Benutzer" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Apps" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administration" @@ -124,7 +125,7 @@ msgstr "Du musst entweder ein existierendes Benutzerkonto oder das Administrator #: setup.php:155 msgid "Oracle connection could not be established" -msgstr "" +msgstr "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt werden" #: setup.php:237 msgid "MySQL username and/or password not valid" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 2dea5e123ba..271c738d01f 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -4,13 +4,14 @@ # # Translators: # arkascha <foss@christian-reiner.info>, 2013 +# ninov <ninovdl@ymail.com>, 2013 # Mirodin <blobbyjj@ymail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" @@ -138,16 +139,16 @@ msgstr "rückgängig machen" msgid "Unable to remove user" msgstr "Benutzer konnte nicht entfernt werden." -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Gruppen" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Gruppenadministrator" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Löschen" @@ -401,7 +402,7 @@ msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter" msgid "Show First Run Wizard again" msgstr "Erstinstallation erneut durchführen" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Passwort" @@ -425,7 +426,7 @@ msgstr "Neues Passwort" msgid "Change password" msgstr "Passwort ändern" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Anzeigename" @@ -457,7 +458,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Loginname" @@ -465,34 +466,40 @@ msgstr "Loginname" msgid "Create" msgstr "Anlegen" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" +msgstr "Admin-Wiederherstellungspasswort" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" msgstr "" -#: templates/users.php:38 +#: templates/users.php:42 msgid "Default Storage" msgstr "Standard-Speicher" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Unbegrenzt" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Andere" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Speicher" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "Anzeigenamen ändern" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "Neues Passwort setzen" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Standard" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index 889957c3659..69e53882b1b 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index c2c8106a2fc..89a8db6f5e0 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" @@ -220,23 +220,23 @@ msgstr "Vor Jahren" msgid "Choose" msgstr "Auswählen" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Abbrechen" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten." -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nein" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "OK" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index ed1d3b9e02e..ab8b5fadfbe 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: a.tangemann <a.tangemann@web.de>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po index f9315952f0b..6b74b97fd54 100644 --- a/l10n/de_DE/files_encryption.po +++ b/l10n/de_DE/files_encryption.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# ako84 <a0306265@unet.univie.ac.at>, 2013 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-10 01:58+0200\n" +"PO-Revision-Date: 2013-06-09 10:16+0000\n" +"Last-Translator: a.tangemann <a.tangemann@web.de>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,21 +21,21 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert." #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert." #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." @@ -59,7 +60,7 @@ msgstr "" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "Account-Passwort wiederherstellen" #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" @@ -75,11 +76,11 @@ msgstr "" #: templates/settings-admin.php:39 msgid "Old Recovery account password" -msgstr "" +msgstr "Altes Passwort für die Account-Wiederherstellung" #: templates/settings-admin.php:46 msgid "New Recovery account password" -msgstr "" +msgstr "Neues Passwort für die Account-Wiederherstellung" #: templates/settings-admin.php:51 msgid "Change Password" @@ -87,18 +88,18 @@ msgstr "Passwort ändern" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" -msgstr "" +msgstr "Aktiviere die Wiederherstellung deines Passwortes durch das Teilen aller Dateien mit dem Administrator:" #: templates/settings-personal.php:11 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files if your password is lost" -msgstr "" +msgstr "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben." #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert." #: templates/settings-personal.php:28 msgid "Could not update file recovery" -msgstr "" +msgstr "Die Dateiwiederherstellung konnte nicht aktualisiert werden." diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po index 51affc4562c..c22e70ce0b5 100644 --- a/l10n/de_DE/files_external.po +++ b/l10n/de_DE/files_external.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Mirodin <blobbyjj@ymail.com>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po index e0dcbb429db..9b53044eef7 100644 --- a/l10n/de_DE/files_sharing.po +++ b/l10n/de_DE/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Mirodin <blobbyjj@ymail.com>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po index 33c2fd01b0b..8de7dd8684f 100644 --- a/l10n/de_DE/files_trashbin.po +++ b/l10n/de_DE/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Mirodin <blobbyjj@ymail.com>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po index b73ee8fbae9..105895a101c 100644 --- a/l10n/de_DE/lib.po +++ b/l10n/de_DE/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Hilfe" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Persönlich" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Einstellungen" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Benutzer" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Apps" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administrator" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index f769fdb4576..e83776b2f4d 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -140,16 +140,16 @@ msgstr "rückgängig machen" msgid "Unable to remove user" msgstr "Der Benutzer konnte nicht entfernt werden." -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Gruppen" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Gruppenadministrator" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Löschen" @@ -403,7 +403,7 @@ msgstr "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren" msgid "Show First Run Wizard again" msgstr "Den Einrichtungsassistenten erneut anzeigen" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Passwort" @@ -427,7 +427,7 @@ msgstr "Neues Passwort" msgid "Change password" msgstr "Passwort ändern" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Anzeigename" @@ -459,7 +459,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Loginname" @@ -467,34 +467,40 @@ msgstr "Loginname" msgid "Create" msgstr "Erstellen" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "Admin-Paswort-Wiederherstellung" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Standard-Speicher" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Unbegrenzt" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Andere" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Speicher" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "Anzeigenamen ändern" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "Neues Passwort setzen" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Standard" diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po index 5658da2dc77..b7b54c71e06 100644 --- a/l10n/de_DE/user_ldap.po +++ b/l10n/de_DE/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" @@ -369,7 +369,7 @@ msgstr "" #: templates/settings.php:104 msgid "Override UUID detection" -msgstr "" +msgstr "UUID-Erkennung überschreiben" #: templates/settings.php:105 msgid "" @@ -384,7 +384,7 @@ msgstr "" #: templates/settings.php:106 msgid "UUID Attribute:" -msgstr "" +msgstr "UUID-Attribut:" #: templates/settings.php:107 msgid "Username-LDAP User Mapping" diff --git a/l10n/el/core.po b/l10n/el/core.po index 1758538321f..00cc52ccd5f 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Teogramm <theodorewii121@hotmail.com>, 2013 # Wasilis <inactive+Wasilis@transifex.com>, 2013 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: Teogramm <theodorewii121@hotmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -218,23 +219,23 @@ msgstr "χÏόνια Ï€Ïιν" msgid "Choose" msgstr "ΕπιλÎξτε" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "ΆκυÏο" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Îαι" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Όχι" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Οκ" @@ -569,7 +570,7 @@ msgstr "υπηÏεσίες δικτÏου υπό τον Îλεγχό σας" #: templates/layout.user.php:37 #, php-format msgid "%s is available. Get more information on how to update." -msgstr "" +msgstr "%s είναι διαθÎσιμη. Δείτε πεÏισσότεÏες πληÏοφοÏίες στο πώς να αναβαθμίσετε." #: templates/layout.user.php:62 msgid "Log out" diff --git a/l10n/el/files.po b/l10n/el/files.po index 453d582e61d..2f569777b31 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po index d5c014762f2..363e9327881 100644 --- a/l10n/el/files_encryption.po +++ b/l10n/el/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Teogramm <theodorewii121@hotmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-11 01:56+0200\n" +"PO-Revision-Date: 2013-06-10 15:00+0000\n" +"Last-Translator: Teogramm <theodorewii121@hotmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,11 +38,11 @@ msgstr "" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "Ο κωδικός αλλάχτηκε επιτυχώς." #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "Αποτυχία αλλαγής ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î¯ÏƒÏ‰Ï‚ ο παλιός κωδικός να μην ήταν σωστός." #: js/settings-admin.js:11 msgid "Saving..." @@ -58,15 +59,15 @@ msgstr "" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "ΕπαναφοÏά ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης λογαÏιασμοÏ" #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" -msgstr "" +msgstr "ΕνεÏγοποιημÎνο" #: templates/settings-admin.php:28 templates/settings-personal.php:26 msgid "Disabled" -msgstr "" +msgstr "ΑπενεÏγοποιημÎνο" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" @@ -82,11 +83,11 @@ msgstr "" #: templates/settings-admin.php:51 msgid "Change Password" -msgstr "" +msgstr "Αλλαγή ÎšÏ‰Î´Î¹ÎºÎ¿Ï Î Ïόσβασης" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" -msgstr "" +msgstr "ΕνεÏγοποιήστε την επαναφοÏά ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης με το να μοιÏαστείτε όλα τα αÏχεία με τον διαχειÏιστή σας:" #: templates/settings-personal.php:11 msgid "" @@ -96,7 +97,7 @@ msgstr "" #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "Οι Ïυθμίσεις επαναφοÏάς αÏχείων ανανεώθηκαν" #: templates/settings-personal.php:28 msgid "Could not update file recovery" diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po index 82de1e596cc..35aaea8e906 100644 --- a/l10n/el/files_external.po +++ b/l10n/el/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po index 01931ff4d74..0bc6c891d0e 100644 --- a/l10n/el/files_sharing.po +++ b/l10n/el/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po index d4af6d87acd..bd810400736 100644 --- a/l10n/el/files_trashbin.po +++ b/l10n/el/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/el/lib.po b/l10n/el/lib.po index 5f6c1f21402..d20f019be5b 100644 --- a/l10n/el/lib.po +++ b/l10n/el/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Βοήθεια" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Î Ïοσωπικά" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Ρυθμίσεις" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "ΧÏήστες" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "ΕφαÏμογÎÏ‚" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "ΔιαχειÏιστής" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index 24d56457164..2bc54778f85 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Teogramm <theodorewii121@hotmail.com>, 2013 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -137,16 +138,16 @@ msgstr "αναίÏεση" msgid "Unable to remove user" msgstr "Αδυναμία αφαίÏεση χÏήστη" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Ομάδες" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Ομάδα ΔιαχειÏιστών" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "ΔιαγÏαφή" @@ -400,7 +401,7 @@ msgstr "Λήψη της εφαÏμογής για συγχÏονισμό των msgid "Show First Run Wizard again" msgstr "Î Ïοβολή Î Ïώτης ΕκτÎλεσης ÎŸÎ´Î·Î³Î¿Ï Ï€Î¬Î»Î¹" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Συνθηματικό" @@ -424,7 +425,7 @@ msgstr "ÎÎο συνθηματικό" msgid "Change password" msgstr "Αλλαγή συνθηματικοÏ" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Όνομα εμφάνισης" @@ -456,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "ΧÏήση αυτής της διεÏθυνσης για σÏνδεση στο ownCloud με τον διαχειÏιστή αÏχείων σας" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Όνομα ΣÏνδεσης" @@ -464,34 +465,40 @@ msgstr "Όνομα ΣÏνδεσης" msgid "Create" msgstr "ΔημιουÏγία" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" +msgstr "Κωδικός ΕπαναφοÏάς ΔιαχειÏιστή " + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" msgstr "" -#: templates/users.php:38 +#: templates/users.php:42 msgid "Default Storage" msgstr "Î ÏοκαθοÏισμÎνη Αποθήκευση " -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "ΑπεÏιόÏιστο" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Άλλο" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Αποθήκευση" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "αλλαγή ονόματος εμφάνισης" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "επιλογή νÎου κωδικοÏ" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Î ÏοκαθοÏισμÎνο" diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po index 07f468df2c5..d5a705b7a47 100644 --- a/l10n/el/user_ldap.po +++ b/l10n/el/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po index 25d85fbed79..9df18ea3ed0 100644 --- a/l10n/en@pirate/files.po +++ b/l10n/en@pirate/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po index f7eb799eb01..16e746e5c6c 100644 --- a/l10n/en@pirate/files_sharing.po +++ b/l10n/en@pirate/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po index 2dd26cf0d9d..4459d6d1062 100644 --- a/l10n/en@pirate/settings.po +++ b/l10n/en@pirate/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:02+0200\n" -"PO-Revision-Date: 2013-05-25 00:02+0000\n" +"POT-Creation-Date: 2013-06-11 01:57+0200\n" +"PO-Revision-Date: 2013-06-10 23:57+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -324,11 +324,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:235 templates/personal.php:105 +#: templates/admin.php:235 templates/personal.php:111 msgid "Version" msgstr "" -#: templates/admin.php:237 templates/personal.php:108 +#: templates/admin.php:237 templates/personal.php:114 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Passcode" @@ -423,39 +423,39 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" -#: templates/personal.php:68 +#: templates/personal.php:71 msgid "Email" msgstr "" -#: templates/personal.php:70 +#: templates/personal.php:73 msgid "Your email address" msgstr "" -#: templates/personal.php:71 +#: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" msgstr "" -#: templates/personal.php:77 templates/personal.php:78 +#: templates/personal.php:83 templates/personal.php:84 msgid "Language" msgstr "" -#: templates/personal.php:89 +#: templates/personal.php:95 msgid "Help translate" msgstr "" -#: templates/personal.php:94 +#: templates/personal.php:100 msgid "WebDAV" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:102 msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/eo/core.po b/l10n/eo/core.po index ae39279032a..1767f66a0ac 100644 --- a/l10n/eo/core.po +++ b/l10n/eo/core.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Baptiste <baptiste+transifex@darthenay.fr>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: Baptiste <baptiste+transifex@darthenay.fr>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +53,7 @@ msgstr "Ĉu neniu kategorio estas aldonota?" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "Tiu kategorio jam ekzistas: %s" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 @@ -216,23 +217,23 @@ msgstr "jaroj antaÅe" msgid "Choose" msgstr "Elekti" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Nuligi" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Jes" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ne" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Akcepti" @@ -259,7 +260,7 @@ msgstr "La necesa dosiero {file} ne instaliÄis!" #: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" -msgstr "" +msgstr "Dividita" #: js/share.js:90 msgid "Share" @@ -386,11 +387,11 @@ msgid "" "The update was unsuccessful. Please report this issue to the <a " "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud " "community</a>." -msgstr "" +msgstr "La Äisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>." #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "La Äisdatigo estis sukcesa. Alidirektante nun al ownCloud." #: lostpassword/controller.php:48 msgid "ownCloud password reset" @@ -483,7 +484,7 @@ msgstr "Sekureca averto" #: templates/installation.php:25 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" -msgstr "" +msgstr "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)" #: templates/installation.php:26 msgid "Please update your PHP installation to use ownCloud securely." diff --git a/l10n/eo/files.po b/l10n/eo/files.po index 164d8759c06..a0b27181a48 100644 --- a/l10n/eo/files.po +++ b/l10n/eo/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po index ac5a02bc159..9be001b0d6d 100644 --- a/l10n/eo/files_external.po +++ b/l10n/eo/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po index 253748ab3ee..112d38dc3c5 100644 --- a/l10n/eo/files_sharing.po +++ b/l10n/eo/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po index c7c252a3398..62d64f0e226 100644 --- a/l10n/eo/files_trashbin.po +++ b/l10n/eo/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po index 015eb4b7353..6eac77f054a 100644 --- a/l10n/eo/lib.po +++ b/l10n/eo/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Helpo" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Persona" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Agordo" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Uzantoj" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplikaĵoj" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administranto" diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po index 733dcce6a3e..33b46e2ddba 100644 --- a/l10n/eo/settings.po +++ b/l10n/eo/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "malfari" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupoj" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grupadministranto" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Forigi" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Pasvorto" @@ -423,7 +423,7 @@ msgstr "Nova pasvorto" msgid "Change password" msgstr "ÅœanÄi la pasvorton" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "Krei" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "DefaÅlta konservejo" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Senlima" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Alia" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Konservejo" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "DefaÅlta" diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po index c559d5d7bb5..c97530b8136 100644 --- a/l10n/eo/user_ldap.po +++ b/l10n/eo/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es/core.po b/l10n/es/core.po index 75f8c108d39..80d73a7abe8 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: xhiena <xhiena@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -220,23 +220,23 @@ msgstr "hace años" msgid "Choose" msgstr "Seleccionar" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Error cargando la plantilla del seleccionador de archivos" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "SÃ" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "No" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Aceptar" diff --git a/l10n/es/files.po b/l10n/es/files.po index 7e1119342b0..c464efc0a97 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Art O. Pal <artopal@fastmail.fm>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po index 203599b3017..21f59f5c760 100644 --- a/l10n/es/files_encryption.po +++ b/l10n/es/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# gmoriello <gmoriello@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-02 02:00+0200\n" +"PO-Revision-Date: 2013-06-01 23:40+0000\n" +"Last-Translator: gmoriello <gmoriello@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,29 +20,29 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Se ha habilitado la recuperación de archivos" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña." #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Clave de recuperación deshabilitada" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "Su contraseña ha sido cambiada" #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta." #: js/settings-admin.js:11 msgid "Saving..." @@ -54,50 +55,50 @@ msgstr "Cifrado" #: templates/settings-admin.php:9 msgid "" "Enable encryption passwords recovery key (allow sharing to recovery key):" -msgstr "" +msgstr "Habilitar clave de recuperación de contraseñas ():" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "Recuperar contraseña" #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" -msgstr "" +msgstr "Habilitar" #: templates/settings-admin.php:28 templates/settings-personal.php:26 msgid "Disabled" -msgstr "" +msgstr "Deshabilitado" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" -msgstr "" +msgstr "Cambiar clave de cifrado de contraseñas:" #: templates/settings-admin.php:39 msgid "Old Recovery account password" -msgstr "" +msgstr "Contraseña de recuperación actual" #: templates/settings-admin.php:46 msgid "New Recovery account password" -msgstr "" +msgstr "Contraseña de recuperación nueva" #: templates/settings-admin.php:51 msgid "Change Password" -msgstr "" +msgstr "Cambiar contraseña" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" -msgstr "" +msgstr "Habilitar recuperación de contraseña compartiendo todos los archivos con su administrador" #: templates/settings-personal.php:11 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files if your password is lost" -msgstr "" +msgstr "Habilitar esta opción para poder acceder a sus archivos cifrados si pierde su contraseña" #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "Opciones de recuperación de archivos actualizada" #: templates/settings-personal.php:28 msgid "Could not update file recovery" -msgstr "" +msgstr "No se pudo actualizar la recuperación de archivos" diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po index 4e3ebe75495..13a77bad726 100644 --- a/l10n/es/files_external.po +++ b/l10n/es/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po index 603293cd989..7e38d35af56 100644 --- a/l10n/es/files_sharing.po +++ b/l10n/es/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po index 0a49bfa445d..489ca41f189 100644 --- a/l10n/es/files_trashbin.po +++ b/l10n/es/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es/lib.po b/l10n/es/lib.po index 25ca8419982..2e92e22e456 100644 --- a/l10n/es/lib.po +++ b/l10n/es/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: xhiena <xhiena@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Ayuda" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personal" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Ajustes" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Usuarios" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplicaciones" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administración" diff --git a/l10n/es/settings.po b/l10n/es/settings.po index aa8a71b21c3..3b7165c0148 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -139,16 +139,16 @@ msgstr "deshacer" msgid "Unable to remove user" msgstr "No se puede eliminar el usuario" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupos" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grupo administrador" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Eliminar" @@ -402,7 +402,7 @@ msgstr "Obtener las aplicaciones para sincronizar sus archivos" msgid "Show First Run Wizard again" msgstr "Mostrar asistente para iniciar otra vez" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Contraseña" @@ -426,7 +426,7 @@ msgstr "Nueva contraseña" msgid "Change password" msgstr "Cambiar contraseña" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Nombre a mostrar" @@ -458,7 +458,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Nombre de usuario" @@ -466,34 +466,40 @@ msgstr "Nombre de usuario" msgid "Create" msgstr "Crear" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "Recuperación de la contraseña de administración" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Almacenamiento predeterminado" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ilimitado" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Otro" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Almacenamiento" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "Cambiar nombre a mostrar" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "Configurar nueva contraseña" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Predeterminado" diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po index cd5063cd43c..c7cd6fd884c 100644 --- a/l10n/es/user_ldap.po +++ b/l10n/es/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: xhiena <xhiena@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index f4cd5f297b2..3201c21f9b8 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "años atrás" msgid "Choose" msgstr "Elegir" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "SÃ" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "No" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Aceptar" diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index 55c946c2b60..c1cbed4a1ec 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po index d79cccc1c12..705385ce3b8 100644 --- a/l10n/es_AR/files_external.po +++ b/l10n/es_AR/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po index ce5dc927317..569ddd5f298 100644 --- a/l10n/es_AR/files_sharing.po +++ b/l10n/es_AR/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po index 72ef79fa03e..1d738ef5581 100644 --- a/l10n/es_AR/files_trashbin.po +++ b/l10n/es_AR/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po index e344ca8c54a..bf38a537d43 100644 --- a/l10n/es_AR/lib.po +++ b/l10n/es_AR/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Ayuda" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personal" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Configuración" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Usuarios" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplicaciones" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administración" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index c653565d480..2f09ef06dcb 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -137,16 +137,16 @@ msgstr "deshacer" msgid "Unable to remove user" msgstr "Imposible remover usuario" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupos" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grupo Administrador" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Borrar" @@ -400,7 +400,7 @@ msgstr "Obtené aplicaciones para sincronizar tus archivos" msgid "Show First Run Wizard again" msgstr "Mostrar de nuevo el asistente de primera ejecución" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Contraseña" @@ -424,7 +424,7 @@ msgstr "Nueva contraseña:" msgid "Change password" msgstr "Cambiar contraseña" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Nombre a mostrar" @@ -456,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Nombre de " @@ -464,34 +464,40 @@ msgstr "Nombre de " msgid "Create" msgstr "Crear" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Almacenamiento Predeterminado" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ilimitado" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Otros" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Almacenamiento" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "Cambiar el nombre que se muestra" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "Configurar nueva contraseña" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Predeterminado" diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po index c74bf166044..0d97c65d8c8 100644 --- a/l10n/es_AR/user_ldap.po +++ b/l10n/es_AR/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index 6ff37005746..5f0af28cc17 100644 --- a/l10n/et_EE/core.po +++ b/l10n/et_EE/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -218,23 +218,23 @@ msgstr "aastat tagasi" msgid "Choose" msgstr "Vali" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Loobu" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Viga failivalija malli laadimisel" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Jah" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ei" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index c58604baa9d..a3b7d28b1ca 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po index f0a619d6186..520e259b8c8 100644 --- a/l10n/et_EE/files_external.po +++ b/l10n/et_EE/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po index 89d74571f6a..755097fbfa3 100644 --- a/l10n/et_EE/files_sharing.po +++ b/l10n/et_EE/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po index f472464d7b8..7e2f05b4fe3 100644 --- a/l10n/et_EE/files_trashbin.po +++ b/l10n/et_EE/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po index 9354b7b5887..c193cbc0b8e 100644 --- a/l10n/et_EE/lib.po +++ b/l10n/et_EE/lib.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -19,27 +19,27 @@ msgstr "" "Language: et_EE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Abiinfo" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Isiklik" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Seaded" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Kasutajad" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Rakendused" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index ed21bbb0e38..4f81648e520 100644 --- a/l10n/et_EE/settings.po +++ b/l10n/et_EE/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -138,16 +138,16 @@ msgstr "tagasi" msgid "Unable to remove user" msgstr "Kasutaja eemaldamine ebaõnnestus" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupid" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grupi admin" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Kustuta" @@ -401,7 +401,7 @@ msgstr "Hangi rakendusi failide sünkroniseerimiseks" msgid "Show First Run Wizard again" msgstr "Näita veelkord Esmase Käivituse Juhendajat" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Parool" @@ -425,7 +425,7 @@ msgstr "Uus parool" msgid "Change password" msgstr "Muuda parooli" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Näidatav nimi" @@ -457,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Kasuta seda aadressi ühendamaks oma ownCloudi failihalduriga" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Kasutajanimi" @@ -465,34 +465,40 @@ msgstr "Kasutajanimi" msgid "Create" msgstr "Lisa" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "Admin taasteparool" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Vaikimisi maht" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Piiramatult" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Muu" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Maht" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "muuda näidatavat nime" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "määra uus parool" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Vaikeväärtus" diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po index f97e49a9d21..2ce1e0e8ec8 100644 --- a/l10n/et_EE/user_ldap.po +++ b/l10n/et_EE/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eu/core.po b/l10n/eu/core.po index 921c50eb785..9572dfdd6de 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "urte" msgid "Choose" msgstr "Aukeratu" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Ezeztatu" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Bai" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ez" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ados" diff --git a/l10n/eu/files.po b/l10n/eu/files.po index 72b447b4b09..1e832a1d67c 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po index a016d6e72ef..e67b8acbf62 100644 --- a/l10n/eu/files_external.po +++ b/l10n/eu/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po index 1023a31aff8..a8b80438057 100644 --- a/l10n/eu/files_sharing.po +++ b/l10n/eu/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po index a366da68c19..7dbb6a4beec 100644 --- a/l10n/eu/files_trashbin.po +++ b/l10n/eu/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po index f6146af2364..7eef442ab9d 100644 --- a/l10n/eu/lib.po +++ b/l10n/eu/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Laguntza" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Pertsonala" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Ezarpenak" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Erabiltzaileak" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplikazioak" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index 771e7ee4d40..bc18dde6661 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "desegin" msgid "Unable to remove user" msgstr "Ezin izan da erabiltzailea aldatu" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Taldeak" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Talde administradorea" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Ezabatu" @@ -399,7 +399,7 @@ msgstr "Lortu aplikazioak zure fitxategiak sinkronizatzeko" msgid "Show First Run Wizard again" msgstr "Erakutsi berriz Lehenengo Aldiko Morroia" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Pasahitza" @@ -423,7 +423,7 @@ msgstr "Pasahitz berria" msgid "Change password" msgstr "Aldatu pasahitza" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Bistaratze Izena" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Sarrera Izena" @@ -463,34 +463,40 @@ msgstr "Sarrera Izena" msgid "Create" msgstr "Sortu" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Lehenetsitako Biltegiratzea" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Mugarik gabe" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Bestelakoa" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Biltegiratzea" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "aldatu bistaratze izena" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "ezarri pasahitz berria" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Lehenetsia" diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po index 66254491919..6800daf9f4c 100644 --- a/l10n/eu/user_ldap.po +++ b/l10n/eu/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fa/core.po b/l10n/fa/core.po index de7541cb77f..b7eac5e62ff 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "سال‌های قبل" msgid "Choose" msgstr "انتخاب کردن" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "منصر٠شدن" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "بله" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "نه" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "قبول" diff --git a/l10n/fa/files.po b/l10n/fa/files.po index a85abb7c0fd..0c93f45a7a8 100644 --- a/l10n/fa/files.po +++ b/l10n/fa/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po index a5d37e0d6a0..88c7de3556c 100644 --- a/l10n/fa/files_external.po +++ b/l10n/fa/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po index 7c81c3f5be6..9b8ed74004f 100644 --- a/l10n/fa/files_sharing.po +++ b/l10n/fa/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po index 732ee850722..b09c59d6704 100644 --- a/l10n/fa/files_trashbin.po +++ b/l10n/fa/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po index 4c4280a9842..f0a212e732e 100644 --- a/l10n/fa/lib.po +++ b/l10n/fa/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "راه‌نما" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "شخصی" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "تنظیمات" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "کاربران" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr " برنامه ها" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "مدیر" diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index 8b08c4e3fad..13474ba822d 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "بازگشت" msgid "Unable to remove user" msgstr "ØØ°Ù کاربر امکان پذیر نیست" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "گروه ها" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "گروه مدیران" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "ØØ°Ù" @@ -399,7 +399,7 @@ msgstr "برنامه ها را Ø¯Ø±ÛŒØ§ÙØª کنید تا ÙØ§ÛŒÙ„ هایتان msgid "Show First Run Wizard again" msgstr "راهبری Ú©Ù…Ú©ÛŒ اجرای اول را دوباره نمایش بده" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "گذرواژه" @@ -423,7 +423,7 @@ msgstr "گذرواژه جدید" msgid "Change password" msgstr "تغییر گذر واژه" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "نام نمایشی" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "از این نشانی برای اتصال به ownCloud خودتان در بخش مدیریت ÙØ§ÛŒÙ„ خودتان Ø§Ø³ØªÙØ§Ø¯Ù‡ کنید" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "نام کاربری" @@ -463,34 +463,40 @@ msgstr "نام کاربری" msgid "Create" msgstr "ایجاد کردن" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "ذخیره سازی پیش ÙØ±Ø¶" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ù†Ø§Ù…ØØ¯ÙˆØ¯" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "دیگر" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "ØØ§Ùظه" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "تغییر نام نمایشی" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "تنظیم کلمه عبور جدید" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "پیش ÙØ±Ø¶" diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po index c25d520fce0..e3df271ba1d 100644 --- a/l10n/fa/user_ldap.po +++ b/l10n/fa/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fi/core.po b/l10n/fi/core.po index f40d75ce041..3c7faf864ae 100644 --- a/l10n/fi/core.po +++ b/l10n/fi/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" +"POT-Creation-Date: 2013-06-04 02:29+0200\n" +"PO-Revision-Date: 2013-06-03 00:32+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "" diff --git a/l10n/fi/files.po b/l10n/fi/files.po index 7bad159ec6a..127a50cbd0d 100644 --- a/l10n/fi/files.po +++ b/l10n/fi/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-03 02:27+0200\n" +"PO-Revision-Date: 2013-06-02 23:17+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fi/lib.po b/l10n/fi/lib.po index 665804162e2..6563cd823d7 100644 --- a/l10n/fi/lib.po +++ b/l10n/fi/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" +"POT-Creation-Date: 2013-06-04 02:29+0200\n" +"PO-Revision-Date: 2013-06-03 00:32+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index d48025a6ac7..8b269fed49d 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "vuotta sitten" msgid "Choose" msgstr "Valitse" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Peru" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Kyllä" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ei" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index e96d015bea4..56c8913edef 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po index cb7db49f721..3cf2d0347c1 100644 --- a/l10n/fi_FI/files_external.po +++ b/l10n/fi_FI/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po index c86e93847c6..1b6bdb4fd5f 100644 --- a/l10n/fi_FI/files_sharing.po +++ b/l10n/fi_FI/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po index c7514e9e46b..83002ab4f7b 100644 --- a/l10n/fi_FI/files_trashbin.po +++ b/l10n/fi_FI/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po index 9806d793fc3..d6ea52899a1 100644 --- a/l10n/fi_FI/lib.po +++ b/l10n/fi_FI/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: fi_FI\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Ohje" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Henkilökohtainen" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Asetukset" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Käyttäjät" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Sovellukset" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Ylläpitäjä" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index 0dc48dcfd07..cf013b95c96 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -137,16 +137,16 @@ msgstr "kumoa" msgid "Unable to remove user" msgstr "Käyttäjän poistaminen ei onnistunut" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Ryhmät" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Ryhmän ylläpitäjä" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Poista" @@ -400,7 +400,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "Näytä ensimmäisen käyttökerran avustaja uudelleen" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Salasana" @@ -424,7 +424,7 @@ msgstr "Uusi salasana" msgid "Change password" msgstr "Vaihda salasana" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Näyttönimi" @@ -456,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Kirjautumisnimi" @@ -464,34 +464,40 @@ msgstr "Kirjautumisnimi" msgid "Create" msgstr "Luo" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Oletustallennustila" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Rajoittamaton" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Muu" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Tallennustila" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "vaihda näyttönimi" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "aseta uusi salasana" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Oletus" diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po index 2a52841cfb7..4bf4ca1581b 100644 --- a/l10n/fi_FI/user_ldap.po +++ b/l10n/fi_FI/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 46be04e3eaf..e40e11e4875 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -5,13 +5,14 @@ # Translators: # msoko <sokolovitch@yahoo.com>, 2013 # plachance <patlachance@gmail.com>, 2013 +# red0ne <red-0ne@smarty-concept.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: msoko <sokolovitch@yahoo.com>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: red0ne <red-0ne@smarty-concept.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -218,23 +219,23 @@ msgstr "il y a plusieurs années" msgid "Choose" msgstr "Choisir" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Annuler" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" -msgstr "" +msgstr "Erreur de chargement du modèle du sélecteur de fichier" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Oui" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Non" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index 04d18da19b2..cad730674a0 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po index e5b30416823..36b80d4b270 100644 --- a/l10n/fr/files_encryption.po +++ b/l10n/fr/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# lyly95, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:23+0000\n" +"Last-Translator: lyly95\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,29 +20,29 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Clé de récupération activée avec succès" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Ne peut pas activer la clé de récupération. s'il vous plait vérifiez votre mot de passe de clé de récupération!" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Clé de récupération désactivée avc succès" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Ne peut pas désactiver la clé de récupération. S'il vous plait vérifiez votre mot de passe de clé de récupération!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "Mot de passe changé avec succès " #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect." #: js/settings-admin.js:11 msgid "Saving..." @@ -54,50 +55,50 @@ msgstr "Chiffrement" #: templates/settings-admin.php:9 msgid "" "Enable encryption passwords recovery key (allow sharing to recovery key):" -msgstr "" +msgstr "Activer la clé de récupération par mots de passe de cryptage (autoriser le partage de la clé de récupération) " #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "Rétablissement du compte mot de passe " #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" -msgstr "" +msgstr "Activer" #: templates/settings-admin.php:28 templates/settings-personal.php:26 msgid "Disabled" -msgstr "" +msgstr "Désactiver" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" -msgstr "" +msgstr "Changer les mots de passe de cryptage par la clé de récupération" #: templates/settings-admin.php:39 msgid "Old Recovery account password" -msgstr "" +msgstr "Ancien compte de récupération de mots de passe" #: templates/settings-admin.php:46 msgid "New Recovery account password" -msgstr "" +msgstr "Nouveau compte de récupération de mots de passe" #: templates/settings-admin.php:51 msgid "Change Password" -msgstr "" +msgstr "Changer de mot de passe" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" -msgstr "" +msgstr "Activer la récupération des mots de passe en partageant les fichiers avec votre administrateur:" #: templates/settings-personal.php:11 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files if your password is lost" -msgstr "" +msgstr "En activant cette option cela vous autorisera à récupérer votre accès aux fichiers cryptés si votre mot de passe est perdu" #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "Mise à jour des paramètres de récupération de fichiers " #: templates/settings-personal.php:28 msgid "Could not update file recovery" -msgstr "" +msgstr "Ne peut pas remettre à jour les fichiers de récupération" diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po index 114d0a4c8d6..5ef61c8cfd4 100644 --- a/l10n/fr/files_external.po +++ b/l10n/fr/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po index b039e12760d..5a730447603 100644 --- a/l10n/fr/files_sharing.po +++ b/l10n/fr/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po index 5620128a681..b35debbeab3 100644 --- a/l10n/fr/files_trashbin.po +++ b/l10n/fr/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po index f8f96f380df..6f9bc5c1ec6 100644 --- a/l10n/fr/lib.po +++ b/l10n/fr/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Cyril Glapa <kyriog@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Aide" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personnel" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Paramètres" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Utilisateurs" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Applications" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administration" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 7283b6d772c..cd3c5c40bc0 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -4,12 +4,13 @@ # # Translators: # Christophe Lherieau <skimpax@gmail.com>, 2013 +# red0ne <red-0ne@smarty-concept.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -137,16 +138,16 @@ msgstr "annuler" msgid "Unable to remove user" msgstr "Impossible de retirer l'utilisateur" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Groupes" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Groupe Admin" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Supprimer" @@ -400,7 +401,7 @@ msgstr "Obtenez les applications de synchronisation de vos fichiers" msgid "Show First Run Wizard again" msgstr "Revoir le premier lancement de l'installeur" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Mot de passe" @@ -424,7 +425,7 @@ msgstr "Nouveau mot de passe" msgid "Change password" msgstr "Changer de mot de passe" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Nom affiché" @@ -456,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Nom de la connexion" @@ -464,34 +465,40 @@ msgstr "Nom de la connexion" msgid "Create" msgstr "Créer" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" +msgstr "Récupération du mot de passe administrateur" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" msgstr "" -#: templates/users.php:38 +#: templates/users.php:42 msgid "Default Storage" msgstr "Support de stockage par défaut" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Illimité" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Autre" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Support de stockage" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "Changer le nom affiché" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "Changer le mot de passe" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Défaut" diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index d9d67d88cae..0ac88d216ea 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: plachance <patlachance@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index 90b1c4dce9d..a0b30d9fb01 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: mbouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "anos atrás" msgid "Choose" msgstr "Escoller" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Produciuse un erro ao cargar o modelo do selector de ficheiros" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Si" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Non" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Aceptar" diff --git a/l10n/gl/files.po b/l10n/gl/files.po index bd6a2ea5452..3b683190b95 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: mbouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po index d714531c708..c68d4701866 100644 --- a/l10n/gl/files_external.po +++ b/l10n/gl/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po index c459cd8d91a..d3b3018a8b9 100644 --- a/l10n/gl/files_sharing.po +++ b/l10n/gl/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po index 4100fddce39..16513d74efd 100644 --- a/l10n/gl/files_trashbin.po +++ b/l10n/gl/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po index d6d898969f9..360418e9190 100644 --- a/l10n/gl/lib.po +++ b/l10n/gl/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: mbouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Axuda" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Persoal" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Axustes" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Usuarios" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplicativos" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administración" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index 0ea8ef554f0..354115826d5 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: mbouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -137,16 +137,16 @@ msgstr "desfacer" msgid "Unable to remove user" msgstr "Non é posÃbel retirar o usuario" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupos" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grupo Admin" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Eliminar" @@ -400,7 +400,7 @@ msgstr "Obteña os aplicativos para sincronizar os seus ficheiros" msgid "Show First Run Wizard again" msgstr "Amosar o axudante da primeira execución outra vez" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Contrasinal" @@ -424,7 +424,7 @@ msgstr "Novo contrasinal" msgid "Change password" msgstr "Cambiar o contrasinal" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Amosar o nome" @@ -438,7 +438,7 @@ msgstr "O seu enderezo de correo" #: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" -msgstr "Escriba un enderezo de correo para activar a recuperación do contrasinal" +msgstr "Escriba un enderezo de correo para activar o contrasinal de recuperación" #: templates/personal.php:83 templates/personal.php:84 msgid "Language" @@ -456,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Nome de acceso" @@ -464,34 +464,40 @@ msgstr "Nome de acceso" msgid "Create" msgstr "Crear" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" -msgstr "Recuperación do contrasinal do administrador" +msgstr "Contrasinal de recuperación do administrador" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Almacenamento predeterminado" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Sen lÃmites" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Outro" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Almacenamento" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "cambiar o nome visÃbel" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "estabelecer un novo contrasinal" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Predeterminado" diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po index f0b96737a72..e044c6bf20d 100644 --- a/l10n/gl/user_ldap.po +++ b/l10n/gl/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: mbouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/he/core.po b/l10n/he/core.po index de1412f573d..2e0df96b394 100644 --- a/l10n/he/core.po +++ b/l10n/he/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "×©× ×™×" msgid "Choose" msgstr "בחירה" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "ביטול" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" -msgstr "" +msgstr "שגי××” ×‘×˜×¢×™× ×ª ×ª×‘× ×™×ª בחירת הקבצי×" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "כן" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "ל×" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "בסדר" @@ -406,11 +406,11 @@ msgid "" "The link to reset your password has been sent to your email.<br>If you do " "not receive it within a reasonable amount of time, check your spam/junk " "folders.<br>If it is not there ask your local administrator ." -msgstr "" +msgstr "הקישור ל×יפוס הססמה שלך × ×©×œ×— ×ליך בדו×״ל.<br>×× ×œ× ×§×™×‘×œ×ª ×ת הקישור תוך זמן סביר, מוטב לבדוק ×ת תיבת הזבל שלך.<br>×× ×”×”×•×“×¢×” ×œ× ×©×, כד××™ לש×ול ×ת ×ž× ×”×œ הרשת שלך ." #: lostpassword/templates/lostpassword.php:12 msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "" +msgstr "הבקשה × ×›×©×œ×”!<br>×”×× ×›×ª×•×‘×ª הדו×״ל/×©× ×”×ž×©×ª×ž×© שלך × ×›×•× ×™×?" #: lostpassword/templates/lostpassword.php:15 msgid "You will receive a link to reset your password via Email." @@ -488,7 +488,7 @@ msgstr "גרסת ×”Ö¾PHP פגיעה ×‘×¤× ×™ התקפת בית NULL/ריק (CVE- #: templates/installation.php:26 msgid "Please update your PHP installation to use ownCloud securely." -msgstr "" +msgstr "× × ×œ×¢×“×›×Ÿ ×ת ×”×ª×§× ×ª ×”Ö¾PHP שלך כדי להשתמש ב־PHP בבטחה." #: templates/installation.php:32 msgid "" @@ -568,7 +568,7 @@ msgstr "שירותי רשת תחת השליטה שלך" #: templates/layout.user.php:37 #, php-format msgid "%s is available. Get more information on how to update." -msgstr "" +msgstr "%s ×–×ž×™× ×” להורדה. × ×™×ª×Ÿ ללחוץ כדי לקבל מידע × ×•×¡×£ כיצד לעדכן." #: templates/layout.user.php:62 msgid "Log out" diff --git a/l10n/he/files.po b/l10n/he/files.po index aa9fac41b1b..fcf545a9c85 100644 --- a/l10n/he/files.po +++ b/l10n/he/files.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Yaron Shahrabani <sh.yaron@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,12 +21,12 @@ msgstr "" #: ajax/move.php:17 #, php-format msgid "Could not move %s - File with this name already exists" -msgstr "" +msgstr "×œ× × ×™×ª×Ÿ להעביר ×ת %s - קובץ ×‘×©× ×”×–×” כבר ×§×™×™×" #: ajax/move.php:27 ajax/move.php:30 #, php-format msgid "Could not move %s" -msgstr "" +msgstr "×œ× × ×™×ª×Ÿ להעביר ×ת %s" #: ajax/upload.php:19 msgid "No file was uploaded. Unknown error" @@ -64,11 +65,11 @@ msgstr "הכתיבה ×œ×›×•× ×Ÿ × ×›×©×œ×”" #: ajax/upload.php:51 msgid "Not enough storage available" -msgstr "" +msgstr "×ין די שטח ×¤× ×•×™ ב×חסון" #: ajax/upload.php:83 msgid "Invalid directory." -msgstr "" +msgstr "תיקייה שגויה." #: appinfo/app.php:12 msgid "Files" @@ -120,7 +121,7 @@ msgstr "ביטול" #: js/filelist.js:331 msgid "perform delete operation" -msgstr "" +msgstr "ביצוע פעולת מחיקה" #: js/filelist.js:413 msgid "1 file uploading" @@ -128,7 +129,7 @@ msgstr "קובץ ×חד × ×©×œ×—" #: js/filelist.js:416 js/filelist.js:470 msgid "files uploading" -msgstr "" +msgstr "×§×‘×¦×™× ×‘×”×¢×œ××”" #: js/files.js:52 msgid "'.' is an invalid file name." @@ -221,7 +222,7 @@ msgstr "" #: lib/app.php:73 msgid "Unable to rename file" -msgstr "" +msgstr "×œ× × ×™×ª×Ÿ ×œ×©× ×•×ª ×ת ×©× ×”×§×•×‘×¥" #: lib/helper.php:11 templates/index.php:18 msgid "Upload" diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po index 52bed8520b3..26cfc5ad277 100644 --- a/l10n/he/files_external.po +++ b/l10n/he/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po index 7bb95661f83..2653e688816 100644 --- a/l10n/he/files_sharing.po +++ b/l10n/he/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po index 5a0c193d244..54fc52620b8 100644 --- a/l10n/he/files_trashbin.po +++ b/l10n/he/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Yaron Shahrabani <sh.yaron@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,16 +21,16 @@ msgstr "" #: ajax/delete.php:42 #, php-format msgid "Couldn't delete %s permanently" -msgstr "בלתי ×פשרי למחוק ×ת %s לצמיתות" +msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת %s לצמיתות" #: ajax/undelete.php:42 #, php-format msgid "Couldn't restore %s" -msgstr "בלתי ×פשרי לשחזר ×ת %s" +msgstr "×œ× × ×™×ª×Ÿ לשחזר ×ת %s" #: js/trash.js:7 js/trash.js:97 msgid "perform restore operation" -msgstr "בצע פעולת שחזור" +msgstr "ביצוע פעולת שחזור" #: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141 msgid "Error" @@ -37,11 +38,11 @@ msgstr "שגי××”" #: js/trash.js:34 msgid "delete file permanently" -msgstr "מחק קובץ לצמיתות" +msgstr "מחיקת קובץ לצמיתות" #: js/trash.js:123 msgid "Delete permanently" -msgstr "מחק לצמיתות" +msgstr "מחיקה לצמיתות" #: js/trash.js:176 templates/index.php:17 msgid "Name" @@ -69,11 +70,11 @@ msgstr "{count} קבצי×" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" -msgstr "×©×•× ×“×‘×¨ ×›×ן. סל המחזור שלך ריק!" +msgstr "×ין ×›×ן ×©×•× ×“×‘×¨. סל המיחזור שלך ריק!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" -msgstr "שחזר" +msgstr "שחזור" #: templates/index.php:30 templates/index.php:31 msgid "Delete" @@ -81,4 +82,4 @@ msgstr "מחיקה" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "×§×‘×¦×™× ×©× ×ž×—×§×•" diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po index b6e191d2379..fbb47670af4 100644 --- a/l10n/he/files_versions.po +++ b/l10n/he/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Yaron Shahrabani <sh.yaron@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:01+0200\n" -"PO-Revision-Date: 2013-05-24 13:28+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:23+0000\n" +"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,33 +21,33 @@ msgstr "" #: ajax/rollbackVersion.php:15 #, php-format msgid "Could not revert: %s" -msgstr "" +msgstr "×œ× × ×™×ª×Ÿ להחזיר: %s" #: history.php:40 msgid "success" -msgstr "" +msgstr "הושל×" #: history.php:42 #, php-format msgid "File %s was reverted to version %s" -msgstr "" +msgstr "הקובץ %s הוחזר לגרסה %s" #: history.php:49 msgid "failure" -msgstr "" +msgstr "× ×›×©×œ" #: history.php:51 #, php-format msgid "File %s could not be reverted to version %s" -msgstr "" +msgstr "×œ× × ×™×ª×Ÿ להחזיר ×ת הקובץ %s לגרסה %s" #: history.php:69 msgid "No old versions available" -msgstr "" +msgstr "×ין גרס×ות ×™×©× ×•×ª ×–×ž×™× ×•×ª" #: history.php:74 msgid "No path specified" -msgstr "" +msgstr "×œ× ×¦×•×™×Ÿ × ×ª×™×‘" #: js/versions.js:6 msgid "Versions" @@ -54,4 +55,4 @@ msgstr "גרס×ות" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" -msgstr "" +msgstr "× ×™×ª×Ÿ להחזיר קובץ לגרסה קודמת על ידי לחיצה על לחצן ההחזרה שלו" diff --git a/l10n/he/lib.po b/l10n/he/lib.po index e8393f10da1..df6c709339d 100644 --- a/l10n/he/lib.po +++ b/l10n/he/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "עזרה" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "×ישי" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "הגדרות" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "משתמשי×" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "יישומי×" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "×ž× ×”×œ" @@ -180,12 +180,12 @@ msgstr "" msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "שרת ×”××™× ×˜×¨× ×˜ שלך ××™× ×• מוגדר לצורכי ×¡× ×›×¨×•×Ÿ ×§×‘×¦×™× ×¢×“×™×™×Ÿ כיוון ×©×ž× ×©×§ ×”Ö¾WebDAV ×›× ×¨××” ××™× ×• תקין." #: setup.php:868 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." -msgstr "" +msgstr "× × ×œ×¢×™×™×Ÿ שוב ב<a href='%s'>מדריכי ×”×”×ª×§× ×”</a>." #: template.php:113 msgid "seconds ago" diff --git a/l10n/he/settings.po b/l10n/he/settings.po index 7521b787bd3..1486d9004eb 100644 --- a/l10n/he/settings.po +++ b/l10n/he/settings.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Yaron Shahrabani <sh.yaron@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -28,11 +29,11 @@ msgstr "שגי×ת הזדהות" #: ajax/changedisplayname.php:31 msgid "Your display name has been changed." -msgstr "" +msgstr "×©× ×”×ª×¦×•×’×” שלך הוחלף." #: ajax/changedisplayname.php:34 msgid "Unable to change display name" -msgstr "" +msgstr "×œ× × ×™×ª×Ÿ ×œ×©× ×•×ª ×ת ×©× ×”×ª×¦×•×’×”" #: ajax/creategroup.php:10 msgid "Group already exists" @@ -86,11 +87,11 @@ msgstr "×œ× × ×™×ª×Ÿ להסיר משתמש מהקבוצה %s" #: ajax/updateapp.php:14 msgid "Couldn't update app." -msgstr "" +msgstr "×œ× × ×™×ª×Ÿ לעדכן ×ת היישו×." #: js/apps.js:30 msgid "Update to {appversion}" -msgstr "" +msgstr "עדכון לגרסה {appversion}" #: js/apps.js:36 js/apps.js:76 msgid "Disable" @@ -102,7 +103,7 @@ msgstr "הפעלה" #: js/apps.js:55 msgid "Please wait...." -msgstr "" +msgstr "× × ×œ×”×ž×ª×™×Ÿâ€¦" #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93 msgid "Error" @@ -110,15 +111,15 @@ msgstr "שגי××”" #: js/apps.js:90 msgid "Updating...." -msgstr "" +msgstr "מתבצע עדכון…" #: js/apps.js:93 msgid "Error while updating app" -msgstr "" +msgstr "×ירעה שגי××” בעת עדכון היישו×" #: js/apps.js:96 msgid "Updated" -msgstr "" +msgstr "מעודכן" #: js/personal.js:118 msgid "Saving..." @@ -126,7 +127,7 @@ msgstr "שמירה…" #: js/users.js:47 msgid "deleted" -msgstr "" +msgstr "× ×ž×—×§" #: js/users.js:47 msgid "undo" @@ -134,36 +135,36 @@ msgstr "ביטול" #: js/users.js:79 msgid "Unable to remove user" -msgstr "" +msgstr "×œ× × ×™×ª×Ÿ להסיר ×ת המשתמש" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "קבוצות" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "×ž× ×”×œ הקבוצה" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "מחיקה" #: js/users.js:269 msgid "add group" -msgstr "" +msgstr "הוספת קבוצה" #: js/users.js:428 msgid "A valid username must be provided" -msgstr "" +msgstr "יש לספק ×©× ×ž×©×ª×ž×© ×ª×§× ×™" #: js/users.js:429 js/users.js:435 js/users.js:450 msgid "Error creating user" -msgstr "" +msgstr "יצירת המשתמש × ×›×©×œ×”" #: js/users.js:434 msgid "A valid password must be provided" -msgstr "" +msgstr "יש לספק ססמה ×ª×§× ×™×ª" #: personal.php:35 personal.php:36 msgid "__language_name__" @@ -184,22 +185,22 @@ msgstr "יתכן שתיקיית ×”× ×ª×•× ×™× ×•×”×§×‘×¦×™× ×©×œ×š × ×’×™×©×™× #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "שגי×ת הגדרה" #: templates/admin.php:32 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "שרת ×”××™× ×˜×¨× ×˜ שלך ××™× ×• מוגדר לצורכי ×¡× ×›×¨×•×Ÿ ×§×‘×¦×™× ×¢×“×™×™×Ÿ כיוון ×©×ž× ×©×§ ×”Ö¾WebDAV ×›× ×¨××” ××™× ×• תקין." #: templates/admin.php:33 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." -msgstr "" +msgstr "× × ×œ×¢×™×™×Ÿ שוב ב<a href='%s'>מדריכי ×”×”×ª×§× ×”</a>." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" -msgstr "" +msgstr "המודול „fileinfo“ חסר" #: templates/admin.php:47 msgid "" @@ -221,7 +222,7 @@ msgstr "" #: templates/admin.php:75 msgid "Internet connection not working" -msgstr "" +msgstr "החיבור ל××™× ×˜×¨× ×˜ ××™× ×• פעיל" #: templates/admin.php:78 msgid "" @@ -235,11 +236,11 @@ msgstr "" #: templates/admin.php:92 msgid "Cron" -msgstr "" +msgstr "Cron" #: templates/admin.php:101 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "יש להפעיל משימה ×חת ×¢× ×›×œ עמוד ×©× ×˜×¢×Ÿ" #: templates/admin.php:111 msgid "" @@ -255,47 +256,47 @@ msgstr "" #: templates/admin.php:128 msgid "Sharing" -msgstr "" +msgstr "שיתוף" #: templates/admin.php:134 msgid "Enable Share API" -msgstr "" +msgstr "הפעלת API השיתוף" #: templates/admin.php:135 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "ל×פשר ×œ×™×™×©×•× ×œ×”×©×ª×ž×© ב־API השיתוף" #: templates/admin.php:142 msgid "Allow links" -msgstr "" +msgstr "ל×פשר קישורי×" #: templates/admin.php:143 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¤×¨×™×˜×™× " #: templates/admin.php:150 msgid "Allow resharing" -msgstr "" +msgstr "ל×פשר שיתוף מחדש" #: templates/admin.php:151 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ הל××” ×¤×¨×™×˜×™× ×©×©×•×ª×¤×• ×ת×" #: templates/admin.php:158 msgid "Allow users to share with anyone" -msgstr "" +msgstr "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¢× ×›×œ ×חד" #: templates/admin.php:161 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¢× ×ž×©×ª×ž×©×™× ×‘×§×‘×•×¦×•×ª ×©×œ×”× ×‘×œ×‘×“" #: templates/admin.php:168 msgid "Security" -msgstr "" +msgstr "×בטחה" #: templates/admin.php:181 msgid "Enforce HTTPS" -msgstr "" +msgstr "ל×לץ HTTPS" #: templates/admin.php:182 msgid "" @@ -314,7 +315,7 @@ msgstr "יומן" #: templates/admin.php:196 msgid "Log level" -msgstr "" +msgstr "רמת הדיווח" #: templates/admin.php:227 msgid "More" @@ -380,7 +381,7 @@ msgstr "פורו×" #: templates/help.php:14 msgid "Bugtracker" -msgstr "" +msgstr "עוקב תקלות" #: templates/help.php:17 msgid "Commercial Support" @@ -397,9 +398,9 @@ msgstr "השג ×ת ×”×פליקציות על ×ž× ×ª ×œ×¡× ×›×¨×Ÿ ×ת ×”×§×‘×¦× #: templates/personal.php:26 msgid "Show First Run Wizard again" -msgstr "" +msgstr "הצגת ×שף ההפעלה הר××©×•× ×™×ª שוב" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "סיסמ×" @@ -423,9 +424,9 @@ msgstr "ססמה חדשה" msgid "Change password" msgstr "×©×™× ×•×™ ססמה" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" -msgstr "" +msgstr "×©× ×ª×¦×•×’×”" #: templates/personal.php:71 msgid "Email" @@ -449,48 +450,54 @@ msgstr "עזרה בתרגו×" #: templates/personal.php:100 msgid "WebDAV" -msgstr "" +msgstr "WebDAV" #: templates/personal.php:102 msgid "Use this address to connect to your ownCloud in your file manager" msgstr "השתמש בכתובת ×–×ת על ×ž× ×ª להתחבר ×ל ownCloud דרך סייר קבצי×." -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" -msgstr "" +msgstr "×©× ×›× ×™×¡×”" #: templates/users.php:30 msgid "Create" msgstr "יצירה" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" +msgstr "ססמת השחזור של ×”×ž× ×”×œ" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" msgstr "" -#: templates/users.php:38 +#: templates/users.php:42 msgid "Default Storage" -msgstr "" +msgstr "×חסון בררת המחדל" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" -msgstr "" +msgstr "×œ×œ× ×”×’×‘×œ×”" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "×חר" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" -msgstr "" +msgstr "×חסון" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" -msgstr "" +msgstr "החלפת ×©× ×”×ª×¦×•×’×”" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" -msgstr "" +msgstr "הגדרת ססמה חדשה" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" -msgstr "" +msgstr "בררת מחדל" diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po index 59a627ae42d..ca9b80b2599 100644 --- a/l10n/he/user_ldap.po +++ b/l10n/he/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/he/user_webdavauth.po b/l10n/he/user_webdavauth.po index 43d52925cb3..8d99fe3f582 100644 --- a/l10n/he/user_webdavauth.po +++ b/l10n/he/user_webdavauth.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Yaron Shahrabani <sh.yaron@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:01+0200\n" -"PO-Revision-Date: 2013-05-24 13:26+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:20+0000\n" +"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +20,15 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "הזדהות מול WebDAV" #: templates/settings.php:4 msgid "URL: http://" -msgstr "" +msgstr "כתובת: http://‎" #: templates/settings.php:7 msgid "" "ownCloud will send the user credentials to this URL. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "" +msgstr "מערכת ownCloud תשלח ×ת פרטי המשתמש לכתובת זו. התוסף יבדוק ×ת התגובה ×•×™×ª×¨×’× ×ת ×”×§×•×“×™× 401 ו־403 כתגובה לציון פרטי גישה ×©×’×•×™×™× ×•×ת כל ש×ר התגובות כפרטי גישה × ×›×•× ×™×." diff --git a/l10n/hi/core.po b/l10n/hi/core.po index 40ae0b63d90..5c00474f032 100644 --- a/l10n/hi/core.po +++ b/l10n/hi/core.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# rktaiwala <rktaiwala@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: rktaiwala <rktaiwala@gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: ajax/share.php:97 #, php-format msgid "User %s shared a file with you" -msgstr "" +msgstr "उपयोगकरà¥à¤¤à¤¾ %s ने आप के साथ à¤à¤• फ़ाइल सहà¤à¤¾à¤œà¥€à¤¤ किया" #: ajax/share.php:99 #, php-format @@ -110,51 +111,51 @@ msgstr "" #: js/config.php:45 msgid "January" -msgstr "" +msgstr "जनवरी" #: js/config.php:46 msgid "February" -msgstr "" +msgstr "फरवरी" #: js/config.php:47 msgid "March" -msgstr "" +msgstr "मारà¥à¤š" #: js/config.php:48 msgid "April" -msgstr "" +msgstr "अपà¥à¤°à¥ˆà¤²" #: js/config.php:49 msgid "May" -msgstr "" +msgstr "मई" #: js/config.php:50 msgid "June" -msgstr "" +msgstr "जून" #: js/config.php:51 msgid "July" -msgstr "" +msgstr "जà¥à¤²à¤¾à¤ˆ" #: js/config.php:52 msgid "August" -msgstr "" +msgstr "अगसà¥à¤¤" #: js/config.php:53 msgid "September" -msgstr "" +msgstr "सितमà¥à¤¬à¤°" #: js/config.php:54 msgid "October" -msgstr "" +msgstr "अकà¥à¤Ÿà¥‚बर" #: js/config.php:55 msgid "November" -msgstr "" +msgstr "नवंबर" #: js/config.php:56 msgid "December" -msgstr "" +msgstr "दिसमà¥à¤¬à¤°" #: js/js.js:286 msgid "Settings" @@ -216,23 +217,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "" @@ -263,7 +264,7 @@ msgstr "" #: js/share.js:90 msgid "Share" -msgstr "" +msgstr "साà¤à¤¾ करें" #: js/share.js:125 js/share.js:617 msgid "Error while sharing" @@ -287,7 +288,7 @@ msgstr "" #: js/share.js:159 msgid "Share with" -msgstr "" +msgstr "के साथ साà¤à¤¾" #: js/share.js:164 msgid "Share with link" diff --git a/l10n/hi/files.po b/l10n/hi/files.po index 4fbd84f1996..56541675e00 100644 --- a/l10n/hi/files.po +++ b/l10n/hi/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:01+0200\n" -"PO-Revision-Date: 2013-05-24 13:26+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -76,7 +76,7 @@ msgstr "" #: js/fileactions.js:116 msgid "Share" -msgstr "" +msgstr "साà¤à¤¾ करें" #: js/fileactions.js:126 msgid "Delete permanently" @@ -257,7 +257,7 @@ msgstr "" #: templates/admin.php:26 msgid "Save" -msgstr "" +msgstr "सहेजें" #: templates/index.php:7 msgid "New" diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po index 6dcb92576e9..064b11958d1 100644 --- a/l10n/hi/lib.po +++ b/l10n/hi/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 00:03+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "सहयोग" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "यकà¥à¤¤à¤¿à¤—त" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "सेटिंगà¥à¤¸" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "उपयोगकरà¥à¤¤à¤¾" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Apps" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "" diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po index c81fb256e3b..3f1dc098e5a 100644 --- a/l10n/hi/settings.po +++ b/l10n/hi/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:02+0200\n" -"PO-Revision-Date: 2013-05-25 00:02+0000\n" +"POT-Creation-Date: 2013-06-11 01:57+0200\n" +"PO-Revision-Date: 2013-06-10 23:57+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -324,11 +324,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:235 templates/personal.php:105 +#: templates/admin.php:235 templates/personal.php:111 msgid "Version" msgstr "" -#: templates/admin.php:237 templates/personal.php:108 +#: templates/admin.php:237 templates/personal.php:114 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "पासवरà¥à¤¡" @@ -423,39 +423,39 @@ msgstr "नया पासवरà¥à¤¡" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" -#: templates/personal.php:68 +#: templates/personal.php:71 msgid "Email" msgstr "" -#: templates/personal.php:70 +#: templates/personal.php:73 msgid "Your email address" msgstr "" -#: templates/personal.php:71 +#: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" msgstr "" -#: templates/personal.php:77 templates/personal.php:78 +#: templates/personal.php:83 templates/personal.php:84 msgid "Language" msgstr "" -#: templates/personal.php:89 +#: templates/personal.php:95 msgid "Help translate" msgstr "" -#: templates/personal.php:94 +#: templates/personal.php:100 msgid "WebDAV" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:102 msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/hr/core.po b/l10n/hr/core.po index ac644153592..164ccd5f71c 100644 --- a/l10n/hr/core.po +++ b/l10n/hr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "godina" msgid "Choose" msgstr "Izaberi" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Odustani" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Da" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ne" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "U redu" diff --git a/l10n/hr/files.po b/l10n/hr/files.po index 6820fde2314..c3f64b266ae 100644 --- a/l10n/hr/files.po +++ b/l10n/hr/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po index 714ad2bb36f..e907f86b9f7 100644 --- a/l10n/hr/files_external.po +++ b/l10n/hr/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po index 9025ad36b37..0479c526802 100644 --- a/l10n/hr/files_sharing.po +++ b/l10n/hr/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po index 4c6c0c6a2f1..71cc5a3d905 100644 --- a/l10n/hr/files_trashbin.po +++ b/l10n/hr/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po index 633e6b84a65..34d07dd9d1f 100644 --- a/l10n/hr/lib.po +++ b/l10n/hr/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: hr\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Pomoć" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Osobno" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Postavke" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Korisnici" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplikacije" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administrator" diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po index 84c8487f21d..6d237686abd 100644 --- a/l10n/hr/settings.po +++ b/l10n/hr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "vrati" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupe" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grupa Admin" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "ObriÅ¡i" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Lozinka" @@ -423,7 +423,7 @@ msgstr "Nova lozinka" msgid "Change password" msgstr "Izmjena lozinke" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "Izradi" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "ostali" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po index a822df517a4..08f168170c1 100644 --- a/l10n/hr/user_ldap.po +++ b/l10n/hr/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index 9019848dbc1..309565ead38 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "több éve" msgid "Choose" msgstr "Válasszon" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Mégsem" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Nem sikerült betölteni a fájlkiválasztó sablont" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Igen" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nem" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index b87dc454081..3a39364461e 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po index 3b11f4eab52..0f9d5ebc39d 100644 --- a/l10n/hu_HU/files_external.po +++ b/l10n/hu_HU/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po index a8700a4d005..a9dfd06b9b0 100644 --- a/l10n/hu_HU/files_sharing.po +++ b/l10n/hu_HU/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po index 7f3fec8e358..fcb618e9399 100644 --- a/l10n/hu_HU/files_trashbin.po +++ b/l10n/hu_HU/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po index 1f23f75bfde..82bfa29c887 100644 --- a/l10n/hu_HU/lib.po +++ b/l10n/hu_HU/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: hu_HU\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Súgó" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Személyes" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "BeállÃtások" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Felhasználók" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Alkalmazások" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Adminsztráció" diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index 7ef487f8525..855361da544 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/settings.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Adam Toth <adazlord@gmail.com>, 2013 # Laszlo Tornoci <torlasz@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -137,16 +138,16 @@ msgstr "visszavonás" msgid "Unable to remove user" msgstr "A felhasználót nem sikerült eltávolÃtáni" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Csoportok" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Csoportadminisztrátor" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Törlés" @@ -181,7 +182,7 @@ msgid "" "strongly suggest that you configure your webserver in a way that the data " "directory is no longer accessible or you move the data directory outside the" " webserver document root." -msgstr "Az adatkönytára és az itt levÅ‘ fájlok valószÃnűleg elérhetÅ‘k az internetrÅ‘l. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár nem legyen közvetlenül kÃvülrÅ‘l elérhetÅ‘, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kÃvülre." +msgstr "Az adatkönytára és az itt levÅ‘ fájlok valószÃnűleg elérhetÅ‘k az internetrÅ‘l. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kÃvülrÅ‘l elérhetÅ‘, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kÃvülre." #: templates/admin.php:29 msgid "Setup Warning" @@ -206,7 +207,7 @@ msgstr "A 'fileinfo' modul hiányzik" msgid "" "The PHP module 'fileinfo' is missing. We strongly recommend to enable this " "module to get best results with mime-type detection." -msgstr "A 'fileinfo' PHP modul hiányzik. ErÅ‘sen javasolt ennek a modulnak az telepÃtése, ha az ember jó eredményt szeretne a MIME-tÃpusok felismerésében." +msgstr "A 'fileinfo' PHP modul hiányzik. ErÅ‘sen javasolt ennek a modulnak a telepÃtése a MIME-tÃpusok felismerésének eredményessé tételéhez." #: templates/admin.php:58 msgid "Locale not working" @@ -400,7 +401,7 @@ msgstr "Töltse le az állományok szinkronizációjához szükséges programoka msgid "Show First Run Wizard again" msgstr "Nézzük meg újra az elsÅ‘ bejelentkezéskori segÃtséget!" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Jelszó" @@ -424,7 +425,7 @@ msgstr "Az új jelszó" msgid "Change password" msgstr "A jelszó megváltoztatása" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "A megjelenÃtett név" @@ -456,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Ennek a cÃmnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelÅ‘jével is is elérheti az állományait." -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Bejelentkezési név" @@ -464,34 +465,40 @@ msgstr "Bejelentkezési név" msgid "Create" msgstr "Létrehozás" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "A jelszóvisszaállÃtás adminisztrációja" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Alapértelmezett tárhely" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Korlátlan" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Más" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Tárhely" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "a megjelenÃtett név módosÃtása" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "új jelszó beállÃtása" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Alapértelmezett" diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po index b2c48f351c6..440a6356ea0 100644 --- a/l10n/hu_HU/user_ldap.po +++ b/l10n/hu_HU/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -363,11 +363,11 @@ msgstr "" #: templates/settings.php:103 msgid "Internal Username Attribute:" -msgstr "" +msgstr "A belsÅ‘ felhasználónév attribútuma:" #: templates/settings.php:104 msgid "Override UUID detection" -msgstr "" +msgstr "Az UUID-felismerés felülbÃrálása" #: templates/settings.php:105 msgid "" @@ -382,11 +382,11 @@ msgstr "" #: templates/settings.php:106 msgid "UUID Attribute:" -msgstr "" +msgstr "UUID attribútum:" #: templates/settings.php:107 msgid "Username-LDAP User Mapping" -msgstr "" +msgstr "Felhasználó - LDAP felhasználó hozzárendelés" #: templates/settings.php:108 msgid "" @@ -405,11 +405,11 @@ msgstr "" #: templates/settings.php:109 msgid "Clear Username-LDAP User Mapping" -msgstr "" +msgstr "A felhasználó - LDAP felhasználó hozzárendelés törlése" #: templates/settings.php:109 msgid "Clear Groupname-LDAP Group Mapping" -msgstr "" +msgstr "A csoport - LDAP csoport hozzárendelés törlése" #: templates/settings.php:111 msgid "Test Configuration" diff --git a/l10n/hy/files.po b/l10n/hy/files.po index c2916d1452a..63c3c13dde8 100644 --- a/l10n/hy/files.po +++ b/l10n/hy/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po index eb8e97e6518..c56d6181c54 100644 --- a/l10n/hy/files_external.po +++ b/l10n/hy/files_external.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" "PO-Revision-Date: 2013-04-26 08:01+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po index fd39659eb46..288785e46c2 100644 --- a/l10n/hy/files_sharing.po +++ b/l10n/hy/files_sharing.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" "PO-Revision-Date: 2013-04-26 08:01+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po index 20ac50719e6..129ab3e29c6 100644 --- a/l10n/hy/files_trashbin.po +++ b/l10n/hy/files_trashbin.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" "PO-Revision-Date: 2013-04-26 08:01+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po index 4171b47db9c..a26369ab7a2 100644 --- a/l10n/hy/settings.po +++ b/l10n/hy/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Õ‹Õ¶Õ»Õ¥Õ¬" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "" @@ -423,7 +423,7 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Ô±ÕµÕ¬" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/ia/core.po b/l10n/ia/core.po index d8c06cd51a0..6139d6791e5 100644 --- a/l10n/ia/core.po +++ b/l10n/ia/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Cancellar" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "" diff --git a/l10n/ia/files.po b/l10n/ia/files.po index 398f080fb6d..36c2422f41a 100644 --- a/l10n/ia/files.po +++ b/l10n/ia/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po index e6af4a5fcb6..e5dfd4cd1ff 100644 --- a/l10n/ia/files_external.po +++ b/l10n/ia/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po index aeeb1aee664..da646a06119 100644 --- a/l10n/ia/files_sharing.po +++ b/l10n/ia/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po index a14d92e1603..f3064aecda2 100644 --- a/l10n/ia/files_trashbin.po +++ b/l10n/ia/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po index 0ee7cb8648a..ed7a77df506 100644 --- a/l10n/ia/lib.po +++ b/l10n/ia/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: ia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Adjuta" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personal" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Configurationes" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Usatores" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Applicationes" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administration" diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po index 6c2773489af..681da984f28 100644 --- a/l10n/ia/settings.po +++ b/l10n/ia/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Gruppos" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Deler" @@ -399,7 +399,7 @@ msgstr "Obtene le apps (applicationes) pro synchronizar tu files" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Contrasigno" @@ -423,7 +423,7 @@ msgstr "Nove contrasigno" msgid "Change password" msgstr "Cambiar contrasigno" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "Crear" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Altere" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po index 2c14bfe2c28..a2140645b78 100644 --- a/l10n/ia/user_ldap.po +++ b/l10n/ia/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/id/core.po b/l10n/id/core.po index c1a29eb4283..f144fa1e744 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "beberapa tahun lalu" msgid "Choose" msgstr "Pilih" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Batal" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ya" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Tidak" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Oke" diff --git a/l10n/id/files.po b/l10n/id/files.po index 2f8d843f1b8..617d7e35216 100644 --- a/l10n/id/files.po +++ b/l10n/id/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po index 1687cf44b4f..fe7ec6480e7 100644 --- a/l10n/id/files_external.po +++ b/l10n/id/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po index 55720cb646b..6aa8da6f32f 100644 --- a/l10n/id/files_sharing.po +++ b/l10n/id/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po index 52a6e9f9966..63f8a38010e 100644 --- a/l10n/id/files_trashbin.po +++ b/l10n/id/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/id/lib.po b/l10n/id/lib.po index 826a881bec6..67263c2b245 100644 --- a/l10n/id/lib.po +++ b/l10n/id/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Bantuan" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Pribadi" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Setelan" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Pengguna" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplikasi" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/id/settings.po b/l10n/id/settings.po index 6125617ec2c..e8f3ba6f62a 100644 --- a/l10n/id/settings.po +++ b/l10n/id/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "urungkan" msgid "Unable to remove user" msgstr "Tidak dapat menghapus pengguna" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grup" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Admin Grup" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Hapus" @@ -399,7 +399,7 @@ msgstr "Dapatkan aplikasi untuk sinkronisasi berkas Anda" msgid "Show First Run Wizard again" msgstr "Tampilkan Penuntun Konfigurasi Awal" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Sandi" @@ -423,7 +423,7 @@ msgstr "Sandi baru" msgid "Change password" msgstr "Ubah sandi" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Nama Tampilan" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Gunakan alamat ini untuk terhubung ke ownCloud Anda pada manajer berkas " -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Nama Masuk" @@ -463,34 +463,40 @@ msgstr "Nama Masuk" msgid "Create" msgstr "Buat" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Penyimpanan Baku" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Tak terbatas" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Lainnya" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Penyimpanan" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "ubah nama tampilan" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "setel sandi baru" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Baku" diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po index ffe64bf0d73..544aabb1ad4 100644 --- a/l10n/id/user_ldap.po +++ b/l10n/id/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/is/core.po b/l10n/is/core.po index e630a59e3b5..40662709dea 100644 --- a/l10n/is/core.po +++ b/l10n/is/core.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Magnus Magnusson <maggiymir@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: Magnus Magnusson <maggiymir@gmail.com>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -216,23 +217,23 @@ msgstr "einhverjum árum" msgid "Choose" msgstr "Veldu" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Hætta við" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Já" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nei" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "à lagi" @@ -259,7 +260,7 @@ msgstr "Umbeðina skráin {file} ekki tiltæk!" #: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" -msgstr "" +msgstr "Deilt" #: js/share.js:90 msgid "Share" @@ -390,7 +391,7 @@ msgstr "" #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú." #: lostpassword/controller.php:48 msgid "ownCloud password reset" @@ -567,7 +568,7 @@ msgstr "vefþjónusta undir þinni stjórn" #: templates/layout.user.php:37 #, php-format msgid "%s is available. Get more information on how to update." -msgstr "" +msgstr "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir." #: templates/layout.user.php:62 msgid "Log out" diff --git a/l10n/is/files.po b/l10n/is/files.po index 9b1a7ad347f..54bb3187211 100644 --- a/l10n/is/files.po +++ b/l10n/is/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po index bad91aeff55..eb85430062a 100644 --- a/l10n/is/files_external.po +++ b/l10n/is/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po index 8bda104d7ec..8fddc9bf1d9 100644 --- a/l10n/is/files_sharing.po +++ b/l10n/is/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po index bfb3ba0fe59..c5f9d0c5dd1 100644 --- a/l10n/is/files_trashbin.po +++ b/l10n/is/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/is/lib.po b/l10n/is/lib.po index f07cefbcd85..dc430bf4d14 100644 --- a/l10n/is/lib.po +++ b/l10n/is/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Hjálp" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Um mig" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Stillingar" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Notendur" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Forrit" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Stjórnun" diff --git a/l10n/is/settings.po b/l10n/is/settings.po index 70ecafba4f3..3e343602167 100644 --- a/l10n/is/settings.po +++ b/l10n/is/settings.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Magnus Magnusson <maggiymir@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -102,7 +103,7 @@ msgstr "Virkja" #: js/apps.js:55 msgid "Please wait...." -msgstr "" +msgstr "Andartak...." #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93 msgid "Error" @@ -110,7 +111,7 @@ msgstr "Villa" #: js/apps.js:90 msgid "Updating...." -msgstr "" +msgstr "Uppfæri..." #: js/apps.js:93 msgid "Error while updating app" @@ -118,7 +119,7 @@ msgstr "" #: js/apps.js:96 msgid "Updated" -msgstr "" +msgstr "Uppfært" #: js/personal.js:118 msgid "Saving..." @@ -126,7 +127,7 @@ msgstr "Er að vista ..." #: js/users.js:47 msgid "deleted" -msgstr "" +msgstr "eytt" #: js/users.js:47 msgid "undo" @@ -136,16 +137,16 @@ msgstr "afturkalla" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Hópar" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Hópstjóri" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Eyða" @@ -399,7 +400,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Lykilorð" @@ -423,9 +424,9 @@ msgstr "Nýtt lykilorð" msgid "Change password" msgstr "Breyta lykilorði" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" -msgstr "" +msgstr "VÃsa nafn" #: templates/personal.php:71 msgid "Email" @@ -455,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þÃnu" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +464,40 @@ msgstr "" msgid "Create" msgstr "Búa til" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Sjálfgefin gagnageymsla" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ótakmarkað" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Annað" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "gagnapláss" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Sjálfgefið" diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po index 5b5f6001ba8..94586fbf40c 100644 --- a/l10n/is/user_ldap.po +++ b/l10n/is/user_ldap.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Magnus Magnusson <maggiymir@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: Magnus Magnusson <maggiymir@gmail.com>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +52,7 @@ msgstr "" #: js/settings.js:83 msgid "Keep settings?" -msgstr "" +msgstr "Geyma stillingar ?" #: js/settings.js:97 msgid "Cannot add server configuration" @@ -412,7 +413,7 @@ msgstr "" #: templates/settings.php:111 msgid "Test Configuration" -msgstr "" +msgstr "Prúfa uppsetningu" #: templates/settings.php:111 msgid "Help" diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po index 6daf7cdbf02..a771de8f67c 100644 --- a/l10n/is/user_webdavauth.po +++ b/l10n/is/user_webdavauth.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Magnus Magnusson <maggiymir@gmail.com>, 2013 # sveinn <sveinng@gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:01+0200\n" -"PO-Revision-Date: 2013-05-24 13:26+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:20+0000\n" +"Last-Translator: Magnus Magnusson <maggiymir@gmail.com>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "WebDAV Auðkenni" #: templates/settings.php:4 msgid "URL: http://" diff --git a/l10n/it/core.po b/l10n/it/core.po index e75c21bd37b..ff8a395c396 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "anni fa" msgid "Choose" msgstr "Scegli" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Annulla" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Errore durante il caricamento del modello del selezionatore di file" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Sì" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "No" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/it/files.po b/l10n/it/files.po index eae5f2c8290..b34d57328a8 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po index 63b94cc7ad1..3b1468ba8a1 100644 --- a/l10n/it/files_external.po +++ b/l10n/it/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po index 29b30249257..a2f3d796794 100644 --- a/l10n/it/files_sharing.po +++ b/l10n/it/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po index b13ff9be508..1b0c7ae635e 100644 --- a/l10n/it/files_trashbin.po +++ b/l10n/it/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/it/lib.po b/l10n/it/lib.po index 46f431b42f6..59f76f3534c 100644 --- a/l10n/it/lib.po +++ b/l10n/it/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Aiuto" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personale" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Impostazioni" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Utenti" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Applicazioni" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index be83e6d7129..b808f0f199a 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -137,16 +137,16 @@ msgstr "annulla" msgid "Unable to remove user" msgstr "Impossibile rimuovere l'utente" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Gruppi" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Gruppi amministrati" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Elimina" @@ -400,7 +400,7 @@ msgstr "Scarica le applicazioni per sincronizzare i tuoi file" msgid "Show First Run Wizard again" msgstr "Mostra nuovamente la procedura di primo avvio" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Password" @@ -424,7 +424,7 @@ msgstr "Nuova password" msgid "Change password" msgstr "Modifica password" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Nome visualizzato" @@ -456,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Nome utente" @@ -464,34 +464,40 @@ msgstr "Nome utente" msgid "Create" msgstr "Crea" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "Password di ripristino amministrativa" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password." + +#: templates/users.php:42 msgid "Default Storage" msgstr "Archiviazione predefinita" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Illimitata" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Altro" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Archiviazione" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "cambia il nome visualizzato" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "imposta una nuova password" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Predefinito" diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po index 533ae70e3ba..8d3238385f8 100644 --- a/l10n/it/user_ldap.po +++ b/l10n/it/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index 011adb4f06e..05fdf163d13 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "å¹´å‰" msgid "Choose" msgstr "é¸æŠž" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "ã‚ャンセル" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "ファイルピッカーã®ãƒ†ãƒ³ãƒ—レートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "ã¯ã„" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "ã„ã„ãˆ" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "OK" diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index a014a800eee..c1ca254ef43 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po index 16d102c4ec1..218b16a00e6 100644 --- a/l10n/ja_JP/files_encryption.po +++ b/l10n/ja_JP/files_encryption.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013 # tt yn <tetuyano+transi@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-01 01:58+0200\n" +"PO-Revision-Date: 2013-05-31 06:00+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,21 +21,21 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "リカãƒãƒªç”¨ã®ã‚ãƒ¼ã¯æ£å¸¸ã«æœ‰åŠ¹åŒ–ã•れã¾ã—ãŸ" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "リカãƒãƒªç”¨ã®ã‚ーを有効ã«ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚リカãƒãƒªç”¨ã®ã‚ーã®ãƒ‘スワードを確èªã—ã¦ä¸‹ã•ã„ï¼" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "リカãƒãƒªç”¨ã®ã‚ーをæ£å¸¸ã«ç„¡åŠ¹åŒ–ã—ã¾ã—ãŸ" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "リカãƒãƒªç”¨ã®ã‚ーを無効化ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚リカãƒãƒªç”¨ã®ã‚ーã®ãƒ‘スワードを確èªã—ã¦ä¸‹ã•ã„ï¼" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po index 45099d4285b..f3a184be03e 100644 --- a/l10n/ja_JP/files_external.po +++ b/l10n/ja_JP/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po index bd5019de152..ef4bcec77cc 100644 --- a/l10n/ja_JP/files_sharing.po +++ b/l10n/ja_JP/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po index 1fc8137d978..881a2de647d 100644 --- a/l10n/ja_JP/files_trashbin.po +++ b/l10n/ja_JP/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po index 490fedfab2e..a6f94383539 100644 --- a/l10n/ja_JP/lib.po +++ b/l10n/ja_JP/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: tt yn <tetuyano+transi@gmail.com>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: ja_JP\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "ヘルプ" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "個人" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "è¨å®š" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "ユーザ" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "アプリ" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "管ç†" diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po index ddef9760b45..8a0f3d3f53a 100644 --- a/l10n/ja_JP/settings.po +++ b/l10n/ja_JP/settings.po @@ -4,14 +4,15 @@ # # Translators: # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013 +# plazmism <gomidori@live.jp>, 2013 # tt yn <tetuyano+transi@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: plazmism <gomidori@live.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -138,16 +139,16 @@ msgstr "å…ƒã«æˆ»ã™" msgid "Unable to remove user" msgstr "ユーザを削除出æ¥ã¾ã›ã‚“" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "グループ" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "グループ管ç†è€…" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "削除" @@ -401,7 +402,7 @@ msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’åŒæœŸã™ã‚‹ãŸã‚ã®ã‚¢ãƒ—リをå–å¾—" msgid "Show First Run Wizard again" msgstr "åˆå›žã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã‚’å†è¡¨ç¤ºã™ã‚‹" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "パスワード" @@ -425,7 +426,7 @@ msgstr "æ–°ã—ã„パスワードを入力" msgid "Change password" msgstr "パスワードを変更" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "表示å" @@ -457,7 +458,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "ファイルマãƒãƒ¼ã‚¸ãƒ£ã§ownCloudã«æŽ¥ç¶šã™ã‚‹éš›ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’利用ã—ã¦ãã ã•ã„" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "ãƒã‚°ã‚¤ãƒ³å" @@ -465,34 +466,40 @@ msgstr "ãƒã‚°ã‚¤ãƒ³å" msgid "Create" msgstr "作æˆ" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "管ç†è€…復旧パスワード" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "パスワード変更ã®é–“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ•ァイルを回復ã™ã‚‹ãŸã‚ã«ã€ãƒªã‚«ãƒãƒªãƒ‘スワードを入力ã—ã¦ãã ã•ã„" + +#: templates/users.php:42 msgid "Default Storage" msgstr "デフォルトストレージ" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "無制é™" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "ãã®ä»–" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "ストレージ" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "表示åを変更" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "æ–°ã—ã„パスワードをè¨å®š" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "デフォルト" diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po index 333323c5bfc..bee60e7a313 100644 --- a/l10n/ja_JP/user_ldap.po +++ b/l10n/ja_JP/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ka/files.po b/l10n/ka/files.po index 7de85bb7837..5412c33fef9 100644 --- a/l10n/ka/files.po +++ b/l10n/ka/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po index 763c10aef8d..86d0cdf945a 100644 --- a/l10n/ka/files_sharing.po +++ b/l10n/ka/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po index fe9f5ba85c5..6c4f017b65e 100644 --- a/l10n/ka/settings.po +++ b/l10n/ka/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:02+0200\n" -"PO-Revision-Date: 2013-05-25 00:02+0000\n" +"POT-Creation-Date: 2013-06-11 01:57+0200\n" +"PO-Revision-Date: 2013-06-10 23:57+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -324,11 +324,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:235 templates/personal.php:105 +#: templates/admin.php:235 templates/personal.php:111 msgid "Version" msgstr "" -#: templates/admin.php:237 templates/personal.php:108 +#: templates/admin.php:237 templates/personal.php:114 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "პáƒáƒ áƒáƒšáƒ˜" @@ -423,39 +423,39 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" -#: templates/personal.php:68 +#: templates/personal.php:71 msgid "Email" msgstr "" -#: templates/personal.php:70 +#: templates/personal.php:73 msgid "Your email address" msgstr "" -#: templates/personal.php:71 +#: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" msgstr "" -#: templates/personal.php:77 templates/personal.php:78 +#: templates/personal.php:83 templates/personal.php:84 msgid "Language" msgstr "" -#: templates/personal.php:89 +#: templates/personal.php:95 msgid "Help translate" msgstr "" -#: templates/personal.php:94 +#: templates/personal.php:100 msgid "WebDAV" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:102 msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po index 6c804d8e420..58e08bc169e 100644 --- a/l10n/ka_GE/core.po +++ b/l10n/ka_GE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "წლის წინ" msgid "Choose" msgstr "áƒáƒ ჩევáƒ" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "უáƒáƒ ყáƒáƒ¤áƒ" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "კი" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "áƒáƒ áƒ" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "დიáƒáƒ®" diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po index 0e2e53ee1e5..7066486ebdb 100644 --- a/l10n/ka_GE/files.po +++ b/l10n/ka_GE/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po index 921f34bfa9b..d35367d7644 100644 --- a/l10n/ka_GE/files_external.po +++ b/l10n/ka_GE/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: drlinux64 <romeo@energo-pro.ge>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po index 9b1fddc63a1..d6b6a9ba652 100644 --- a/l10n/ka_GE/files_sharing.po +++ b/l10n/ka_GE/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: drlinux64 <romeo@energo-pro.ge>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po index a9a859af830..f76f4ff3a7e 100644 --- a/l10n/ka_GE/files_trashbin.po +++ b/l10n/ka_GE/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: drlinux64 <romeo@energo-pro.ge>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po index f523878cb55..7f14878aaf7 100644 --- a/l10n/ka_GE/lib.po +++ b/l10n/ka_GE/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: ka_GE\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "დáƒáƒ®áƒ›áƒáƒ ებáƒ" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "პირáƒáƒ“ი" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "პáƒáƒ áƒáƒ›áƒ”ტრები" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”ბი" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი" diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po index 2d1aaed2fcc..ff09ce5da9c 100644 --- a/l10n/ka_GE/settings.po +++ b/l10n/ka_GE/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -137,16 +137,16 @@ msgstr "დáƒáƒ‘რუნებáƒ" msgid "Unable to remove user" msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "ჯგუფები" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "ჯგუფის áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ი" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "წáƒáƒ¨áƒšáƒ" @@ -400,7 +400,7 @@ msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ ფáƒáƒ˜áƒšáƒ”ბის სინქრáƒá msgid "Show First Run Wizard again" msgstr "მáƒáƒ©áƒ•ენე თáƒáƒ•იდáƒáƒœ გáƒáƒ¨áƒ•ებული ვიზáƒáƒ დი" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "პáƒáƒ áƒáƒšáƒ˜" @@ -424,7 +424,7 @@ msgstr "áƒáƒ®áƒáƒšáƒ˜ პáƒáƒ áƒáƒšáƒ˜" msgid "Change password" msgstr "პáƒáƒ áƒáƒšáƒ˜áƒ¡ შეცვლáƒ" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "დისპლეის სáƒáƒ®áƒ”ლი" @@ -456,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნე შემდეგი მისáƒáƒ›áƒáƒ თი ownCloud–თáƒáƒœ დáƒáƒ¡áƒáƒ™áƒáƒ•შირებლáƒáƒ“ შენს ფáƒáƒ˜áƒšáƒ›áƒ”ნეჯერში" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი" @@ -464,34 +464,40 @@ msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი" msgid "Create" msgstr "შექმნáƒ" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ სáƒáƒªáƒáƒ•ი" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "ულიმიტáƒ" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "სხვáƒ" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "სáƒáƒªáƒáƒ•ი" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "შეცვáƒáƒšáƒ” დისფლეის სáƒáƒ®áƒ”ლი" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "დáƒáƒáƒ§áƒ”ნეთ áƒáƒ®áƒáƒšáƒ˜ პáƒáƒ áƒáƒšáƒ˜" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ პáƒáƒ áƒáƒ›áƒ”ტრები" diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po index 8a89bd6c79f..c05b1c9c6c6 100644 --- a/l10n/ka_GE/user_ldap.po +++ b/l10n/ka_GE/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po index 899150546d3..435aa50322b 100644 --- a/l10n/kn/settings.po +++ b/l10n/kn/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:02+0200\n" -"PO-Revision-Date: 2013-05-25 00:02+0000\n" +"POT-Creation-Date: 2013-06-11 01:57+0200\n" +"PO-Revision-Date: 2013-06-10 23:57+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -324,11 +324,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:235 templates/personal.php:105 +#: templates/admin.php:235 templates/personal.php:111 msgid "Version" msgstr "" -#: templates/admin.php:237 templates/personal.php:108 +#: templates/admin.php:237 templates/personal.php:114 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "" @@ -423,39 +423,39 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" -#: templates/personal.php:68 +#: templates/personal.php:71 msgid "Email" msgstr "" -#: templates/personal.php:70 +#: templates/personal.php:73 msgid "Your email address" msgstr "" -#: templates/personal.php:71 +#: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" msgstr "" -#: templates/personal.php:77 templates/personal.php:78 +#: templates/personal.php:83 templates/personal.php:84 msgid "Language" msgstr "" -#: templates/personal.php:89 +#: templates/personal.php:95 msgid "Help translate" msgstr "" -#: templates/personal.php:94 +#: templates/personal.php:100 msgid "WebDAV" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:102 msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/ko/core.po b/l10n/ko/core.po index 8786bc8c480..09f836f6ab3 100644 --- a/l10n/ko/core.po +++ b/l10n/ko/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "ë…„ ì „" msgid "Choose" msgstr "ì„ íƒ" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "취소" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "예" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "아니요" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "승ë½" diff --git a/l10n/ko/files.po b/l10n/ko/files.po index e083b3f6081..5738ace607e 100644 --- a/l10n/ko/files.po +++ b/l10n/ko/files.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Sungjin Gang <potopro@gmail.com>, 2013 -# Sungjin Gang <potopro@gmail.com>, 2013 +# ujuc Gang <potopro@gmail.com>, 2013 +# ujuc Gang <potopro@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po index ffed1b60ee1..95f832777de 100644 --- a/l10n/ko/files_external.po +++ b/l10n/ko/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po index d75bfddfc0d..f843bc845e1 100644 --- a/l10n/ko/files_sharing.po +++ b/l10n/ko/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po index 8a3f4b2c8ee..120e91f66a5 100644 --- a/l10n/ko/files_trashbin.po +++ b/l10n/ko/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po index 0944550fed1..cb45991e6d5 100644 --- a/l10n/ko/lib.po +++ b/l10n/ko/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "ë„움ë§" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "ê°œì¸" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "ì„¤ì •" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "사용ìž" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "앱" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "관리ìž" diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po index ca0c27f667e..bc9aff12c4b 100644 --- a/l10n/ko/settings.po +++ b/l10n/ko/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "ë˜ëŒë¦¬ê¸°" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "그룹" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "그룹 관리ìž" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "ì‚ì œ" @@ -399,7 +399,7 @@ msgstr "ì•±ì„ ì´ìš©í•˜ì—¬ ë‹¹ì‹ ì˜ íŒŒì¼ì„ ë™ê¸°í™” í• ìˆ˜ 있습니다." msgid "Show First Run Wizard again" msgstr "첫 실행 마법사 다시 ë³´ì´ê¸°" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "암호" @@ -423,7 +423,7 @@ msgstr "새 암호" msgid "Change password" msgstr "암호 변경" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "표시 ì´ë¦„" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "íŒŒì¼ ê´€ë¦¬ìžì—서 ownCloudì— ì ‘ì†í•˜ë ¤ë©´ ì´ ì£¼ì†Œë¥¼ 사용하ì‹ì‹œì˜¤." -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "ë¡œê·¸ì¸ ì´ë¦„" @@ -463,34 +463,40 @@ msgstr "ë¡œê·¸ì¸ ì´ë¦„" msgid "Create" msgstr "만들기" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "기본 ì €ìž¥ì†Œ" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "ë¬´ì œí•œ" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "기타" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "ì €ìž¥ì†Œ" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "표시 ì´ë¦„ 변경" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "새 암호 ì„¤ì •" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "기본값" diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po index 5b681cd5c3e..e35eb349d18 100644 --- a/l10n/ko/user_ldap.po +++ b/l10n/ko/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po index 86d9a36f4e1..b4f916821f8 100644 --- a/l10n/ku_IQ/core.po +++ b/l10n/ku_IQ/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "" diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po index 0b91cc86325..1dc5daca48b 100644 --- a/l10n/ku_IQ/files.po +++ b/l10n/ku_IQ/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po index 46d27d6d46b..0960adbca3b 100644 --- a/l10n/ku_IQ/files_sharing.po +++ b/l10n/ku_IQ/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po index 834ebb7f593..79f5da1fede 100644 --- a/l10n/ku_IQ/files_trashbin.po +++ b/l10n/ku_IQ/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po index 77aae40637e..b82de7fb722 100644 --- a/l10n/ku_IQ/lib.po +++ b/l10n/ku_IQ/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 00:03+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: ku_IQ\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "یارمەتی" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "ده‌ستكاری" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "به‌كارهێنه‌ر" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "به‌رنامه‌كان" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "به‌ڕێوه‌به‌ری سه‌ره‌كی" diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po index 24c5b81e821..906b080897d 100644 --- a/l10n/ku_IQ/settings.po +++ b/l10n/ku_IQ/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "وشەی تێپەربو" @@ -423,7 +423,7 @@ msgstr "وشەی نهێنی نوێ" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po index a4d5e6490f9..e959634da82 100644 --- a/l10n/ku_IQ/user_ldap.po +++ b/l10n/ku_IQ/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lb/core.po b/l10n/lb/core.po index 47cf5b43292..b01e5bac5bc 100644 --- a/l10n/lb/core.po +++ b/l10n/lb/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "Joren hier" msgid "Choose" msgstr "Auswielen" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Ofbriechen" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Jo" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nee" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "OK" diff --git a/l10n/lb/files.po b/l10n/lb/files.po index 63e0de3e7cf..f6b899c8042 100644 --- a/l10n/lb/files.po +++ b/l10n/lb/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po index 9e3a4d10e08..46158823d4e 100644 --- a/l10n/lb/files_external.po +++ b/l10n/lb/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po index aa4729cef95..79a370ca22f 100644 --- a/l10n/lb/files_sharing.po +++ b/l10n/lb/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po index 24b8d8af7e8..68898ece605 100644 --- a/l10n/lb/files_trashbin.po +++ b/l10n/lb/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po index 5da601dfeb5..da922bc5d7a 100644 --- a/l10n/lb/lib.po +++ b/l10n/lb/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: lb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Hëllef" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Perséinlech" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Astellungen" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Benotzer" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Applicatiounen" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po index 373bdf0fc05..18435e1f250 100644 --- a/l10n/lb/settings.po +++ b/l10n/lb/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "réckgängeg man" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Gruppen" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Gruppen Admin" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Läschen" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Passwuert" @@ -423,7 +423,7 @@ msgstr "Neit Passwuert" msgid "Change password" msgstr "Passwuert änneren" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "Erstellen" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Aner" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po index d0abaacfd90..4543599a143 100644 --- a/l10n/lb/user_ldap.po +++ b/l10n/lb/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index 5701c168881..554a6bbe340 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/core.po @@ -4,13 +4,14 @@ # # Translators: # Roman Deniobe <rms200x@gmail.com>, 2013 +# fizikiukas <fizikiukas@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: Roman Deniobe <rms200x@gmail.com>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,18 +34,18 @@ msgstr "Vartotojas %s su jumis pasidalino aplanku" msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "" +msgstr "Vartotojas %s pasidalino failu \"%s\" su jumis. Jį atsisiųsti galite Äia: %s" #: ajax/share.php:104 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " "here: %s" -msgstr "" +msgstr "Vartotojas %s pasidalino aplanku \"%s\" su jumis. Jį atsisiųsti galite Äia: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Kategorija nenurodyta." #: ajax/vcategories/add.php:30 msgid "No category to add?" @@ -53,24 +54,24 @@ msgstr "NepridÄ—site jokios kategorijos?" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "Å i kategorija jau egzistuoja: %s" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "Objekto tipas nenurodytas." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "" +msgstr "%s ID nenurodytas." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Klaida perkeliant %s į jÅ«sų mÄ—gstamiausius." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." @@ -79,7 +80,7 @@ msgstr "Trynimui nepasirinkta jokia kategorija." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Klaida iÅ¡trinant %s iÅ¡ jÅ«sų mÄ—gstamiausius." #: js/config.php:34 msgid "Sunday" @@ -175,11 +176,11 @@ msgstr "PrieÅ¡ {count} minutes" #: js/js.js:721 msgid "1 hour ago" -msgstr "" +msgstr "prieÅ¡ 1 valandÄ…" #: js/js.js:722 msgid "{hours} hours ago" -msgstr "" +msgstr "prieÅ¡ {hours} valandas" #: js/js.js:723 msgid "today" @@ -199,7 +200,7 @@ msgstr "praeitÄ… mÄ—nesį" #: js/js.js:727 msgid "{months} months ago" -msgstr "" +msgstr "prieÅ¡ {months} mÄ—nesių" #: js/js.js:728 msgid "months ago" @@ -217,30 +218,30 @@ msgstr "prieÅ¡ metus" msgid "Choose" msgstr "Pasirinkite" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "AtÅ¡aukti" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" -msgstr "" +msgstr "Klaida pakraunant failų narÅ¡yklÄ™" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Taip" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ne" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Gerai" #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." -msgstr "" +msgstr "Objekto tipas nenurodytas." #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 @@ -252,15 +253,15 @@ msgstr "Klaida" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "" +msgstr "Nenurodytas programos pavadinimas." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "" +msgstr "Reikalingas {file} failas nÄ—ra įraÅ¡ytas!" #: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" -msgstr "" +msgstr "Dalinamasi" #: js/share.js:90 msgid "Share" @@ -304,11 +305,11 @@ msgstr "Slaptažodis" #: js/share.js:173 msgid "Email link to person" -msgstr "" +msgstr "Nusiųsti nuorodÄ… paÅ¡tu" #: js/share.js:174 msgid "Send" -msgstr "" +msgstr "Siųsti" #: js/share.js:178 msgid "Set expiration date" @@ -376,22 +377,22 @@ msgstr "Klaida nustatant galiojimo laikÄ…" #: js/share.js:604 msgid "Sending ..." -msgstr "" +msgstr "SiunÄiama..." #: js/share.js:615 msgid "Email sent" -msgstr "" +msgstr "LaiÅ¡kas iÅ¡siųstas" #: js/update.js:14 msgid "" "The update was unsuccessful. Please report this issue to the <a " "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud " "community</a>." -msgstr "" +msgstr "Atnaujinimas buvo nesÄ—kmingas. PApie tai praÅ¡ome praneÅ¡ti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>." #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "Atnaujinimas buvo sÄ—kmingas. Nukreipiame į jÅ«sų ownCloud." #: lostpassword/controller.php:48 msgid "ownCloud password reset" @@ -406,11 +407,11 @@ msgid "" "The link to reset your password has been sent to your email.<br>If you do " "not receive it within a reasonable amount of time, check your spam/junk " "folders.<br>If it is not there ask your local administrator ." -msgstr "" +msgstr "NuorodÄ… su jÅ«sų slaptažodžio atkÅ«rimu buvo nusiųsta jums į paÅ¡tÄ….<br>Jei jo negausite per atitinkamÄ… laikÄ…, pasižiÅ«rÄ—kite brukalo aplankale.<br> Jei jo ir ten nÄ—ra, teiraukitÄ—s administratoriaus." #: lostpassword/templates/lostpassword.php:12 msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "" +msgstr "Klaida!<br>Ar tikrai jÅ«sų el paÅ¡tas/vartotojo vardas buvo teisingi?" #: lostpassword/templates/lostpassword.php:15 msgid "You will receive a link to reset your password via Email." @@ -484,11 +485,11 @@ msgstr "Saugumo praneÅ¡imas" #: templates/installation.php:25 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" -msgstr "" +msgstr "JÅ«sų PHP versija yra pažeidžiama prieÅ¡ NULL Byte atakÄ… (CVE-2006-7243)" #: templates/installation.php:26 msgid "Please update your PHP installation to use ownCloud securely." -msgstr "" +msgstr "PraÅ¡ome atnaujinti savo PHP norint naudotis savo ownCloud saugiai." #: templates/installation.php:32 msgid "" @@ -506,14 +507,14 @@ msgstr "Be saugaus atsitiktinių skaiÄių generatoriaus, piktavaliai gali atspÄ msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "JÅ«sų failai yra tikriausiai prieinami per internetÄ… nes .htaccess failas neveikia." #: templates/installation.php:40 msgid "" "For information how to properly configure your server, please see the <a " "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" " "target=\"_blank\">documentation</a>." -msgstr "" +msgstr "Norint gauti daugiau informacijos apie tai kaip tinkamai nustatyit savo serverį, praÅ¡ome perskaityti <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacijÄ…</a>." #: templates/installation.php:44 msgid "Create an <strong>admin account</strong>" @@ -568,7 +569,7 @@ msgstr "jÅ«sų valdomos web paslaugos" #: templates/layout.user.php:37 #, php-format msgid "%s is available. Get more information on how to update." -msgstr "" +msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimÄ…." #: templates/layout.user.php:62 msgid "Log out" @@ -602,7 +603,7 @@ msgstr "Prisijungti" #: templates/login.php:47 msgid "Alternative Logins" -msgstr "" +msgstr "AlternatyvÅ«s prisijungimai" #: templates/part.pagenavi.php:3 msgid "prev" @@ -615,4 +616,4 @@ msgstr "kitas" #: templates/update.php:3 #, php-format msgid "Updating ownCloud to version %s, this may take a while." -msgstr "" +msgstr "Atnaujinama ownCloud į %s versijÄ…. tai gali Å¡iek tiek užtrukti." diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po index cc32db7f2e5..e56e73160a8 100644 --- a/l10n/lt_LT/files.po +++ b/l10n/lt_LT/files.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# fizikiukas <fizikiukas@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,16 +21,16 @@ msgstr "" #: ajax/move.php:17 #, php-format msgid "Could not move %s - File with this name already exists" -msgstr "" +msgstr "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja" #: ajax/move.php:27 ajax/move.php:30 #, php-format msgid "Could not move %s" -msgstr "" +msgstr "Nepavyko perkelti %s" #: ajax/upload.php:19 msgid "No file was uploaded. Unknown error" -msgstr "" +msgstr "Failai nebuvo įkelti dÄ—l nežinomos priežasties" #: ajax/upload.php:26 msgid "There is no error, the file uploaded with success" @@ -38,7 +39,7 @@ msgstr "Failas įkeltas sÄ—kmingai, be klaidų" #: ajax/upload.php:27 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "" +msgstr "Ä®keliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:" #: ajax/upload.php:29 msgid "" @@ -64,11 +65,11 @@ msgstr "Nepavyko įraÅ¡yti į diskÄ…" #: ajax/upload.php:51 msgid "Not enough storage available" -msgstr "" +msgstr "Nepakanka vietos serveryje" #: ajax/upload.php:83 msgid "Invalid directory." -msgstr "" +msgstr "Neteisingas aplankas" #: appinfo/app.php:12 msgid "Files" @@ -80,7 +81,7 @@ msgstr "Dalintis" #: js/fileactions.js:126 msgid "Delete permanently" -msgstr "" +msgstr "IÅ¡trinti negrįžtamai" #: js/fileactions.js:128 templates/index.php:93 templates/index.php:94 msgid "Delete" @@ -120,7 +121,7 @@ msgstr "anuliuoti" #: js/filelist.js:331 msgid "perform delete operation" -msgstr "" +msgstr "iÅ¡trinti" #: js/filelist.js:413 msgid "1 file uploading" @@ -128,35 +129,35 @@ msgstr "įkeliamas 1 failas" #: js/filelist.js:416 js/filelist.js:470 msgid "files uploading" -msgstr "" +msgstr "įkeliami failai" #: js/files.js:52 msgid "'.' is an invalid file name." -msgstr "" +msgstr "'.' yra neleidžiamas failo pavadinime." #: js/files.js:56 msgid "File name cannot be empty." -msgstr "" +msgstr "Failo pavadinimas negali bÅ«ti tuÅ¡Äias." #: js/files.js:64 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami." #: js/files.js:78 msgid "Your storage is full, files can not be updated or synced anymore!" -msgstr "" +msgstr "JÅ«sų visa vieta serveryje užimta" #: js/files.js:82 msgid "Your storage is almost full ({usedSpacePercent}%)" -msgstr "" +msgstr "JÅ«sų vieta serveryje beveik visa užimta ({usedSpacePercent}%)" #: js/files.js:231 msgid "" "Your download is being prepared. This might take some time if the files are " "big." -msgstr "" +msgstr "JÅ«sų atsisiuntimas yra paruoÅ¡iamas. tai gali užtrukti jei atsisiunÄiamas didelis failas." #: js/files.js:264 msgid "Unable to upload your file as it is a directory or has 0 bytes" @@ -164,7 +165,7 @@ msgstr "Neįmanoma įkelti failo - jo dydis gali bÅ«ti 0 bitų arba tai kataloga #: js/files.js:277 msgid "Not enough space available" -msgstr "" +msgstr "Nepakanka vietos" #: js/files.js:317 msgid "Upload cancelled." @@ -177,11 +178,11 @@ msgstr "Failo įkÄ—limas pradÄ—tas. Jei paliksite šį puslapį, įkÄ—limas nutr #: js/files.js:486 msgid "URL cannot be empty." -msgstr "" +msgstr "URL negali bÅ«ti tuÅ¡Äias." #: js/files.js:491 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" -msgstr "" +msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud" #: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864 msgid "Error" @@ -217,11 +218,11 @@ msgstr "{count} failai" #: lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" -msgstr "" +msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud" #: lib/app.php:73 msgid "Unable to rename file" -msgstr "" +msgstr "Nepavyko pervadinti failo" #: lib/helper.php:11 templates/index.php:18 msgid "Upload" @@ -273,11 +274,11 @@ msgstr "Katalogas" #: templates/index.php:14 msgid "From link" -msgstr "" +msgstr "IÅ¡ nuorodos" #: templates/index.php:42 msgid "Deleted files" -msgstr "" +msgstr "IÅ¡trinti failai" #: templates/index.php:48 msgid "Cancel upload" @@ -285,7 +286,7 @@ msgstr "AtÅ¡aukti siuntimÄ…" #: templates/index.php:54 msgid "You don’t have write permissions here." -msgstr "" +msgstr "JÅ«s neturite raÅ¡ymo leidimo." #: templates/index.php:61 msgid "Nothing in here. Upload something!" @@ -319,4 +320,4 @@ msgstr "Å iuo metu skenuojama" #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." -msgstr "" +msgstr "Atnaujinamas sistemos keÅ¡avimas..." diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po index 8d1d63c95a1..95c521c9553 100644 --- a/l10n/lt_LT/files_encryption.po +++ b/l10n/lt_LT/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# fizikiukas <fizikiukas@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:23+0000\n" +"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,29 +20,29 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "AtkÅ«rimo raktas sÄ—kmingai įjungtas" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Neišėjo įjungti jÅ«sų atkÅ«rimo rakto. PraÅ¡ome jį patikrinti!" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "AtkÅ«rimo raktas sÄ—kmingai iÅ¡jungtas" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Neišėjo iÅ¡jungti jÅ«sų atkÅ«rimo rakto. PraÅ¡ome jį patikrinti!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "Slaptažodis sÄ—kmingai pakeistas" #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "Slaptažodis nebuvo pakeistas. Gali bÅ«ti, kad buvo neteisingai suvestas senasis." #: js/settings-admin.js:11 msgid "Saving..." @@ -54,50 +55,50 @@ msgstr "Å ifravimas" #: templates/settings-admin.php:9 msgid "" "Enable encryption passwords recovery key (allow sharing to recovery key):" -msgstr "" +msgstr "Ä®jungti Å¡ifravimo slaptažodžio atstatymo raktÄ… (leidžia dalintis su atstatymo raktu):" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "Atstatymo vartotojo slaptažodis" #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" -msgstr "" +msgstr "Ä®jungta" #: templates/settings-admin.php:28 templates/settings-personal.php:26 msgid "Disabled" -msgstr "" +msgstr "IÅ¡jungta" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" -msgstr "" +msgstr "Pakeisti Å¡ifravimo slaptažodžio atstatymo raktÄ…:" #: templates/settings-admin.php:39 msgid "Old Recovery account password" -msgstr "" +msgstr "Seno atstatymo vartotojo slaptažodis" #: templates/settings-admin.php:46 msgid "New Recovery account password" -msgstr "" +msgstr "naujo atstatymo vartotojo slaptažodis" #: templates/settings-admin.php:51 msgid "Change Password" -msgstr "" +msgstr "Pakeisti slaptažodį" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" -msgstr "" +msgstr "Ä®jungti slaptažodžio atkÅ«rimÄ… dalinantis visais failas su administratoriumi:" #: templates/settings-personal.php:11 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files if your password is lost" -msgstr "" +msgstr "Ä®jungus Å¡iÄ… funkcijÄ… jums bus suteiktas priÄ—jimas prie Å¡ifruotos informacijos ir pamirÅ¡us slaptažodį." #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "Failų atstatymo nustatymai pakeisti" #: templates/settings-personal.php:28 msgid "Could not update file recovery" -msgstr "" +msgstr "Neišėjo atnaujinti failų atkÅ«rimo" diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po index ff81076d3e6..a59135036d9 100644 --- a/l10n/lt_LT/files_external.po +++ b/l10n/lt_LT/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Min2liz <min2lizz@gmail.com>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po index 0862b9ff139..ec78a0ece1c 100644 --- a/l10n/lt_LT/files_sharing.po +++ b/l10n/lt_LT/files_sharing.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# fizikiukas <fizikiukas@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,12 +29,12 @@ msgstr "IÅ¡saugoti" #: templates/public.php:10 #, php-format msgid "%s shared the folder %s with you" -msgstr "" +msgstr "%s pasidalino su jumis %s aplanku" #: templates/public.php:13 #, php-format msgid "%s shared the file %s with you" -msgstr "" +msgstr "%s pasidalino su jumis %s failu" #: templates/public.php:19 templates/public.php:43 msgid "Download" @@ -41,7 +42,7 @@ msgstr "Atsisiųsti" #: templates/public.php:40 msgid "No preview available for" -msgstr "" +msgstr "PeržiÅ«ra nÄ—ra galima" #: templates/public.php:50 msgid "web services under your control" diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po index 3c3687b448d..c4023b2e82f 100644 --- a/l10n/lt_LT/files_trashbin.po +++ b/l10n/lt_LT/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# fizikiukas <fizikiukas@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,16 +21,16 @@ msgstr "" #: ajax/delete.php:42 #, php-format msgid "Couldn't delete %s permanently" -msgstr "" +msgstr "Nepavyko negrįžtamai iÅ¡trinti %s" #: ajax/undelete.php:42 #, php-format msgid "Couldn't restore %s" -msgstr "" +msgstr "Nepavyko atkurti %s" #: js/trash.js:7 js/trash.js:97 msgid "perform restore operation" -msgstr "" +msgstr "atkurti" #: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141 msgid "Error" @@ -37,11 +38,11 @@ msgstr "Klaida" #: js/trash.js:34 msgid "delete file permanently" -msgstr "" +msgstr "failÄ… iÅ¡trinti negrįžtamai" #: js/trash.js:123 msgid "Delete permanently" -msgstr "" +msgstr "IÅ¡trinti negrįžtamai" #: js/trash.js:176 templates/index.php:17 msgid "Name" @@ -49,7 +50,7 @@ msgstr "Pavadinimas" #: js/trash.js:177 templates/index.php:27 msgid "Deleted" -msgstr "" +msgstr "IÅ¡trinti" #: js/trash.js:186 msgid "1 folder" @@ -69,11 +70,11 @@ msgstr "{count} failai" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" -msgstr "" +msgstr "Nieko nÄ—ra. JÅ«sų Å¡iukÅ¡liadėžė tuÅ¡Äia!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" -msgstr "" +msgstr "Atstatyti" #: templates/index.php:30 templates/index.php:31 msgid "Delete" @@ -81,4 +82,4 @@ msgstr "IÅ¡trinti" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "IÅ¡trinti failai" diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po index 3b162b697ec..bedaf696ab8 100644 --- a/l10n/lt_LT/lib.po +++ b/l10n/lt_LT/lib.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# fizikiukas <fizikiukas@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,27 +18,27 @@ msgstr "" "Language: lt_LT\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Pagalba" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Asmeniniai" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Nustatymai" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Vartotojai" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Programos" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administravimas" @@ -83,7 +84,7 @@ msgstr "ŽinuÄių" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "PaveikslÄ—liai" #: setup.php:34 msgid "Set an admin username." @@ -202,12 +203,12 @@ msgstr "prieÅ¡ %d minuÄių" #: template.php:116 msgid "1 hour ago" -msgstr "" +msgstr "prieÅ¡ 1 valandÄ…" #: template.php:117 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "prieÅ¡ %d valandų" #: template.php:118 msgid "today" @@ -229,7 +230,7 @@ msgstr "praeitÄ… mÄ—nesį" #: template.php:122 #, php-format msgid "%d months ago" -msgstr "" +msgstr "prieÅ¡ %d mÄ—nesių" #: template.php:123 msgid "last year" diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index 51e36a3cb43..ed797bfdea5 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "anuliuoti" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "GrupÄ—s" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "IÅ¡trinti" @@ -393,13 +393,13 @@ msgstr "" #: templates/personal.php:15 msgid "Get the apps to sync your files" -msgstr "" +msgstr "Atsisiųskite programÄ—lių, kad sinchronizuotumÄ—te savo failus" #: templates/personal.php:26 msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Slaptažodis" @@ -423,7 +423,7 @@ msgstr "Naujas slaptažodis" msgid "Change password" msgstr "Pakeisti slaptažodį" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "Sukurti" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Kita" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po index b4dc5746890..929d3911fca 100644 --- a/l10n/lt_LT/user_ldap.po +++ b/l10n/lt_LT/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lv/core.po b/l10n/lv/core.po index 644ae6bb4b5..f70e73f9ecb 100644 --- a/l10n/lv/core.po +++ b/l10n/lv/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "gadus atpakaļ" msgid "Choose" msgstr "IzvÄ“lieties" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Atcelt" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "JÄ" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "NÄ“" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Labi" diff --git a/l10n/lv/files.po b/l10n/lv/files.po index 35fa4748d66..44c5cd23a88 100644 --- a/l10n/lv/files.po +++ b/l10n/lv/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po index d153ee260f8..881d66c22d3 100644 --- a/l10n/lv/files_external.po +++ b/l10n/lv/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po index 204082fae48..6d1b4574d1a 100644 --- a/l10n/lv/files_sharing.po +++ b/l10n/lv/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po index 13fba0ec96e..0de6d7caa2c 100644 --- a/l10n/lv/files_trashbin.po +++ b/l10n/lv/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po index e82e6be8a44..322a046fd97 100644 --- a/l10n/lv/lib.po +++ b/l10n/lv/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "PalÄ«dzÄ«ba" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "PersonÄ«gi" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "IestatÄ«jumi" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "LietotÄji" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Lietotnes" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administratori" diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po index 706f9796001..64ce30109d4 100644 --- a/l10n/lv/settings.po +++ b/l10n/lv/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "atsaukt" msgid "Unable to remove user" msgstr "Nevar izņemt lietotÄju" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupas" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grupas administrators" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "DzÄ“st" @@ -399,7 +399,7 @@ msgstr "Saņem lietotnes, lai sinhronizÄ“tu savas datnes" msgid "Show First Run Wizard again" msgstr "VÄ“lreiz rÄdÄ«t pirmÄs palaiÅ¡anas vedni" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Parole" @@ -423,7 +423,7 @@ msgstr "Jauna parole" msgid "Change password" msgstr "MainÄ«t paroli" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Redzamais vÄrds" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Izmanto Å¡o adresi, lai, izmantojot datņu pÄrvaldnieku, savienotos ar savu ownCloud" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "IerakstīšanÄs vÄrds" @@ -463,34 +463,40 @@ msgstr "IerakstīšanÄs vÄrds" msgid "Create" msgstr "Izveidot" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "NoklusÄ“juma krÄtuve" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Neierobežota" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Cits" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "KrÄtuve" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "mainÄ«t redzamo vÄrdu" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "iestatÄ«t jaunu paroli" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "NoklusÄ“juma" diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po index bd6407dd861..ad596343f7e 100644 --- a/l10n/lv/user_ldap.po +++ b/l10n/lv/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/mk/core.po b/l10n/mk/core.po index 746ddc4c8be..c9eb09c43ac 100644 --- a/l10n/mk/core.po +++ b/l10n/mk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "пред години" msgid "Choose" msgstr "Избери" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Откажи" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Да" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ðе" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Во ред" diff --git a/l10n/mk/files.po b/l10n/mk/files.po index 1c6f6c91343..f415c8b7b1f 100644 --- a/l10n/mk/files.po +++ b/l10n/mk/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po index 787a4ac8742..190d3824ddd 100644 --- a/l10n/mk/files_external.po +++ b/l10n/mk/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po index 9b67c820b37..5909aaac05d 100644 --- a/l10n/mk/files_sharing.po +++ b/l10n/mk/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po index 36bcdfeb86c..95f327614e6 100644 --- a/l10n/mk/files_trashbin.po +++ b/l10n/mk/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po index fe5cb0f6b73..c67d3c4a405 100644 --- a/l10n/mk/lib.po +++ b/l10n/mk/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Помош" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Лично" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "ПодеÑувања" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "КориÑници" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Ðппликации" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Ðдмин" diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po index a6ddd6e3727..14a28b7e5f0 100644 --- a/l10n/mk/settings.po +++ b/l10n/mk/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "врати" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Групи" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "ÐдминиÑтратор на група" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Избриши" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Лозинка" @@ -423,7 +423,7 @@ msgstr "Ðова лозинка" msgid "Change password" msgstr "Смени лозинка" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "КориÑтете ја оваа адреÑа да " -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "Создај" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "ОÑтанато" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po index 1df9215e277..982fb57a8d9 100644 --- a/l10n/mk/user_ldap.po +++ b/l10n/mk/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po index 6063e58c8de..0fec32b2ccc 100644 --- a/l10n/ms_MY/core.po +++ b/l10n/ms_MY/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Batal" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ya" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Tidak" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po index 8222cf64ba1..6cceab3bb9d 100644 --- a/l10n/ms_MY/files.po +++ b/l10n/ms_MY/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po index c4db4c08969..f2d2a4facc6 100644 --- a/l10n/ms_MY/files_external.po +++ b/l10n/ms_MY/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po index fa3af3e7d88..8fcc64ab18c 100644 --- a/l10n/ms_MY/files_sharing.po +++ b/l10n/ms_MY/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po index 88137fe7b79..e0ace588a7f 100644 --- a/l10n/ms_MY/files_trashbin.po +++ b/l10n/ms_MY/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po index 03830636b2e..af8ce97212e 100644 --- a/l10n/ms_MY/lib.po +++ b/l10n/ms_MY/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: ms_MY\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Bantuan" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Peribadi" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Tetapan" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Pengguna" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplikasi" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po index 2e3ced004dd..ba8164f4f71 100644 --- a/l10n/ms_MY/settings.po +++ b/l10n/ms_MY/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Kumpulan" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Padam" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Kata laluan" @@ -423,7 +423,7 @@ msgstr "Kata laluan baru" msgid "Change password" msgstr "Ubah kata laluan" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "Buat" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Lain" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po index 972fb083ebc..c9a2b748a3f 100644 --- a/l10n/ms_MY/user_ldap.po +++ b/l10n/ms_MY/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po index 963c6ed7223..dcf8107e5e7 100644 --- a/l10n/my_MM/core.po +++ b/l10n/my_MM/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "နှစ် အရင်က" msgid "Choose" msgstr "ရွေးá€á€»á€šá€º" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "ပယ်ဖျက်မည်" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "ဟုá€á€º" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "မဟုá€á€ºá€˜á€°á€¸" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "အá€á€¯á€€á€±" diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po index 11f71654f64..653225d03ec 100644 --- a/l10n/my_MM/files.po +++ b/l10n/my_MM/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po index 9eb6470c33b..d4a9009b83b 100644 --- a/l10n/my_MM/files_sharing.po +++ b/l10n/my_MM/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po index b063bf38581..13d9374b1a8 100644 --- a/l10n/my_MM/lib.po +++ b/l10n/my_MM/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: my_MM\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "အကူအညီ" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "သုံးစွဲသူ" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Apps" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "အက်ဒမင်" diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po index d80dc9bfb15..6053a208e82 100644 --- a/l10n/my_MM/settings.po +++ b/l10n/my_MM/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:02+0200\n" -"PO-Revision-Date: 2013-05-25 00:02+0000\n" +"POT-Creation-Date: 2013-06-11 01:57+0200\n" +"PO-Revision-Date: 2013-06-10 23:57+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -324,11 +324,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:235 templates/personal.php:105 +#: templates/admin.php:235 templates/personal.php:111 msgid "Version" msgstr "" -#: templates/admin.php:237 templates/personal.php:108 +#: templates/admin.php:237 templates/personal.php:114 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "စကားá€á€¾á€€á€º" @@ -423,39 +423,39 @@ msgstr "စကားá€á€¾á€€á€ºá€¡á€žá€…်" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" -#: templates/personal.php:68 +#: templates/personal.php:71 msgid "Email" msgstr "" -#: templates/personal.php:70 +#: templates/personal.php:73 msgid "Your email address" msgstr "" -#: templates/personal.php:71 +#: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" msgstr "" -#: templates/personal.php:77 templates/personal.php:78 +#: templates/personal.php:83 templates/personal.php:84 msgid "Language" msgstr "" -#: templates/personal.php:89 +#: templates/personal.php:95 msgid "Help translate" msgstr "" -#: templates/personal.php:94 +#: templates/personal.php:100 msgid "WebDAV" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:102 msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index 39985c44f3a..cc41aae8516 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "Ã¥r siden" msgid "Choose" msgstr "Velg" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Avbryt" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nei" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po index fdbfc1ef2dc..96dd51fb7fb 100644 --- a/l10n/nb_NO/files.po +++ b/l10n/nb_NO/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Hans Nesse <>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po index 05d814c33a7..68f58025f84 100644 --- a/l10n/nb_NO/files_external.po +++ b/l10n/nb_NO/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Hans Nesse <>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po index f2b3eda781f..9f8a8b3efcf 100644 --- a/l10n/nb_NO/files_sharing.po +++ b/l10n/nb_NO/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po index e2808877428..11bb62601b0 100644 --- a/l10n/nb_NO/files_trashbin.po +++ b/l10n/nb_NO/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Hans Nesse <>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po index 366c9f0ff3d..c3746e2a1e8 100644 --- a/l10n/nb_NO/lib.po +++ b/l10n/nb_NO/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: nb_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Hjelp" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personlig" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Innstillinger" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Brukere" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Apper" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po index 3938b3f7457..0f28157fe1b 100644 --- a/l10n/nb_NO/settings.po +++ b/l10n/nb_NO/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -137,16 +137,16 @@ msgstr "angre" msgid "Unable to remove user" msgstr "Kunne ikke slette bruker" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupper" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Gruppeadministrator" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Slett" @@ -400,7 +400,7 @@ msgstr "FÃ¥ dine apps til Ã¥ synkronisere dine filer" msgid "Show First Run Wizard again" msgstr "Vis \"Førstegangs veiveiseren\" pÃ¥ nytt" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Passord" @@ -424,7 +424,7 @@ msgstr "Nytt passord" msgid "Change password" msgstr "Endre passord" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Visningsnavn" @@ -456,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Bruk denne adressen for Ã¥ kople til ownCloud i din filbehandler" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Logginn navn" @@ -464,34 +464,40 @@ msgstr "Logginn navn" msgid "Create" msgstr "Opprett" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Standard lager" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ubegrenset" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Annet" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Lager" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "endre visningsnavn" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "sett nytt passord" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Standard" diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po index e780277ce43..a403152e4ad 100644 --- a/l10n/nb_NO/user_ldap.po +++ b/l10n/nb_NO/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po index e1e8ae4a62f..4c04e9f3f2d 100644 --- a/l10n/ne/settings.po +++ b/l10n/ne/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:02+0200\n" -"PO-Revision-Date: 2013-05-25 00:02+0000\n" +"POT-Creation-Date: 2013-06-11 01:57+0200\n" +"PO-Revision-Date: 2013-06-10 23:57+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -324,11 +324,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:235 templates/personal.php:105 +#: templates/admin.php:235 templates/personal.php:111 msgid "Version" msgstr "" -#: templates/admin.php:237 templates/personal.php:108 +#: templates/admin.php:237 templates/personal.php:114 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "" @@ -423,39 +423,39 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" -#: templates/personal.php:68 +#: templates/personal.php:71 msgid "Email" msgstr "" -#: templates/personal.php:70 +#: templates/personal.php:73 msgid "Your email address" msgstr "" -#: templates/personal.php:71 +#: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" msgstr "" -#: templates/personal.php:77 templates/personal.php:78 +#: templates/personal.php:83 templates/personal.php:84 msgid "Language" msgstr "" -#: templates/personal.php:89 +#: templates/personal.php:95 msgid "Help translate" msgstr "" -#: templates/personal.php:94 +#: templates/personal.php:100 msgid "WebDAV" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:102 msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index 4c41061be0d..4d06155ccc6 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "jaar geleden" msgid "Choose" msgstr "Kies" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Annuleer" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Fout bij laden van bestandsselectie sjabloon" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nee" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/nl/files.po b/l10n/nl/files.po index b4e41108aed..7752d281778 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po index a813807e377..92b7cddfd69 100644 --- a/l10n/nl/files_encryption.po +++ b/l10n/nl/files_encryption.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-01 01:58+0200\n" +"PO-Revision-Date: 2013-05-31 06:00+0000\n" +"Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,21 +20,21 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Herstelsleutel succesvol geactiveerd" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Herstelsleutel succesvol gedeactiveerd" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po index 4688c7de8a4..f98d4c9f907 100644 --- a/l10n/nl/files_external.po +++ b/l10n/nl/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po index c986f38d827..1405d4a2e2b 100644 --- a/l10n/nl/files_sharing.po +++ b/l10n/nl/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po index 5c91a221507..9e2b5075f1f 100644 --- a/l10n/nl/files_trashbin.po +++ b/l10n/nl/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po index d0084278611..4df92ab94ee 100644 --- a/l10n/nl/lib.po +++ b/l10n/nl/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Help" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Persoonlijk" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Instellingen" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Gebruikers" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Apps" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Beheerder" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 0fbf8e15faa..b065718202a 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -4,13 +4,14 @@ # # Translators: # André Koot <meneer@tken.net>, 2013 +# helonaut, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: André Koot <meneer@tken.net>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -137,16 +138,16 @@ msgstr "ongedaan maken" msgid "Unable to remove user" msgstr "Kon gebruiker niet verwijderen" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Groepen" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Groep beheerder" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Verwijder" @@ -390,17 +391,17 @@ msgstr "Commerciële ondersteuning" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>" -msgstr "U heeft <strong>%s</strong> van de <strong>%s</strong> beschikbaren gebruikt" +msgstr "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>" #: templates/personal.php:15 msgid "Get the apps to sync your files" -msgstr "Download de apps om bestanden te synchen" +msgstr "Download de apps om bestanden te syncen" #: templates/personal.php:26 msgid "Show First Run Wizard again" msgstr "Toon de Eerste start Wizard opnieuw" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Wachtwoord" @@ -424,7 +425,7 @@ msgstr "Nieuw" msgid "Change password" msgstr "Wijzig wachtwoord" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Weergavenaam" @@ -438,7 +439,7 @@ msgstr "Uw e-mailadres" #: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" -msgstr "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren" +msgstr "Vul een mailadres in om je wachtwoord te kunnen herstellen" #: templates/personal.php:83 templates/personal.php:84 msgid "Language" @@ -456,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Inlognaam" @@ -464,34 +465,40 @@ msgstr "Inlognaam" msgid "Create" msgstr "Creëer" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "Beheer herstel wachtwoord" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" -msgstr "Default opslag" +msgstr "Standaard Opslaglimiet" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ongelimiteerd" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Anders" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" -msgstr "Opslag" +msgstr "Opslaglimiet" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "wijzig weergavenaam" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "Instellen nieuw wachtwoord" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" -msgstr "Default" +msgstr "Standaard" diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po index f5d9b2c4742..89846813d92 100644 --- a/l10n/nl/user_ldap.po +++ b/l10n/nl/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -359,7 +359,7 @@ msgid "" "achieve a similar behaviour as before ownCloud 5 enter the user display name" " attribute in the following field. Leave it empty for default behaviour. " "Changes will have effect only on newly mapped (added) LDAP users." -msgstr "" +msgstr "Standaard wordt de interne gebruikersnaam aangemaakt op basis van de UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle * DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van voor ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op nieuw in kaart gebracht (toegevoegde) LDAP-gebruikers." #: templates/settings.php:103 msgid "Internal Username Attribute:" @@ -378,7 +378,7 @@ msgid "" "You must make sure that the attribute of your choice can be fetched for both" " users and groups and it is unique. Leave it empty for default behaviour. " "Changes will have effect only on newly mapped (added) LDAP users and groups." -msgstr "" +msgstr "Standaard herkent ownCloud het UUID attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij dit hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw in kaart gebrachte (toegevoegde) LDAP-gebruikers en-groepen." #: templates/settings.php:106 msgid "UUID Attribute:" @@ -401,7 +401,7 @@ msgid "" "configuration sensitive, it affects all LDAP configurations! Do never clear " "the mappings in a production environment. Only clear mappings in a testing " "or experimental stage." -msgstr "" +msgstr "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, zal elke LDAP-gebruiker ook een interne gebruikersnaam krijgen. Dit vereist een mapping van de ownCloud gebruikersnaam naar een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Ook de 'DN' wordt gecached om het aantal LDAP transacties te verminderen, maar deze wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden door ownCloud. De interne ownCloud naam wordt overal in ownCloud gebruikt. Wissen van de koppeling zal overal overblijfsel laten staan. Het wissen van Mappings is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze Mappings nooit in een productieomgeving plaatsvinden. Maak ze alleen leeg in een test-of ontwikkelomgeving." #: templates/settings.php:109 msgid "Clear Username-LDAP User Mapping" diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index 2aaf1b5ed58..c449bf96eb7 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: unhammer <unhammer+dill@mm.st>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -218,23 +218,23 @@ msgstr "Ã¥r sidan" msgid "Choose" msgstr "Vel" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Avbryt" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nei" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Greitt" diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po index 3eab10bcae7..3b4d27d66b1 100644 --- a/l10n/nn_NO/files.po +++ b/l10n/nn_NO/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: unhammer <unhammer+dill@mm.st>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po index 27ed01d2ddd..155e8cde360 100644 --- a/l10n/nn_NO/files_external.po +++ b/l10n/nn_NO/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po index 6797184130c..cb4181fda48 100644 --- a/l10n/nn_NO/files_sharing.po +++ b/l10n/nn_NO/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: unhammer <unhammer+dill@mm.st>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po index 98357bcae7c..a6eb1ef45de 100644 --- a/l10n/nn_NO/files_trashbin.po +++ b/l10n/nn_NO/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: unhammer <unhammer+dill@mm.st>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po index cae7b2d0f18..c19e82dbda0 100644 --- a/l10n/nn_NO/lib.po +++ b/l10n/nn_NO/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: unhammer <unhammer+dill@mm.st>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: nn_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Hjelp" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personleg" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Innstillingar" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Brukarar" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Program" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administrer" diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index 554bfc18c91..14970866c72 100644 --- a/l10n/nn_NO/settings.po +++ b/l10n/nn_NO/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -138,16 +138,16 @@ msgstr "angra" msgid "Unable to remove user" msgstr "Klarte ikkje fjerna brukaren" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupper" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Gruppestyrar" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Slett" @@ -401,7 +401,7 @@ msgstr "FÃ¥ app-ar som kan synkronisera filene dine" msgid "Show First Run Wizard again" msgstr "Vis Oppstartvegvisaren igjen" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Passord" @@ -425,7 +425,7 @@ msgstr "Nytt passord" msgid "Change password" msgstr "Endra passord" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Visingsnamn" @@ -457,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Bruk denne adressa for Ã¥ kopla til din ownCloud frÃ¥ filhandsamaren din" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Innloggingsnamn" @@ -465,34 +465,40 @@ msgstr "Innloggingsnamn" msgid "Create" msgstr "Lag" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Standardlagring" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ubegrensa" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Anna" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Lagring" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "endra visingsnamn" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "lag nytt passord" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Standard" diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po index b8df40e960b..756a0e2c6a8 100644 --- a/l10n/nn_NO/user_ldap.po +++ b/l10n/nn_NO/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/oc/core.po b/l10n/oc/core.po index 15ed2e94f74..8ee352afe77 100644 --- a/l10n/oc/core.po +++ b/l10n/oc/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "ans a" msgid "Choose" msgstr "CausÃs" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Annula" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ã’c" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Non" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "D'accòrdi" diff --git a/l10n/oc/files.po b/l10n/oc/files.po index af417a96d94..ee46c6f9648 100644 --- a/l10n/oc/files.po +++ b/l10n/oc/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po index 966b79479a2..71eac19f43f 100644 --- a/l10n/oc/files_external.po +++ b/l10n/oc/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po index 87827762fe6..8f758bca71a 100644 --- a/l10n/oc/files_sharing.po +++ b/l10n/oc/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po index 018ff053320..bfba438eff8 100644 --- a/l10n/oc/files_trashbin.po +++ b/l10n/oc/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po index baa09964924..249cc069fe1 100644 --- a/l10n/oc/lib.po +++ b/l10n/oc/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 00:03+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: oc\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Ajuda" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personal" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Configuracion" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Usancièrs" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Apps" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po index 59d4b400ea5..2931c0ebeb5 100644 --- a/l10n/oc/settings.po +++ b/l10n/oc/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "defar" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grops" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grop Admin" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Escafa" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Senhal" @@ -423,7 +423,7 @@ msgstr "Senhal novèl" msgid "Change password" msgstr "Cambia lo senhal" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "Crea" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Autres" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po index b70248b6232..28b9c18dc19 100644 --- a/l10n/oc/user_ldap.po +++ b/l10n/oc/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 7662357c0b9..8cb360953c5 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -218,23 +218,23 @@ msgstr "lat temu" msgid "Choose" msgstr "Wybierz" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Anuluj" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Błąd podczas Å‚adowania pliku wybranego szablonu" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Tak" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nie" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "OK" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index dec4757697d..004841ecdad 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: adbrand <pkwiecin@adbrand.pl>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po index bee05545e28..8aa3c498654 100644 --- a/l10n/pl/files_external.po +++ b/l10n/pl/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po index fcfd536e37a..bddcb6ef968 100644 --- a/l10n/pl/files_sharing.po +++ b/l10n/pl/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po index 1953a610e03..5fc525f1227 100644 --- a/l10n/pl/files_trashbin.po +++ b/l10n/pl/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po index fceb0a71335..cead1733f67 100644 --- a/l10n/pl/lib.po +++ b/l10n/pl/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Pomoc" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Osobiste" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Ustawienia" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Użytkownicy" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplikacje" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administrator" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index 79b8bd64ba5..8e1c531a3aa 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -138,16 +138,16 @@ msgstr "cofnij" msgid "Unable to remove user" msgstr "Nie można usunąć użytkownika" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupy" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Administrator grupy" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "UsuÅ„" @@ -401,7 +401,7 @@ msgstr "Pobierz aplikacje żeby synchronizować swoje pliki" msgid "Show First Run Wizard again" msgstr "Uruchom ponownie kreatora pierwszego uruchomienia" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "HasÅ‚o" @@ -425,7 +425,7 @@ msgstr "Nowe hasÅ‚o" msgid "Change password" msgstr "ZmieÅ„ hasÅ‚o" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "WyÅ›wietlana nazwa" @@ -457,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Login" @@ -465,34 +465,40 @@ msgstr "Login" msgid "Create" msgstr "Utwórz" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "Odzyskiwanie hasÅ‚a administratora" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Magazyn domyÅ›lny" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Bez limitu" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Inne" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Magazyn" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "zmieÅ„ wyÅ›wietlanÄ… nazwÄ™" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "ustaw nowe hasÅ‚o" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "DomyÅ›lny" diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po index 70fb64ba15a..77d63dc0967 100644 --- a/l10n/pl/user_ldap.po +++ b/l10n/pl/user_ldap.po @@ -4,13 +4,14 @@ # # Translators: # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013 +# orcio6 <orcio6@o2.pl>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: orcio6 <orcio6@o2.pl>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -359,7 +360,7 @@ msgid "" "achieve a similar behaviour as before ownCloud 5 enter the user display name" " attribute in the following field. Leave it empty for default behaviour. " "Changes will have effect only on newly mapped (added) LDAP users." -msgstr "" +msgstr "DomyÅ›lnie, wewnÄ™trzna nazwa użytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator użytkownika. To daje pewność, że nazwa użytkownika jest niepowtarzalna a znaki nie muszÄ… być konwertowane. WewnÄ™trzna nazwa użytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. PozostaÅ‚e znaki zamieniane sÄ… na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa siÄ™ powtarza na koÅ„cu dodawana / zwiÄ™kszana jest cyfra. WewnÄ™trzna nazwa użytkownika sÅ‚uży do wewnÄ™trznej identyfikacji użytkownika. Jest to również domyÅ›lna nazwa głównego folderu w ownCloud. Jest to również klucz zdalnego URL, na przykÅ‚ad dla wszystkich usÅ‚ug *DAV. DziÄ™ki temu ustawieniu można modyfikować domyÅ›lne zachowania. Aby osiÄ…gnąć podobny efekt jak w ownCloud 5 wpisz atrybut nazwy użytkownika w poniższym polu. Pozostaw puste dla domyÅ›lnego zachowania. Zmiany bÄ™dÄ… miaÅ‚y wpÅ‚yw tylko na nowo stworzonych (dodane) użytkowników LDAP." #: templates/settings.php:103 msgid "Internal Username Attribute:" diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po index 24c921e0d52..7b4ef7d09a1 100644 --- a/l10n/pl_PL/core.po +++ b/l10n/pl_PL/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" +"POT-Creation-Date: 2013-06-04 02:29+0200\n" +"PO-Revision-Date: 2013-06-03 00:32+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "" diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po index 2a1186432c0..be28fc5ba39 100644 --- a/l10n/pl_PL/files.po +++ b/l10n/pl_PL/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-03 02:27+0200\n" +"PO-Revision-Date: 2013-06-02 23:17+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po index b9715f1763c..e91de0bce1e 100644 --- a/l10n/pl_PL/lib.po +++ b/l10n/pl_PL/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" +"POT-Creation-Date: 2013-06-04 02:29+0200\n" +"PO-Revision-Date: 2013-06-03 00:32+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po index 5818e19179c..68a0e23721f 100644 --- a/l10n/pl_PL/settings.po +++ b/l10n/pl_PL/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-03 02:27+0200\n" +"PO-Revision-Date: 2013-06-02 23:17+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index 74cc20f5698..6a87f105bbf 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Flávio Veras <flaviove@gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "anos atrás" msgid "Choose" msgstr "Escolha" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Template selecionador Erro ao carregar arquivo" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Sim" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Não" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 2eea5611f87..67ad1e60d5c 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Flávio Veras <flaviove@gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po index a4343a25252..406cccd3c9d 100644 --- a/l10n/pt_BR/files_encryption.po +++ b/l10n/pt_BR/files_encryption.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-01 01:58+0200\n" +"PO-Revision-Date: 2013-05-31 12:00+0000\n" +"Last-Translator: Flávio Veras <flaviove@gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,21 +20,21 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Recuperação de chave habilitada com sucesso" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "ImpossÃvel habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Recuperação de chave desabilitada com sucesso" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "ImpossÃvel desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po index ad01257f2f8..61d7b40ea19 100644 --- a/l10n/pt_BR/files_external.po +++ b/l10n/pt_BR/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Flávio Veras <flaviove@gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po index 4c11fa464a0..d8cc823d3b2 100644 --- a/l10n/pt_BR/files_sharing.po +++ b/l10n/pt_BR/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po index 30d9705ffc3..4a5512d874e 100644 --- a/l10n/pt_BR/files_trashbin.po +++ b/l10n/pt_BR/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po index 78526221bbd..1d24d3c7e2f 100644 --- a/l10n/pt_BR/lib.po +++ b/l10n/pt_BR/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Flávio Veras <flaviove@gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Ajuda" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Pessoal" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Ajustes" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Usuários" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplicações" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index 25478eee129..a6aa0509e40 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/settings.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# bjamalaro <bjamalaro@yahoo.com.br>, 2013 # Flávio Veras <flaviove@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: Flávio Veras <flaviove@gmail.com>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: bjamalaro <bjamalaro@yahoo.com.br>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -137,16 +138,16 @@ msgstr "desfazer" msgid "Unable to remove user" msgstr "ImpossÃvel remover usuário" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupos" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grupo Administrativo" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Excluir" @@ -400,7 +401,7 @@ msgstr "Faça com que os apps sincronize seus arquivos" msgid "Show First Run Wizard again" msgstr "Mostrar este Assistente de novo" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Senha" @@ -424,7 +425,7 @@ msgstr "Nova senha" msgid "Change password" msgstr "Alterar senha" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Nome de Exibição" @@ -456,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Usar este endereço para conectar-se ao seu ownCloud no seu gerenciador de arquivos" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Nome de Login" @@ -464,34 +465,40 @@ msgstr "Nome de Login" msgid "Create" msgstr "Criar" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "Recuperação da Senha do Administrador" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha." + +#: templates/users.php:42 msgid "Default Storage" msgstr "Armazenamento Padrão" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ilimitado" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Outro" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Armazenamento" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "alterar nome de exibição" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "definir nova senha" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Padrão" diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po index 4d342a94566..b72b019791b 100644 --- a/l10n/pt_BR/user_ldap.po +++ b/l10n/pt_BR/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Flávio Veras <flaviove@gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index aaaf2f72636..2f5fdf5f52b 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: bmgmatias <bmgmatias@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -218,23 +218,23 @@ msgstr "anos atrás" msgid "Choose" msgstr "Escolha" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Erro ao carregar arquivo do separador modelo" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Sim" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Não" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index 63c4fb930d4..cde4bd2fe72 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: bmgmatias <bmgmatias@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po index 0cba5c44e38..77340fd72af 100644 --- a/l10n/pt_PT/files_encryption.po +++ b/l10n/pt_PT/files_encryption.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Mouxy <daniel@mouxy.net>, 2013 # Helder Meneses <helder.meneses@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-11 01:56+0200\n" +"PO-Revision-Date: 2013-06-10 01:00+0000\n" +"Last-Translator: Mouxy <daniel@mouxy.net>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,21 +21,21 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Chave de recuperação activada com sucesso" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Não foi possÃvel activar a chave de recuperação. Por favor verifique a password da chave de recuperação!" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Chave de recuperação descativada com sucesso" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Não foi possÃvel desactivar a chave de recuperação. Por favor verifique a password da chave de recuperação." #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." @@ -55,11 +56,11 @@ msgstr "Encriptação" #: templates/settings-admin.php:9 msgid "" "Enable encryption passwords recovery key (allow sharing to recovery key):" -msgstr "" +msgstr "Activar a chave de recuperação das passwords de encriptação (permitir partilha da chave de recuperação):" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "Password de recuperação de conta" #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" @@ -71,15 +72,15 @@ msgstr "Desactivado" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" -msgstr "" +msgstr "Alterar a chave de recuperação da password de encriptação:" #: templates/settings-admin.php:39 msgid "Old Recovery account password" -msgstr "" +msgstr "Password de recuperação de conta antiga:" #: templates/settings-admin.php:46 msgid "New Recovery account password" -msgstr "" +msgstr "Nova password de recuperação de conta" #: templates/settings-admin.php:51 msgid "Change Password" @@ -87,18 +88,18 @@ msgstr "Mudar a Password" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" -msgstr "" +msgstr "Activar a recuperação de password ao partilhar todos os ficheiros com o administrador:" #: templates/settings-personal.php:11 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files if your password is lost" -msgstr "" +msgstr "Activar esta opção, tornar-lhe-a possÃvel a obtenção de acesso aos seus ficheiros encriptados caso perca a password." #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "Actualizadas as definições de recuperação de ficheiros" #: templates/settings-personal.php:28 msgid "Could not update file recovery" -msgstr "" +msgstr "Não foi possÃvel actualizar a recuperação de ficheiros" diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po index d1c15819a93..47381cc6316 100644 --- a/l10n/pt_PT/files_external.po +++ b/l10n/pt_PT/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Mouxy <daniel@mouxy.net>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po index dfc860d2e9e..1215efd25ba 100644 --- a/l10n/pt_PT/files_sharing.po +++ b/l10n/pt_PT/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po index 1e18240cdf9..14e8275dc7a 100644 --- a/l10n/pt_PT/files_trashbin.po +++ b/l10n/pt_PT/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po index b35b2f52a9c..ef605341253 100644 --- a/l10n/pt_PT/lib.po +++ b/l10n/pt_PT/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Ajuda" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Pessoal" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Configurações" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Utilizadores" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplicações" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index c44dafd1265..832ada0f706 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: bmgmatias <bmgmatias@gmail.com>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -138,16 +138,16 @@ msgstr "desfazer" msgid "Unable to remove user" msgstr "Não foi possÃvel remover o utilizador" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupos" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grupo Administrador" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Eliminar" @@ -401,7 +401,7 @@ msgstr "Obtenha as aplicações para sincronizar os seus ficheiros" msgid "Show First Run Wizard again" msgstr "Mostrar novamente Wizard de Arranque Inicial" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Password" @@ -425,7 +425,7 @@ msgstr "Nova palavra-chave" msgid "Change password" msgstr "Alterar palavra-chave" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Nome público" @@ -457,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Nome de utilizador" @@ -465,34 +465,40 @@ msgstr "Nome de utilizador" msgid "Create" msgstr "Criar" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "Recuperar password de administrador" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Armazenamento Padrão" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ilimitado" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Outro" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Armazenamento" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "modificar nome exibido" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "definir nova palavra-passe" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Padrão" diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po index e794846bd81..2a3fc932417 100644 --- a/l10n/pt_PT/user_ldap.po +++ b/l10n/pt_PT/user_ldap.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Mouxy <daniel@mouxy.net>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: Mouxy <daniel@mouxy.net>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ajax/clearMappings.php:34 msgid "Failed to clear the mappings." -msgstr "" +msgstr "Falhou a limpar os mapas" #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" @@ -59,7 +60,7 @@ msgstr "Não foi possÃvel adicionar as configurações do servidor." #: js/settings.js:111 msgid "mappings cleared" -msgstr "" +msgstr "Mapas limpos" #: js/settings.js:112 msgid "Success" @@ -342,7 +343,7 @@ msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifiqu #: templates/settings.php:101 msgid "Internal Username" -msgstr "" +msgstr "Nome de utilizador interno" #: templates/settings.php:102 msgid "" @@ -362,11 +363,11 @@ msgstr "" #: templates/settings.php:103 msgid "Internal Username Attribute:" -msgstr "" +msgstr "Atributo do nome de utilizador interno" #: templates/settings.php:104 msgid "Override UUID detection" -msgstr "" +msgstr "Passar a detecção do UUID" #: templates/settings.php:105 msgid "" @@ -381,11 +382,11 @@ msgstr "" #: templates/settings.php:106 msgid "UUID Attribute:" -msgstr "" +msgstr "Atributo UUID:" #: templates/settings.php:107 msgid "Username-LDAP User Mapping" -msgstr "" +msgstr "Mapeamento do utilizador LDAP" #: templates/settings.php:108 msgid "" @@ -404,11 +405,11 @@ msgstr "" #: templates/settings.php:109 msgid "Clear Username-LDAP User Mapping" -msgstr "" +msgstr "Limpar mapeamento do utilizador-LDAP" #: templates/settings.php:109 msgid "Clear Groupname-LDAP Group Mapping" -msgstr "" +msgstr "Limpar o mapeamento do nome de grupo LDAP" #: templates/settings.php:111 msgid "Test Configuration" diff --git a/l10n/ro/core.po b/l10n/ro/core.po index 56b11cabea2..7bf564a49a0 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "ani în urmă" msgid "Choose" msgstr "Alege" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Anulare" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Da" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nu" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index 94b06f78fd3..1aaf124c8cc 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po index fe2d9a4556d..bf5db908182 100644 --- a/l10n/ro/files_external.po +++ b/l10n/ro/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po index a2d8fcc86f2..e509d3a92d8 100644 --- a/l10n/ro/files_sharing.po +++ b/l10n/ro/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po index 87e209533eb..71b0644ad41 100644 --- a/l10n/ro/files_trashbin.po +++ b/l10n/ro/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po index 635ac78564c..b38d5d7a674 100644 --- a/l10n/ro/lib.po +++ b/l10n/ro/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Ajutor" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personal" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Setări" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Utilizatori" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "AplicaÈ›ii" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po index be51766c77c..83b37d94994 100644 --- a/l10n/ro/settings.po +++ b/l10n/ro/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "Anulează ultima acÈ›iune" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupuri" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Grupul Admin " -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Șterge" @@ -399,7 +399,7 @@ msgstr "Ia acum aplicatia pentru sincronizarea fisierelor " msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Parolă" @@ -423,7 +423,7 @@ msgstr "Noua parolă" msgid "Change password" msgstr "Schimbă parola" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "FoloseÈ™te această adresă pentru a conecta ownCloud cu managerul de fiÈ™iere" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "Crează" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Stocare implicită" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Nelimitată" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Altele" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Stocare" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Implicită" diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po index d411e56463a..344678eadd9 100644 --- a/l10n/ro/user_ldap.po +++ b/l10n/ro/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ru/core.po b/l10n/ru/core.po index 371fd7ba51e..0578f9aa51b 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Langaru <langaru@gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -219,23 +219,23 @@ msgstr "неÑколько лет назад" msgid "Choose" msgstr "Выбрать" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Отменить" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "Ошибка при загрузке файла выбора шаблона" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Да" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ðет" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ок" diff --git a/l10n/ru/files.po b/l10n/ru/files.po index 55e2e62c8e5..02c07114568 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Friktor <antonshramko@yandex.ru>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: Friktor <antonshramko@yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -217,7 +218,7 @@ msgstr "{count} файлов" #: lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" -msgstr "" +msgstr "Ðеправильное Ð¸Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°. Ð˜Ð¼Ñ 'Shared' зарезервировано." #: lib/app.php:73 msgid "Unable to rename file" diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po index a4983877e86..2722a7c0e8b 100644 --- a/l10n/ru/files_external.po +++ b/l10n/ru/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po index 37f4cf99c7a..16f42e1ac6c 100644 --- a/l10n/ru/files_sharing.po +++ b/l10n/ru/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po index 269c45b1afd..6edac7e3130 100644 --- a/l10n/ru/files_trashbin.po +++ b/l10n/ru/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po index ef2d4091194..0791f8879b7 100644 --- a/l10n/ru/lib.po +++ b/l10n/ru/lib.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Friktor <antonshramko@yandex.ru>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: Friktor <antonshramko@yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,27 +18,27 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Помощь" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Личное" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "КонфигурациÑ" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Пользователи" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "ПриложениÑ" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" @@ -123,7 +124,7 @@ msgstr "Ð’Ñ‹ должны войти или в ÑущеÑтвующий акка #: setup.php:155 msgid "Oracle connection could not be established" -msgstr "" +msgstr "Ñоединение Ñ Oracle не может быть уÑтановлено" #: setup.php:237 msgid "MySQL username and/or password not valid" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index 7fe37651216..d18bb63a005 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -4,12 +4,13 @@ # # Translators: # eurekafag <eurekafag@eureka7.ru>, 2013 +# Friktor <antonshramko@yandex.ru>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -137,16 +138,16 @@ msgstr "отмена" msgid "Unable to remove user" msgstr "Ðевозможно удалить пользователÑ" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Группы" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Группа ÐдминиÑтраторы" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Удалить" @@ -400,7 +401,7 @@ msgstr "Получить Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñинхронизации msgid "Show First Run Wizard again" msgstr "Показать помощник наÑтройки" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Пароль" @@ -424,7 +425,7 @@ msgstr "Ðовый пароль" msgid "Change password" msgstr "Сменить пароль" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Отображаемое имÑ" @@ -456,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "ИÑпользуйте Ñтот URL Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð³Ð¾ менеджера к Вашему хранилищу" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ" @@ -464,34 +465,40 @@ msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ" msgid "Create" msgstr "Создать" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" +msgstr "ВоÑÑтановление ÐŸÐ°Ñ€Ð¾Ð»Ñ ÐдминиÑтратора" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" msgstr "" -#: templates/users.php:38 +#: templates/users.php:42 msgid "Default Storage" msgstr "Хранилище по-умолчанию" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ðеограниченно" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Другое" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Хранилище" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "изменить отображаемое имÑ" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "уÑтановить новый пароль" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "По-умолчанию" diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po index 6d93e0fa017..c569c67af87 100644 --- a/l10n/ru/user_ldap.po +++ b/l10n/ru/user_ldap.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Fenuks <fenuksuh@ya.ru>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: Fenuks <fenuksuh@ya.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ajax/clearMappings.php:34 msgid "Failed to clear the mappings." -msgstr "" +msgstr "Ðе удалоÑÑŒ очиÑтить ÑоотвеÑтвиÑ." #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" @@ -59,7 +60,7 @@ msgstr "Ðе получилоÑÑŒ добавить конфигурацию Ñе #: js/settings.js:111 msgid "mappings cleared" -msgstr "" +msgstr "СоответÑÑ‚Ð²Ð¸Ñ Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ñ‹" #: js/settings.js:112 msgid "Success" @@ -342,7 +343,7 @@ msgstr "ОÑтавьте Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿ÑƒÑтым (по ум #: templates/settings.php:101 msgid "Internal Username" -msgstr "" +msgstr "Внутреннее Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ" #: templates/settings.php:102 msgid "" @@ -362,11 +363,11 @@ msgstr "" #: templates/settings.php:103 msgid "Internal Username Attribute:" -msgstr "" +msgstr "Ðттрибут Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ³Ð¾ имени:" #: templates/settings.php:104 msgid "Override UUID detection" -msgstr "" +msgstr "Переопределить нахождение UUID" #: templates/settings.php:105 msgid "" @@ -381,11 +382,11 @@ msgstr "" #: templates/settings.php:106 msgid "UUID Attribute:" -msgstr "" +msgstr "Ðттрибут Ð´Ð»Ñ UUID:" #: templates/settings.php:107 msgid "Username-LDAP User Mapping" -msgstr "" +msgstr "СоответÑÑ‚Ð²Ð¸Ñ Ð˜Ð¼Ñ-Пользователь LDAP" #: templates/settings.php:108 msgid "" @@ -404,11 +405,11 @@ msgstr "" #: templates/settings.php:109 msgid "Clear Username-LDAP User Mapping" -msgstr "" +msgstr "ОчиÑтить ÑоответÑÑ‚Ð²Ð¸Ñ Ð˜Ð¼Ñ-Пользователь LDAP" #: templates/settings.php:109 msgid "Clear Groupname-LDAP Group Mapping" -msgstr "" +msgstr "ОчиÑтить ÑоответÑÑ‚Ð²Ð¸Ñ Ð“Ñ€ÑƒÐ¿Ð¿Ð°-Группа LDAP" #: templates/settings.php:111 msgid "Test Configuration" diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po index 8fa31ad9231..06111cdf7c6 100644 --- a/l10n/ru_RU/core.po +++ b/l10n/ru_RU/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-04 02:29+0200\n" +"PO-Revision-Date: 2013-06-03 00:32+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Отмена" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "" diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po index a8fd29211cb..097c3e00ba5 100644 --- a/l10n/ru_RU/files.po +++ b/l10n/ru_RU/files.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-03 02:27+0200\n" "PO-Revision-Date: 2013-04-26 08:00+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po index e39c201bceb..96563330fbc 100644 --- a/l10n/ru_RU/files_external.po +++ b/l10n/ru_RU/files_external.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-03 02:27+0200\n" "PO-Revision-Date: 2013-04-26 08:01+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" diff --git a/l10n/ru_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po index 8deae54e720..2c8af92a3a6 100644 --- a/l10n/ru_RU/files_sharing.po +++ b/l10n/ru_RU/files_sharing.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-03 02:27+0200\n" "PO-Revision-Date: 2013-04-26 08:01+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po index 14d30f4dba4..958cf6f2dd6 100644 --- a/l10n/ru_RU/files_trashbin.po +++ b/l10n/ru_RU/files_trashbin.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-03 02:27+0200\n" "PO-Revision-Date: 2013-04-26 08:01+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po index 11905c32c2b..1172cc70fe7 100644 --- a/l10n/ru_RU/lib.po +++ b/l10n/ru_RU/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-04 02:29+0200\n" +"PO-Revision-Date: 2013-06-03 00:32+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po index f1dff94776c..34972e5304e 100644 --- a/l10n/ru_RU/settings.po +++ b/l10n/ru_RU/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-03 02:27+0200\n" +"PO-Revision-Date: 2013-06-02 23:17+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po index 275e6b5f1aa..42a5e0fe723 100644 --- a/l10n/ru_RU/user_ldap.po +++ b/l10n/ru_RU/user_ldap.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-03 02:27+0200\n" "PO-Revision-Date: 2013-04-26 08:02+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po index 556c3234622..55d30b24e30 100644 --- a/l10n/si_LK/core.po +++ b/l10n/si_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "අවුරුදු කීපයකට පෙර" msgid "Choose" msgstr "à¶à·à¶»à¶±à·Šà¶±" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "à¶‘à¶´à·" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "ඔව්" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "à¶‘à¶´à·" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "හරි" diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po index bad477b8651..87e442e0f50 100644 --- a/l10n/si_LK/files.po +++ b/l10n/si_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po index 2ec07e3a2f1..c20b3df3106 100644 --- a/l10n/si_LK/files_external.po +++ b/l10n/si_LK/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po index 3e0218d32f1..e6de17b6634 100644 --- a/l10n/si_LK/files_sharing.po +++ b/l10n/si_LK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po index c5c91506d91..cb21c984b78 100644 --- a/l10n/si_LK/files_trashbin.po +++ b/l10n/si_LK/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po index ccd40f52062..42af352186f 100644 --- a/l10n/si_LK/lib.po +++ b/l10n/si_LK/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: si_LK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "උදව්" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "පෞද්ගලික" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "සිටුවම්" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "පරිà·à·“ලකයන්" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "යෙදුම්" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "පරිපà·à¶½à¶š" diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po index 5ca07929ed2..0fc8fd785fe 100644 --- a/l10n/si_LK/settings.po +++ b/l10n/si_LK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "නිෂ්ප්â€à¶»à¶· කරන්න" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "à¶šà¶«à·Šà¶©à·à¶ºà¶¸à·Š" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "à¶šà·à¶«à·Šà¶© පරිපà·à¶½à¶š" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "මක෠දමන්න" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "මුර පදය" @@ -423,7 +423,7 @@ msgstr "නව මුරපදය" msgid "Change password" msgstr "මුරපදය වෙනස් කිරීම" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "à¶à¶±à¶±à·Šà¶±" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "වෙනà¶à·Š" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po index f54b887ec9a..8f0971afc43 100644 --- a/l10n/si_LK/user_ldap.po +++ b/l10n/si_LK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po index 09d08c8666a..145d6154a7e 100644 --- a/l10n/sk/settings.po +++ b/l10n/sk/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:02+0200\n" -"PO-Revision-Date: 2013-05-25 00:02+0000\n" +"POT-Creation-Date: 2013-06-11 01:57+0200\n" +"PO-Revision-Date: 2013-06-10 23:57+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -324,11 +324,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:235 templates/personal.php:105 +#: templates/admin.php:235 templates/personal.php:111 msgid "Version" msgstr "" -#: templates/admin.php:237 templates/personal.php:108 +#: templates/admin.php:237 templates/personal.php:114 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "" @@ -423,39 +423,39 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" -#: templates/personal.php:68 +#: templates/personal.php:71 msgid "Email" msgstr "" -#: templates/personal.php:70 +#: templates/personal.php:73 msgid "Your email address" msgstr "" -#: templates/personal.php:71 +#: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" msgstr "" -#: templates/personal.php:77 templates/personal.php:78 +#: templates/personal.php:83 templates/personal.php:84 msgid "Language" msgstr "" -#: templates/personal.php:89 +#: templates/personal.php:95 msgid "Help translate" msgstr "" -#: templates/personal.php:94 +#: templates/personal.php:100 msgid "WebDAV" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:102 msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po index 48c5076a60a..ccdfba9b5eb 100644 --- a/l10n/sk_SK/core.po +++ b/l10n/sk_SK/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: mhh <marian.hvolka@stuba.sk>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "pred rokmi" msgid "Choose" msgstr "Výber" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "ZruÅ¡iÅ¥" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ãno" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nie" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po index 270f22f92a9..1a47c8b6da3 100644 --- a/l10n/sk_SK/files.po +++ b/l10n/sk_SK/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: mhh <marian.hvolka@stuba.sk>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po index 0ccaf8ad28c..ca70d39c310 100644 --- a/l10n/sk_SK/files_external.po +++ b/l10n/sk_SK/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: mhh <marian.hvolka@stuba.sk>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po index 780b50974d3..9a1cd878c36 100644 --- a/l10n/sk_SK/files_sharing.po +++ b/l10n/sk_SK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po index 8fbbd410020..3f1c1fb600d 100644 --- a/l10n/sk_SK/files_trashbin.po +++ b/l10n/sk_SK/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po index 2cf98a47eaf..90bdadd9f41 100644 --- a/l10n/sk_SK/lib.po +++ b/l10n/sk_SK/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: mhh <marian.hvolka@stuba.sk>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: sk_SK\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Pomoc" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Osobné" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Nastavenia" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "PoužÃvatelia" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Aplikácie" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Administrátor" diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po index bca29990aef..713d0a77217 100644 --- a/l10n/sk_SK/settings.po +++ b/l10n/sk_SK/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: mhh <marian.hvolka@stuba.sk>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -137,16 +137,16 @@ msgstr "vrátiÅ¥" msgid "Unable to remove user" msgstr "Nemožno odobraÅ¥ použÃvateľa" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Skupiny" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Správca skupiny" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "ZmazaÅ¥" @@ -400,7 +400,7 @@ msgstr "ZÃskaÅ¥ aplikácie na synchronizáciu VaÅ¡ich súborov" msgid "Show First Run Wizard again" msgstr "Znovu zobraziÅ¥ sprievodcu prvým spustenÃm" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Heslo" @@ -424,7 +424,7 @@ msgstr "Nové heslo" msgid "Change password" msgstr "ZmeniÅ¥ heslo" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Zobrazované meno" @@ -456,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Použite túto adresu pre pripojenie vášho ownCloud k súborovému správcovi" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Prihlasovacie meno" @@ -464,34 +464,40 @@ msgstr "Prihlasovacie meno" msgid "Create" msgstr "VytvoriÅ¥" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "Obnovenie hesla administrátora" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Predvolené úložisko" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Nelimitované" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Iné" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Úložisko" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "zmeniÅ¥ zobrazované meno" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "nastaviÅ¥ nové heslo" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Predvolené" diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po index 4469877633d..8b1e52f7e28 100644 --- a/l10n/sk_SK/user_ldap.po +++ b/l10n/sk_SK/user_ldap.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: mhh <marian.hvolka@stuba.sk>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 83777f4b6c1..1c886017c42 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "let nazaj" msgid "Choose" msgstr "Izbor" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "PrekliÄi" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Da" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ne" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "V redu" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index ad2211cbdb0..83b7d7a0e2c 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po index 8691a2b195c..c7ba402ab0e 100644 --- a/l10n/sl/files_external.po +++ b/l10n/sl/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po index 5f55574a6ee..69313d6c6ee 100644 --- a/l10n/sl/files_sharing.po +++ b/l10n/sl/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po index e690b9b80ce..65f295ebaca 100644 --- a/l10n/sl/files_trashbin.po +++ b/l10n/sl/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po index a957ec3afe1..f949c6a62c6 100644 --- a/l10n/sl/lib.po +++ b/l10n/sl/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "PomoÄ" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Osebno" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Nastavitve" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Uporabniki" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Programi" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "SkrbniÅ¡tvo" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index c3c8c46f81a..1302cb8f88c 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -137,16 +137,16 @@ msgstr "razveljavi" msgid "Unable to remove user" msgstr "Uporabnika ni mogoÄe odstraniti" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Skupine" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Skrbnik skupine" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "IzbriÅ¡i" @@ -400,7 +400,7 @@ msgstr "Pridobi programe za usklajevanje datotek" msgid "Show First Run Wizard again" msgstr "Zaženi Äarovnika prvega zagona" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Geslo" @@ -424,7 +424,7 @@ msgstr "Novo geslo" msgid "Change password" msgstr "Spremeni geslo" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Prikazano ime" @@ -456,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud." -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Prijavno ime" @@ -464,34 +464,40 @@ msgstr "Prijavno ime" msgid "Create" msgstr "Ustvari" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Privzeta shramba" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Neomejeno" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Drugo" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Shramba" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "spremeni prikazano ime" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "nastavi novo geslo" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Privzeto" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index 21bba68afb7..0ca6dd20a28 100644 --- a/l10n/sl/user_ldap.po +++ b/l10n/sl/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sq/core.po b/l10n/sq/core.po index 9ecd864f23c..bca3dff1aaa 100644 --- a/l10n/sq/core.po +++ b/l10n/sq/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "vite më parë" msgid "Choose" msgstr "Zgjidh" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Anulo" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Po" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Jo" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Në rregull" diff --git a/l10n/sq/files.po b/l10n/sq/files.po index b26bcf2b7e8..df6a46e49cb 100644 --- a/l10n/sq/files.po +++ b/l10n/sq/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po index ba09f8b0663..5dc4d6a8a9e 100644 --- a/l10n/sq/files_external.po +++ b/l10n/sq/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po index fd2785d9221..f41b4d31d04 100644 --- a/l10n/sq/files_sharing.po +++ b/l10n/sq/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po index 7704819b087..b0c2693ecdb 100644 --- a/l10n/sq/files_trashbin.po +++ b/l10n/sq/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po index 3fdbc60db1c..9d4c5a02c10 100644 --- a/l10n/sq/lib.po +++ b/l10n/sq/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Ndihmë" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personale" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Parametra" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Përdoruesit" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "App" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po index 64f8f7af9ba..c8a77a47943 100644 --- a/l10n/sq/settings.po +++ b/l10n/sq/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "anulo" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Elimino" @@ -399,7 +399,7 @@ msgstr "Merrni app-et për sinkronizimin e skedarëve tuaj" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Kodi" @@ -423,7 +423,7 @@ msgstr "Kodi i ri" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po index 7ec77b926ee..fd69f404693 100644 --- a/l10n/sq/user_ldap.po +++ b/l10n/sq/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr/core.po b/l10n/sr/core.po index 9ff020ac394..17309d159ec 100644 --- a/l10n/sr/core.po +++ b/l10n/sr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "година раније" msgid "Choose" msgstr "Одабери" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Откажи" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Да" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ðе" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "У реду" diff --git a/l10n/sr/files.po b/l10n/sr/files.po index a44fe08dd00..26fecf53e0b 100644 --- a/l10n/sr/files.po +++ b/l10n/sr/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po index e9d5c3ff7c1..12878f651f8 100644 --- a/l10n/sr/files_external.po +++ b/l10n/sr/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po index 1a3a0cba946..821d5a57be4 100644 --- a/l10n/sr/files_sharing.po +++ b/l10n/sr/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po index 33c4b089dc1..a283f2b88f8 100644 --- a/l10n/sr/files_trashbin.po +++ b/l10n/sr/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po index e19b6455ee2..2a3d65d1e5b 100644 --- a/l10n/sr/lib.po +++ b/l10n/sr/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Помоћ" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Лично" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "ПоÑтавке" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "КориÑници" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Ðпликације" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "ÐдминиÑтратор" diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po index 1ee11ba4dc3..f6527a7d749 100644 --- a/l10n/sr/settings.po +++ b/l10n/sr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "опозови" msgid "Unable to remove user" msgstr "Ðе могу да уклоним кориÑника" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Групе" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Управник групе" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Обриши" @@ -399,7 +399,7 @@ msgstr "Преузмите апликације ради ÑинхронизовРmsgid "Show First Run Wizard again" msgstr "Поново прикажи чаробњак за прво покретање" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Лозинка" @@ -423,7 +423,7 @@ msgstr "Ðова лозинка" msgid "Change password" msgstr "Измени лозинку" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Име за приказ" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "КориÑтите ову адреÑу да Ñе повежете Ñа ownCloud-ом у управљачу датотекама" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "КориÑничко име" @@ -463,34 +463,40 @@ msgstr "КориÑничко име" msgid "Create" msgstr "Ðаправи" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Подразумевано Ñкладиште" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ðеограничено" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Друго" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Складиште" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "промени име за приказ" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "поÑтави нову лозинку" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Подразумевано" diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po index 995b2e1b540..c0f94ff8940 100644 --- a/l10n/sr/user_ldap.po +++ b/l10n/sr/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po index 6114f947f98..17eb6f05b6f 100644 --- a/l10n/sr@latin/core.po +++ b/l10n/sr@latin/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Otkaži" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "" diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po index f6414a330f2..1ded1154bbf 100644 --- a/l10n/sr@latin/files.po +++ b/l10n/sr@latin/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po index 6642bb9c052..35b50f4b21b 100644 --- a/l10n/sr@latin/files_external.po +++ b/l10n/sr@latin/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po index 802327ac17c..01aa998bd17 100644 --- a/l10n/sr@latin/files_sharing.po +++ b/l10n/sr@latin/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po index dcb30b800a7..ad664f2c7b1 100644 --- a/l10n/sr@latin/files_trashbin.po +++ b/l10n/sr@latin/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po index 4240f5af05b..1dbcf544fa7 100644 --- a/l10n/sr@latin/lib.po +++ b/l10n/sr@latin/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: sr@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Pomoć" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "LiÄno" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "PodeÅ¡avanja" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Korisnici" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Programi" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Adninistracija" diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po index 5054179553e..20e2f534c2a 100644 --- a/l10n/sr@latin/settings.po +++ b/l10n/sr@latin/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupe" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "ObriÅ¡i" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Lozinka" @@ -423,7 +423,7 @@ msgstr "Nova lozinka" msgid "Change password" msgstr "Izmeni lozinku" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "Napravi" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Drugo" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index 729d4df583b..282d88bc80d 100644 --- a/l10n/sv/core.po +++ b/l10n/sv/core.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# medialabs, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: medialabs\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -216,23 +217,23 @@ msgstr "Ã¥r sedan" msgid "Choose" msgstr "Välj" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Avbryt" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" -msgstr "" +msgstr "Fel vid inläsning av filväljarens mall" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Nej" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" @@ -405,11 +406,11 @@ msgid "" "The link to reset your password has been sent to your email.<br>If you do " "not receive it within a reasonable amount of time, check your spam/junk " "folders.<br>If it is not there ask your local administrator ." -msgstr "" +msgstr "Länken för att Ã¥terställa ditt lösenorden har skickats till din e-postadress<br>Om du inte har erhÃ¥llit meddelandet inom kort, vänligen kontrollera din skräppost-mapp<br>Om den inte finns där, vänligen kontakta din administratör." #: lostpassword/templates/lostpassword.php:12 msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "" +msgstr "Begäran misslyckades!<br>Är du helt säker pÃ¥ att din e-postadress/användarnamn är korrekt?" #: lostpassword/templates/lostpassword.php:15 msgid "You will receive a link to reset your password via Email." @@ -567,7 +568,7 @@ msgstr "webbtjänster under din kontroll" #: templates/layout.user.php:37 #, php-format msgid "%s is available. Get more information on how to update." -msgstr "" +msgstr "%s är tillgänglig. FÃ¥ mer information om hur du gÃ¥r tillväga för att uppdatera" #: templates/layout.user.php:62 msgid "Log out" diff --git a/l10n/sv/files.po b/l10n/sv/files.po index 690db1e5b57..badf96f4be1 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# medialabs, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: medialabs\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -217,7 +218,7 @@ msgstr "{count} filer" #: lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" -msgstr "" +msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud" #: lib/app.php:73 msgid "Unable to rename file" diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po index b6c142e6e09..556861be597 100644 --- a/l10n/sv/files_encryption.po +++ b/l10n/sv/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# medialabs <medialabs@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:23+0000\n" +"Last-Translator: medialabs <medialabs@gmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,29 +20,29 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Ã…terställningsnyckeln har framgÃ¥ngsrikt aktiverats" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Kunde inte aktivera Ã¥terställningsnyckeln. Vänligen kontrollera ditt lösenord för Ã¥terställningsnyckeln!" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Ã…terställningsnyckeln har framgÃ¥ngsrikt inaktiverats" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Kunde inte inaktivera Ã¥terställningsnyckeln. Vänligen kontrollera ditt lösenord för Ã¥terställningsnyckeln!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "Ändringen av lösenordet lyckades." #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt." #: js/settings-admin.js:11 msgid "Saving..." @@ -54,50 +55,50 @@ msgstr "Kryptering" #: templates/settings-admin.php:9 msgid "" "Enable encryption passwords recovery key (allow sharing to recovery key):" -msgstr "" +msgstr "Aktivera Ã¥terställningsnyckel för krypterade lösenord. (tillÃ¥t delning till Ã¥terställningsnyckeln):" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "Ã…terställning av kontolösenord" #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" -msgstr "" +msgstr "Aktiverad" #: templates/settings-admin.php:28 templates/settings-personal.php:26 msgid "Disabled" -msgstr "" +msgstr "Inaktiverad" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" -msgstr "" +msgstr "Ändra Ã¥terställningsnyckeln för krypterade lösenord:" #: templates/settings-admin.php:39 msgid "Old Recovery account password" -msgstr "" +msgstr "Gamla lösenordet för Ã¥terställningskontot" #: templates/settings-admin.php:46 msgid "New Recovery account password" -msgstr "" +msgstr "Nytt Ã¥terställningslösenord för kontot" #: templates/settings-admin.php:51 msgid "Change Password" -msgstr "" +msgstr "Byt lösenord" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" -msgstr "" +msgstr "Aktivera lösenordsÃ¥terställning genom att dela alla filer med din administratör:" #: templates/settings-personal.php:11 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files if your password is lost" -msgstr "" +msgstr "Aktivera det här alternativet för att kunna Ã¥terfÃ¥ tillgÃ¥ng till dina krypterade filer om du skulle förlora/glömma ditt lösenord" #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "Inställningarna för filÃ¥terställning har uppdaterats" #: templates/settings-personal.php:28 msgid "Could not update file recovery" -msgstr "" +msgstr "Kunde inte uppdatera filÃ¥terställning" diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po index 35ed501e55e..ae4a79dff1e 100644 --- a/l10n/sv/files_external.po +++ b/l10n/sv/files_external.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# medialabs, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: medialabs\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +56,7 @@ msgid "" "<b>Warning:</b> The Curl support in PHP is not enabled or installed. " "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask " "your system administrator to install it." -msgstr "" +msgstr "<b>Varning:<b> Curl-stöd i PHP är inte aktiverat eller installerat. Montering av ownCloud / WebDAV eller GoogleDrive är inte möjligt. Vänligen be din administratör att installera det." #: templates/settings.php:3 msgid "External Storage" diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po index bb675c214e6..2345e3a9048 100644 --- a/l10n/sv/files_sharing.po +++ b/l10n/sv/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po index 76ac86a39c5..3020acc5ee6 100644 --- a/l10n/sv/files_trashbin.po +++ b/l10n/sv/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po index 0448134617c..ff6e4700fd6 100644 --- a/l10n/sv/files_versions.po +++ b/l10n/sv/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# medialabs <medialabs@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:01+0200\n" -"PO-Revision-Date: 2013-05-24 13:28+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:20+0000\n" +"Last-Translator: medialabs <medialabs@gmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,4 +55,4 @@ msgstr "Versioner" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" -msgstr "Ã…terställ en fil till en tidigare version genom att klicka pÃ¥ knappen" +msgstr "Ã…terställ en fil till en tidigare version genom att klicka pÃ¥ Ã¥terställningsknappen" diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po index 82d9e289748..ddc6afce45c 100644 --- a/l10n/sv/lib.po +++ b/l10n/sv/lib.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# medialabs, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: medialabs\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,27 +18,27 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Hjälp" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Personligt" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Inställningar" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Användare" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Program" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Admin" @@ -87,47 +88,47 @@ msgstr "Bilder" #: setup.php:34 msgid "Set an admin username." -msgstr "" +msgstr "Ange ett användarnamn för administratören." #: setup.php:37 msgid "Set an admin password." -msgstr "" +msgstr "Ange ett administratörslösenord." #: setup.php:55 #, php-format msgid "%s enter the database username." -msgstr "" +msgstr "%s ange databasanvändare." #: setup.php:58 #, php-format msgid "%s enter the database name." -msgstr "" +msgstr "%s ange databasnamn" #: setup.php:61 #, php-format msgid "%s you may not use dots in the database name" -msgstr "" +msgstr "%s du fÃ¥r inte använda punkter i databasnamnet" #: setup.php:64 #, php-format msgid "%s set the database host." -msgstr "" +msgstr "%s ange databasserver/host." #: setup.php:132 setup.php:329 setup.php:374 msgid "PostgreSQL username and/or password not valid" -msgstr "" +msgstr "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt" #: setup.php:133 setup.php:238 msgid "You need to enter either an existing account or the administrator." -msgstr "" +msgstr "Du mÃ¥ste antingen ange ett befintligt konto eller administratör." #: setup.php:155 msgid "Oracle connection could not be established" -msgstr "" +msgstr "Oracle-anslutning kunde inte etableras" #: setup.php:237 msgid "MySQL username and/or password not valid" -msgstr "" +msgstr "MySQL-användarnamnet och/eller lösenordet är felaktigt" #: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432 #: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573 @@ -135,46 +136,46 @@ msgstr "" #: setup.php:623 #, php-format msgid "DB Error: \"%s\"" -msgstr "" +msgstr "DB error: \"%s\"" #: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433 #: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574 #: setup.php:585 setup.php:601 setup.php:609 setup.php:618 #, php-format msgid "Offending command was: \"%s\"" -msgstr "" +msgstr "Det felaktiga kommandot var: \"%s\"" #: setup.php:308 #, php-format msgid "MySQL user '%s'@'localhost' exists already." -msgstr "" +msgstr "MySQL-användaren '%s'@'localhost' existerar redan." #: setup.php:309 msgid "Drop this user from MySQL" -msgstr "" +msgstr "Radera denna användare frÃ¥n MySQL" #: setup.php:314 #, php-format msgid "MySQL user '%s'@'%%' already exists" -msgstr "" +msgstr "MySQl-användare '%s'@'%%' existerar redan" #: setup.php:315 msgid "Drop this user from MySQL." -msgstr "" +msgstr "Radera denna användare frÃ¥n MySQL." #: setup.php:466 setup.php:533 msgid "Oracle username and/or password not valid" -msgstr "" +msgstr "Oracle-användarnamnet och/eller lösenordet är felaktigt" #: setup.php:592 setup.php:624 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" -msgstr "" +msgstr "Det felande kommandot var: \"%s\", name: %s, password: %s" #: setup.php:644 #, php-format msgid "MS SQL username and/or password not valid: %s" -msgstr "" +msgstr "MS SQL-användaren och/eller lösenordet var inte giltigt: %s" #: setup.php:867 msgid "" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index b2fd7c6f590..eccf138e300 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/settings.po @@ -3,13 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Jan Busk, 2013 +# Jan Busk, 2013 +# medialabs, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: Jan Busk\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +31,7 @@ msgstr "Fel vid autentisering" #: ajax/changedisplayname.php:31 msgid "Your display name has been changed." -msgstr "" +msgstr "Ditt visningsnamn har ändrats." #: ajax/changedisplayname.php:34 msgid "Unable to change display name" @@ -90,7 +93,7 @@ msgstr "Kunde inte uppdatera appen" #: js/apps.js:30 msgid "Update to {appversion}" -msgstr "Uppdaterar till {appversion}" +msgstr "Uppdatera till {appversion}" #: js/apps.js:36 js/apps.js:76 msgid "Disable" @@ -136,16 +139,16 @@ msgstr "Ã¥ngra" msgid "Unable to remove user" msgstr "Kan inte ta bort användare" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Grupper" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Gruppadministratör" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Radera" @@ -209,7 +212,7 @@ msgstr "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den #: templates/admin.php:58 msgid "Locale not working" -msgstr "" +msgstr "Locale fungerar inte" #: templates/admin.php:63 #, php-format @@ -217,11 +220,11 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "" +msgstr "Denna ownCloud server kan inte sätta system locale till %s. Det innebär att det kan vara problem med vissa tecken i filnamnet. Vi vill verkligen rekommendera att du installerar nödvändiga paket pÃ¥ ditt system för att stödja %s." #: templates/admin.php:75 msgid "Internet connection not working" -msgstr "" +msgstr "Internetförbindelsen fungerar inte" #: templates/admin.php:78 msgid "" @@ -231,7 +234,7 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "" +msgstr "Den här ownCloudservern har ingen fungerande internetförbindelse. Det innebär att nÃ¥gra funktioner som t.ex. att montera externa lagringsplatser, meddelanden om uppdateringar eller installation av tredjepartsappar inte fungerar. Det kan vara sÃ¥ att det inte gÃ¥r att fÃ¥ fjärrÃ¥tkomst till filer och att e-post inte fungerar. Vi rekommenderar att du tillÃ¥ter internetÃ¥tkomst för den här servern om du vill ha tillgÃ¥ng till alla funktioner hos ownCloud" #: templates/admin.php:92 msgid "Cron" @@ -295,18 +298,18 @@ msgstr "Säkerhet" #: templates/admin.php:181 msgid "Enforce HTTPS" -msgstr "" +msgstr "Kräv HTTPS" #: templates/admin.php:182 msgid "" "Enforces the clients to connect to ownCloud via an encrypted connection." -msgstr "" +msgstr "Tvingar klienter att ansluta till ownCloud via en krypterad förbindelse." #: templates/admin.php:185 msgid "" "Please connect to this ownCloud instance via HTTPS to enable or disable the " "SSL enforcement." -msgstr "" +msgstr "Vänligen anslut till denna instans av ownCloud via HTTPS för att aktivera/avaktivera SSL" #: templates/admin.php:195 msgid "Log" @@ -336,7 +339,7 @@ msgid "" "licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" " "target=\"_blank\"><abbr title=\"Affero General Public " "License\">AGPL</abbr></a>." -msgstr "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." +msgstr "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." #: templates/apps.php:11 msgid "Add your App" @@ -368,7 +371,7 @@ msgstr "Användardokumentation" #: templates/help.php:6 msgid "Administrator Documentation" -msgstr "Administratördokumentation" +msgstr "Administratörsdokumentation" #: templates/help.php:9 msgid "Online Documentation" @@ -393,13 +396,13 @@ msgstr "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>" #: templates/personal.php:15 msgid "Get the apps to sync your files" -msgstr "Skaffa appar för att synkronisera dina filer" +msgstr "Skaffa apparna för att synkronisera dina filer" #: templates/personal.php:26 msgid "Show First Run Wizard again" msgstr "Visa Första uppstarts-guiden igen" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Lösenord" @@ -423,9 +426,9 @@ msgstr "Nytt lösenord" msgid "Change password" msgstr "Ändra lösenord" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" -msgstr "Visat namn" +msgstr "Visningsnamn" #: templates/personal.php:71 msgid "Email" @@ -455,7 +458,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Använd denna adress för att ansluta till ownCloud i din filhanterare" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Inloggningsnamn" @@ -463,34 +466,40 @@ msgstr "Inloggningsnamn" msgid "Create" msgstr "Skapa" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" -msgstr "" +msgstr "Admin Ã¥terställningslösenord" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "Enter the recovery password in order to recover the users files during password change" -#: templates/users.php:38 +#: templates/users.php:42 msgid "Default Storage" msgstr "Förvald lagring" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Obegränsad" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Annat" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Lagring" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" -msgstr "ändra visat namn" +msgstr "ändra visningsnamn" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "ange nytt lösenord" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Förvald" diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po index 8983f606e0c..7b02c641919 100644 --- a/l10n/sv/user_ldap.po +++ b/l10n/sv/user_ldap.po @@ -3,13 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Jan Busk, 2013 +# medialabs, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: medialabs\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +21,7 @@ msgstr "" #: ajax/clearMappings.php:34 msgid "Failed to clear the mappings." -msgstr "" +msgstr "Fel vid rensning av mappningar" #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" @@ -59,7 +61,7 @@ msgstr "Kunde inte lägga till serverinställning" #: js/settings.js:111 msgid "mappings cleared" -msgstr "" +msgstr "mappningar rensade" #: js/settings.js:112 msgid "Success" @@ -342,7 +344,7 @@ msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attr #: templates/settings.php:101 msgid "Internal Username" -msgstr "" +msgstr "Internt Användarnamn" #: templates/settings.php:102 msgid "" @@ -358,15 +360,15 @@ msgid "" "achieve a similar behaviour as before ownCloud 5 enter the user display name" " attribute in the following field. Leave it empty for default behaviour. " "Changes will have effect only on newly mapped (added) LDAP users." -msgstr "" +msgstr "Som standard skapas det interna användarnamnet frÃ¥n UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillÃ¥tna: [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas pÃ¥ vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärrÃ¥tkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet Ã¥sidosättas. För att uppnÃ¥ ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att pÃ¥verka nyligen mappade (tillagda) LDAP-användare" #: templates/settings.php:103 msgid "Internal Username Attribute:" -msgstr "" +msgstr "Internt Användarnamn Attribut:" #: templates/settings.php:104 msgid "Override UUID detection" -msgstr "" +msgstr "Ã…sidosätt UUID detektion" #: templates/settings.php:105 msgid "" @@ -377,15 +379,15 @@ msgid "" "You must make sure that the attribute of your choice can be fetched for both" " users and groups and it is unique. Leave it empty for default behaviour. " "Changes will have effect only on newly mapped (added) LDAP users and groups." -msgstr "" +msgstr "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat pÃ¥ detta UUID, om inte annat anges ovan. Du kan Ã¥sidosätta inställningen och passera ett attribut som du själv väljer. Du mÃ¥ste se till att attributet som du väljer kan hämtas för bÃ¥de användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att pÃ¥verka nyligen mappade (tillagda) LDAP-användare och grupper." #: templates/settings.php:106 msgid "UUID Attribute:" -msgstr "" +msgstr "UUID Attribut:" #: templates/settings.php:107 msgid "Username-LDAP User Mapping" -msgstr "" +msgstr "Användarnamn-LDAP User Mapping" #: templates/settings.php:108 msgid "" @@ -400,15 +402,15 @@ msgid "" "configuration sensitive, it affects all LDAP configurations! Do never clear " "the mappings in a production environment. Only clear mappings in a testing " "or experimental stage." -msgstr "" +msgstr "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning frÃ¥n ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den pÃ¥verkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast pÃ¥ i testmiljö!" #: templates/settings.php:109 msgid "Clear Username-LDAP User Mapping" -msgstr "" +msgstr "Rensa Användarnamn-LDAP User Mapping" #: templates/settings.php:109 msgid "Clear Groupname-LDAP Group Mapping" -msgstr "" +msgstr "Rensa Gruppnamn-LDAP Group Mapping" #: templates/settings.php:111 msgid "Test Configuration" diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po index a8fd5f1a2c2..668dde05ff3 100644 --- a/l10n/sw_KE/settings.po +++ b/l10n/sw_KE/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-25 02:02+0200\n" -"PO-Revision-Date: 2013-05-25 00:02+0000\n" +"POT-Creation-Date: 2013-06-11 01:57+0200\n" +"PO-Revision-Date: 2013-06-10 23:57+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -324,11 +324,11 @@ msgstr "" msgid "Less" msgstr "" -#: templates/admin.php:235 templates/personal.php:105 +#: templates/admin.php:235 templates/personal.php:111 msgid "Version" msgstr "" -#: templates/admin.php:237 templates/personal.php:108 +#: templates/admin.php:237 templates/personal.php:114 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "" @@ -423,39 +423,39 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" -#: templates/personal.php:68 +#: templates/personal.php:71 msgid "Email" msgstr "" -#: templates/personal.php:70 +#: templates/personal.php:73 msgid "Your email address" msgstr "" -#: templates/personal.php:71 +#: templates/personal.php:74 msgid "Fill in an email address to enable password recovery" msgstr "" -#: templates/personal.php:77 templates/personal.php:78 +#: templates/personal.php:83 templates/personal.php:84 msgid "Language" msgstr "" -#: templates/personal.php:89 +#: templates/personal.php:95 msgid "Help translate" msgstr "" -#: templates/personal.php:94 +#: templates/personal.php:100 msgid "WebDAV" msgstr "" -#: templates/personal.php:96 +#: templates/personal.php:102 msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po index 5ea24c31b4c..1cd1bb15a70 100644 --- a/l10n/ta_LK/core.po +++ b/l10n/ta_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "வரà¯à®Ÿà®™à¯à®•ளà¯à®•à¯à®•௠மà¯à®©à¯" msgid "Choose" msgstr "தெரிவà¯à®šà¯†à®¯à¯à®• " -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "இரதà¯à®¤à¯ செயà¯à®•" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "ஆமà¯" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "இலà¯à®²à¯ˆ" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "சரி" diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po index a8f5b131180..cf350ec05ee 100644 --- a/l10n/ta_LK/files.po +++ b/l10n/ta_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po index 92256528ffd..bef22321d58 100644 --- a/l10n/ta_LK/files_external.po +++ b/l10n/ta_LK/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po index 8e80e6a9eb1..55f493c1a18 100644 --- a/l10n/ta_LK/files_sharing.po +++ b/l10n/ta_LK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po index 2a8299e30ae..517ed2b22ad 100644 --- a/l10n/ta_LK/files_trashbin.po +++ b/l10n/ta_LK/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po index 9c8d33fbe46..86485937ca2 100644 --- a/l10n/ta_LK/lib.po +++ b/l10n/ta_LK/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: ta_LK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "உதவி" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "தனிபà¯à®ªà®Ÿà¯à®Ÿ" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "அமைபà¯à®ªà¯à®•ளà¯" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "பயனாளரà¯" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "செயலிகளà¯" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "நிரà¯à®µà®¾à®•à®®à¯" diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po index 0c64bdbedff..9c24f88e5cd 100644 --- a/l10n/ta_LK/settings.po +++ b/l10n/ta_LK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "à®®à¯à®©à¯ செயல௠நீகà¯à®•ம௠" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "கà¯à®´à¯à®•à¯à®•ளà¯" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "கà¯à®´à¯ நிரà¯à®µà®¾à®•ி" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "நீகà¯à®•à¯à®•" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯" @@ -423,7 +423,7 @@ msgstr "பà¯à®¤à®¿à®¯ கடவà¯à®šà¯à®šà¯Šà®²à¯" msgid "Change password" msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ மாறà¯à®±à¯à®•" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "உரà¯à®µà®¾à®•à¯à®•à¯à®•" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "மறà¯à®±à®µà¯ˆ" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po index aae74c8c847..affd247d767 100644 --- a/l10n/ta_LK/user_ldap.po +++ b/l10n/ta_LK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/te/core.po b/l10n/te/core.po index 3612c6da2bf..73161c6681b 100644 --- a/l10n/te/core.po +++ b/l10n/te/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "సంవతà±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "à°…à°µà±à°¨à±" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "కాదà±" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "సరే" diff --git a/l10n/te/files.po b/l10n/te/files.po index 233b47ba387..21000fa6e03 100644 --- a/l10n/te/files.po +++ b/l10n/te/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po index 84bdc4f5c3e..d7e1c912c36 100644 --- a/l10n/te/files_external.po +++ b/l10n/te/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po index 24ef764d0ab..78a9d4a1545 100644 --- a/l10n/te/files_trashbin.po +++ b/l10n/te/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/te/lib.po b/l10n/te/lib.po index bc95f442564..531c5e4c0da 100644 --- a/l10n/te/lib.po +++ b/l10n/te/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 00:03+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "సహాయం" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "అమరికలà±" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "వాడà±à°•à°°à±à°²à±" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "" diff --git a/l10n/te/settings.po b/l10n/te/settings.po index 05d4adee51d..62b68d8d5b2 100644 --- a/l10n/te/settings.po +++ b/l10n/te/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "తొలగించà±" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "సంకేతపదం" @@ -423,7 +423,7 @@ msgstr "కొతà±à°¤ సంకేతపదం" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po index 617bcfaa83e..6ff8efb842f 100644 --- a/l10n/te/user_ldap.po +++ b/l10n/te/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 8a84da0b2ed..06c591e9b01 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 06373fafea6..81c52e7d5bf 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 58f210cfd4d..427e1957e7f 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 489924ab7d8..5e61eb5c823 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index d134e0976f8..57d4d7e1044 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index defdeada8e5..bab3ba59aa6 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index bb6264ebafb..488972d3e63 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 8757c0a1f8d..38d2d73ef30 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,27 +17,27 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 0625a7ad95e..fc7306b09f0 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "" @@ -423,7 +423,7 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 572e9934f98..0eda5984b77 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 6d6cfee7a0e..aafdce7cb67 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po index 226be308022..7048ccf0ccb 100644 --- a/l10n/th_TH/core.po +++ b/l10n/th_TH/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "ปี ที่ผ่านมา" msgid "Choose" msgstr "เลืà¸à¸" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "ยà¸à¹€à¸¥à¸´à¸" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "ตà¸à¸¥à¸‡" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "ไม่ตà¸à¸¥à¸‡" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "ตà¸à¸¥à¸‡" diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po index 34146f5f5a8..5937981390c 100644 --- a/l10n/th_TH/files.po +++ b/l10n/th_TH/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po index 96926443733..5b27a30d2bd 100644 --- a/l10n/th_TH/files_external.po +++ b/l10n/th_TH/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po index d7e4402a86b..195b76e3f41 100644 --- a/l10n/th_TH/files_sharing.po +++ b/l10n/th_TH/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po index 984048fec30..1aec59f118a 100644 --- a/l10n/th_TH/files_trashbin.po +++ b/l10n/th_TH/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po index 267954051af..6ff4dc1a829 100644 --- a/l10n/th_TH/lib.po +++ b/l10n/th_TH/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: th_TH\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "ช่วยเหลืà¸" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "ส่วนตัว" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "ตั้งค่า" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "ผู้ใช้งาน" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "à¹à¸à¸›à¸¯" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "ผู้ดูà¹à¸¥" diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po index 28866d2434e..88a985f4f50 100644 --- a/l10n/th_TH/settings.po +++ b/l10n/th_TH/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "เลิà¸à¸—ำ" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "à¸à¸¥à¸¸à¹ˆà¸¡" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "ผู้ดูà¹à¸¥à¸à¸¥à¸¸à¹ˆà¸¡" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "ลบ" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "à¹à¸ªà¸”งหน้าจà¸à¸§à¸´à¸‹à¸²à¸£à¹Œà¸”นำทางครั้งà¹à¸£à¸à¸à¸µà¸à¸„รั้ง" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "รหัสผ่าน" @@ -423,7 +423,7 @@ msgstr "รหัสผ่านใหม่" msgid "Change password" msgstr "เปลี่ยนรหัสผ่าน" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "ชื่à¸à¸—ี่ต้à¸à¸‡à¸à¸²à¸£à¹à¸ªà¸”ง" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "ใช้ที่à¸à¸¢à¸¹à¹ˆà¸™à¸µà¹‰à¹€à¸žà¸·à¹ˆà¸à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•่à¸à¸à¸±à¸š ownCloud ในโปรà¹à¸à¸£à¸¡à¸ˆà¸±à¸”à¸à¸²à¸£à¹„ฟล์ขà¸à¸‡à¸„ุณ" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "ชื่à¸à¸—ี่ใช้สำหรับเข้าสู่ระบบ" @@ -463,34 +463,40 @@ msgstr "ชื่à¸à¸—ี่ใช้สำหรับเข้าสู่ร msgid "Create" msgstr "สร้าง" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "พื้นที่จำà¸à¸±à¸”ข้à¸à¸¡à¸¹à¸¥à¹€à¸£à¸´à¹ˆà¸¡à¸•้น" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "ไม่จำà¸à¸±à¸”จำนวน" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "à¸à¸·à¹ˆà¸™à¹†" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "พื้นที่จัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "เปลี่ยนชื่à¸à¸—ี่ต้à¸à¸‡à¸à¸²à¸£à¹ƒà¸«à¹‰à¹à¸ªà¸”ง" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "ตั้งค่ารหัสผ่านใหม่" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "ค่าเริ่มต้น" diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po index 81452f1a1cd..831be417ef7 100644 --- a/l10n/th_TH/user_ldap.po +++ b/l10n/th_TH/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index 3e3135c0cf8..97095af583b 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "yıl önce" msgid "Choose" msgstr "seç" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "İptal" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" -msgstr "" +msgstr "Seçici ÅŸablon dosya yüklemesinde hata" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Evet" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Hayır" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Tamam" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index fd76562fb03..70cb40229a2 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po index 82ddb74c5d7..06db70b18da 100644 --- a/l10n/tr/files_encryption.po +++ b/l10n/tr/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# ismail yenigül <ismail.yenigul@surgate.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:23+0000\n" +"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,29 +20,29 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "Kurtarma anahtarı baÅŸarıyla etkinleÅŸtirildi" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Kurtarma anahtarı etkinleÅŸtirilemedi. Lütfen kurtarma anahtarı parolanızı kontrol edin!" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "Kurtarma anahtarı baÅŸarıyla devre dışı bırakıldı" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "Åžifreniz baÅŸarıyla deÄŸiÅŸtirildi." #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "Parola deÄŸiÅŸtirilemedi. Eski parolanız doÄŸru olmayabilir" #: js/settings-admin.js:11 msgid "Saving..." @@ -54,50 +55,50 @@ msgstr "Åžifreleme" #: templates/settings-admin.php:9 msgid "" "Enable encryption passwords recovery key (allow sharing to recovery key):" -msgstr "" +msgstr "Åžifreli parola kurtarma anahtarını etkinleÅŸtir(kurtarma anahtarı paylaşımına izin ver)" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "Kurtarma hesabı parolası" #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" -msgstr "" +msgstr "EtkinleÅŸtirildi" #: templates/settings-admin.php:28 templates/settings-personal.php:26 msgid "Disabled" -msgstr "" +msgstr "Devre dışı" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" -msgstr "" +msgstr "Åžifreli parolalar kurtarma anahtarını deÄŸiÅŸtir:" #: templates/settings-admin.php:39 msgid "Old Recovery account password" -msgstr "" +msgstr "Eski kurtarma hesabı parolası" #: templates/settings-admin.php:46 msgid "New Recovery account password" -msgstr "" +msgstr "Yeni kurtarma hesabı parolası" #: templates/settings-admin.php:51 msgid "Change Password" -msgstr "" +msgstr "Parola deÄŸiÅŸtir" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" -msgstr "" +msgstr "Parola kurtarmasını tüm paylaşılan dosyaları sistem yöneticiniz ile paylaÅŸarak kurtarmayı etkinleÅŸtir:" #: templates/settings-personal.php:11 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files if your password is lost" -msgstr "" +msgstr "Bu seçeneÄŸi etkinleÅŸtirmekle eÄŸer parolanızı kaybederseniz ÅŸifreli dosyalara eriÅŸimi elde etmiÅŸ olursunuz" #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "Dosya kurtarma ayarları güncellendi" #: templates/settings-personal.php:28 msgid "Could not update file recovery" -msgstr "" +msgstr "Dosya kurtarma güncellenemedi" diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po index a82a063d249..c8c26f8f761 100644 --- a/l10n/tr/files_external.po +++ b/l10n/tr/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po index b6fcb022a81..d5dd8bf1c8b 100644 --- a/l10n/tr/files_sharing.po +++ b/l10n/tr/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po index 6665c3e3c68..58833c8c5f4 100644 --- a/l10n/tr/files_trashbin.po +++ b/l10n/tr/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po index 3df9797752a..7ed58621977 100644 --- a/l10n/tr/lib.po +++ b/l10n/tr/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Yardım" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "KiÅŸisel" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Ayarlar" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Kullanıcılar" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Uygulamalar" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Yönetici" @@ -124,7 +124,7 @@ msgstr "Bir konto veya kullanici birlemek ihtiyacin. " #: setup.php:155 msgid "Oracle connection could not be established" -msgstr "" +msgstr "Oracle baÄŸlantısı kurulamadı" #: setup.php:237 msgid "MySQL username and/or password not valid" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index c7d0b365d63..1f6abeb6b3c 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -137,16 +137,16 @@ msgstr "geri al" msgid "Unable to remove user" msgstr "Kullanıcı kaldırılamıyor" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Gruplar" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Yönetici Grubu " -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Sil" @@ -400,7 +400,7 @@ msgstr "Dosyalarınızı senkronize etmek için uygulamayı indirin" msgid "Show First Run Wizard again" msgstr "İlk Çalıştırma Sihirbazını yeniden göster" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Parola" @@ -424,7 +424,7 @@ msgstr "Yeni parola" msgid "Change password" msgstr "Parola deÄŸiÅŸtir" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Ekran Adı" @@ -456,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde baÄŸlanın" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "GiriÅŸ Adı" @@ -464,34 +464,40 @@ msgstr "GiriÅŸ Adı" msgid "Create" msgstr "OluÅŸtur" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" +msgstr "Yönetici kurtarma parolası" + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" msgstr "" -#: templates/users.php:38 +#: templates/users.php:42 msgid "Default Storage" msgstr "Varsayılan Depolama" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Limitsiz" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "DiÄŸer" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Depolama" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "ekran adını deÄŸiÅŸtir" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "yeni parola belirle" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Varsayılan" diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po index f10ca217ded..79e5a778ed8 100644 --- a/l10n/tr/user_ldap.po +++ b/l10n/tr/user_ldap.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ug/core.po b/l10n/ug/core.po index 61ceaca839a..3a070d59144 100644 --- a/l10n/ug/core.po +++ b/l10n/ug/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n" "Language-Team: Uighur <uqkun@outlook.com>\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "ۋاز ÙƒÛ•Ú†" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "ھەئە" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "ياق" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "جەزملە" diff --git a/l10n/ug/files.po b/l10n/ug/files.po index 89a365aa6f1..e680cf835ac 100644 --- a/l10n/ug/files.po +++ b/l10n/ug/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Uighur <uqkun@outlook.com>\n" "MIME-Version: 1.0\n" diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po index bd791948898..c54d1aa0ae4 100644 --- a/l10n/ug/files_external.po +++ b/l10n/ug/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n" "Language-Team: Uighur <uqkun@outlook.com>\n" "MIME-Version: 1.0\n" diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po index 6e57ce9c043..c5506e66edf 100644 --- a/l10n/ug/files_sharing.po +++ b/l10n/ug/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: uqkun <uqkun@outlook.com>\n" "Language-Team: Uighur <uqkun@outlook.com>\n" "MIME-Version: 1.0\n" diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po index e8a056c3609..fe99efadb85 100644 --- a/l10n/ug/files_trashbin.po +++ b/l10n/ug/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n" "Language-Team: Uighur <uqkun@outlook.com>\n" "MIME-Version: 1.0\n" diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po index ce1357ffb4a..11714520c31 100644 --- a/l10n/ug/lib.po +++ b/l10n/ug/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n" "Language-Team: Uighur <uqkun@outlook.com>\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: ug\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "ياردەم" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "شەخسىي" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "ØªÛ•ÚØ´Û•كلەر" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "ئىشلەتكۈچىلەر" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "ئەپلەر" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "" diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po index 6010d0ad2a2..e54e6ab8105 100644 --- a/l10n/ug/settings.po +++ b/l10n/ug/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Uighur <uqkun@outlook.com>\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "ÙŠÛنىۋال" msgid "Unable to remove user" msgstr "ئىشلەتكۈچىنى Ú†Ù‰Ù‚Ù‰Ø±Ù‰Û‹ÛØªÛ•لمەيدۇ" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "گۇرۇپپا" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "گۇرۇپپا باشقۇرغۇچى" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "ئۆچۈر" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "ئىم" @@ -423,7 +423,7 @@ msgstr "ÙŠÛÚÙ‰ ئىم" msgid "Change password" msgstr "ئىم ئۆزگەرت" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "كۆرسىتىش ئىسمى" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "تىزىمغا كىرىش ئاتى" @@ -463,34 +463,40 @@ msgstr "تىزىمغا كىرىش ئاتى" msgid "Create" msgstr "قۇر" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "ÙƒÛ†Úۈلدىكى ساقلىغۇچ" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "چەكسىز" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "باشقا" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "ساقلىغۇچ" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "ÙŠÛÚÙ‰ ئىم ØªÛ•ÚØ´Û•" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "ÙƒÛ†Úۈلدىكى" diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po index 467aab99fe5..1c7191b98b5 100644 --- a/l10n/ug/user_ldap.po +++ b/l10n/ug/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Uighur <uqkun@outlook.com>\n" "MIME-Version: 1.0\n" diff --git a/l10n/uk/core.po b/l10n/uk/core.po index 3bb7cd6f2cf..4d3e1fe4d9b 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "роки тому" msgid "Choose" msgstr "Обрати" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Відмінити" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Так" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "ÐÑ–" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Ok" diff --git a/l10n/uk/files.po b/l10n/uk/files.po index 17282e9f083..49ffed959ff 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po index b32ad1c900c..ce602c5527f 100644 --- a/l10n/uk/files_external.po +++ b/l10n/uk/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po index 5d366c7c2f2..56b6d689905 100644 --- a/l10n/uk/files_sharing.po +++ b/l10n/uk/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po index 213855ec581..388db08141b 100644 --- a/l10n/uk/files_trashbin.po +++ b/l10n/uk/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po index 09a117ee329..fc97ae56925 100644 --- a/l10n/uk/lib.po +++ b/l10n/uk/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Допомога" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "ОÑобиÑте" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "ÐалаштуваннÑ" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "КориÑтувачі" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Додатки" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Ðдмін" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 8b160ff57ae..dfd560c57a4 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "відмінити" msgid "Unable to remove user" msgstr "Ðеможливо видалити кориÑтувача" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Групи" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "ÐдмініÑтратор групи" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Видалити" @@ -399,7 +399,7 @@ msgstr "Отримати додатки Ð´Ð»Ñ Ñинхронізації ваш msgid "Show First Run Wizard again" msgstr "Показувати МайÑтер Ðалаштувань знову" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Пароль" @@ -423,7 +423,7 @@ msgstr "Ðовий пароль" msgid "Change password" msgstr "Змінити пароль" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Показати Ім'Ñ" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "ВикориÑтовуйте цю адреÑу Ð´Ð»Ñ Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ вашого ownCloud у вашому файловому менеджері" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Ім'Ñ Ð›Ð¾Ð³Ñ–Ð½Ñƒ" @@ -463,34 +463,40 @@ msgstr "Ім'Ñ Ð›Ð¾Ð³Ñ–Ð½Ñƒ" msgid "Create" msgstr "Створити" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Ñховище за замовчуваннÑм" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Ðеобмежено" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Інше" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Сховище" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "змінити зображене ім'Ñ" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "вÑтановити новий пароль" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "За замовчуваннÑм" diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po index 524663052a6..006344d7856 100644 --- a/l10n/uk/user_ldap.po +++ b/l10n/uk/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po index aafddc1f2ec..6221babd398 100644 --- a/l10n/ur_PK/core.po +++ b/l10n/ur_PK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "منتخب کریں" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "منسوخ کریں" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "ÛØ§Úº" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Ù†Ûیں" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "اوکے" diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po index ea8c9bb1a4d..0ec378051e1 100644 --- a/l10n/ur_PK/files.po +++ b/l10n/ur_PK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po index 02b288ea5e7..8a19d02aab4 100644 --- a/l10n/ur_PK/files_trashbin.po +++ b/l10n/ur_PK/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po index 4caef535ede..d2bd5d3cbec 100644 --- a/l10n/ur_PK/lib.po +++ b/l10n/ur_PK/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 00:42+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 00:03+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: ur_PK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "مدد" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "ذاتی" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "سیٹینگز" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "یوزرز" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "ایپز" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "ایڈمن" diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po index 17ffa75d320..2999d0a0ba8 100644 --- a/l10n/ur_PK/settings.po +++ b/l10n/ur_PK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "پاسورڈ" @@ -423,7 +423,7 @@ msgstr "نیا پاسورڈ" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po index 110e5ccb6f6..5a810047eab 100644 --- a/l10n/ur_PK/user_ldap.po +++ b/l10n/ur_PK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/vi/core.po b/l10n/vi/core.po index da406509e62..fd5fa1e56a9 100644 --- a/l10n/vi/core.po +++ b/l10n/vi/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: xtdv <truong.tx8@gmail.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "năm trước" msgid "Choose" msgstr "Chá»n" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "Há»§y" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Có" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "Không" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "Äồng ý" diff --git a/l10n/vi/files.po b/l10n/vi/files.po index a608a5f0a8e..fa1c87f15b8 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po index b364dc18140..377cc879b67 100644 --- a/l10n/vi/files_encryption.po +++ b/l10n/vi/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Tuấn Kiệt Hồ <hotuankiet_2000@yahoo.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:23+0000\n" +"Last-Translator: Tuấn Kiệt Hồ <hotuankiet_2000@yahoo.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,11 +38,11 @@ msgstr "" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "Äã đổi máºt khẩu." #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "Không thể đổi máºt khẩu. Có lẽ do máºt khẩu cÅ© không đúng." #: js/settings-admin.js:11 msgid "Saving..." @@ -58,15 +59,15 @@ msgstr "" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "Máºt khẩu cho tà i khoản cứu há»™" #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" -msgstr "" +msgstr "Báºt" #: templates/settings-admin.php:28 templates/settings-personal.php:26 msgid "Disabled" -msgstr "" +msgstr "Tắt" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" @@ -82,7 +83,7 @@ msgstr "" #: templates/settings-admin.php:51 msgid "Change Password" -msgstr "" +msgstr "Äổi Máºt khẩu" #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po index d7b1d1804e9..1c798121eec 100644 --- a/l10n/vi/files_external.po +++ b/l10n/vi/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: xtdv <truong.tx8@gmail.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po index 5062cfc5495..3866afcc851 100644 --- a/l10n/vi/files_sharing.po +++ b/l10n/vi/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po index 0f1632e7c65..5610f4db45d 100644 --- a/l10n/vi/files_trashbin.po +++ b/l10n/vi/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po index 9c3aa1fad42..1a02f6e87b4 100644 --- a/l10n/vi/lib.po +++ b/l10n/vi/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "Giúp đỡ" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "Cá nhân" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "Cà i đặt" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "Ngưá»i dùng" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "Ứng dụng" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "Quản trị" diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po index bb609528479..8bd8099270b 100644 --- a/l10n/vi/settings.po +++ b/l10n/vi/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "lùi lại" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "Nhóm" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "Nhóm quản trị" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "Xóa" @@ -399,7 +399,7 @@ msgstr "Nháºn ứng dụng để đồng bá»™ file cá»§a bạn" msgid "Show First Run Wizard again" msgstr "Hiện lại việc chạy đồ thuáºt khởi đầu" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "Máºt khẩu" @@ -423,7 +423,7 @@ msgstr "Máºt khẩu má»›i" msgid "Change password" msgstr "Äổi máºt khẩu" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "Tên hiển thị" @@ -455,7 +455,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "Sá» dụng địa chỉ nà y để kết nối ownCloud cá»§a bạn trong trình quản lý file cá»§a bạn" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "Tên đăng nháºp" @@ -463,34 +463,40 @@ msgstr "Tên đăng nháºp" msgid "Create" msgstr "Tạo" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "Bá»™ nhá»› mặc định" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "Không giá»›i hạn" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "Khác" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "Bá»™ nhá»›" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "Thay đổi tên hiển thị" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "đặt máºt khẩu má»›i" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "Mặc định" diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po index 55489e73a76..f39bf23575f 100644 --- a/l10n/vi/user_ldap.po +++ b/l10n/vi/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po index b81e4d96ffe..f7fd81ee579 100644 --- a/l10n/zh_CN.GB2312/core.po +++ b/l10n/zh_CN.GB2312/core.po @@ -3,13 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# fkj <fengkaijia@gmail.com>, 2013 +# hyy0591 <yangyu.huang@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" +"Last-Translator: hyy0591 <yangyu.huang@gmail.com>\n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -69,7 +71,7 @@ msgstr "" #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "åœ¨æ·»åŠ %s 到收è—夹时å‘生错误。" #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." @@ -78,7 +80,7 @@ msgstr "没有选ä¸è¦åˆ 除的分类。" #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "在移除收è—夹ä¸çš„ %s æ—¶å‘生错误。" #: js/config.php:34 msgid "Sunday" @@ -216,23 +218,23 @@ msgstr "å¹´å‰" msgid "Choose" msgstr "选择" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "å–æ¶ˆ" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "是" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "å¦" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "好的" @@ -593,7 +595,7 @@ msgstr "忘记密ç ?" #: templates/login.php:39 msgid "remember" -msgstr "备忘" +msgstr "è®°ä½ç™»å½•" #: templates/login.php:41 msgid "Log in" diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po index b8983f334ff..d36873bb84c 100644 --- a/l10n/zh_CN.GB2312/files.po +++ b/l10n/zh_CN.GB2312/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po index 86794259738..cf9a0d80d29 100644 --- a/l10n/zh_CN.GB2312/files_external.po +++ b/l10n/zh_CN.GB2312/files_external.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# hyy0591 <yangyu.huang@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: hyy0591 <yangyu.huang@gmail.com>\n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +56,7 @@ msgid "" "<b>Warning:</b> The Curl support in PHP is not enabled or installed. " "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask " "your system administrator to install it." -msgstr "" +msgstr "<b>è¦å‘Šï¼š</b> PHP çš„ Curl æ”¯æŒæ²¡æœ‰å®‰è£…或打开。挂载 ownCloudã€WebDAV 或 Google Drive 的功能将ä¸å¯ç”¨ã€‚请询问您的系统管ç†å‘˜åŽ»å®‰è£…å®ƒã€‚" #: templates/settings.php:3 msgid "External Storage" diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po index 8c4346eff61..54443235bfb 100644 --- a/l10n/zh_CN.GB2312/files_sharing.po +++ b/l10n/zh_CN.GB2312/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po index e4ce20c3c6e..8f12c7fb15e 100644 --- a/l10n/zh_CN.GB2312/files_trashbin.po +++ b/l10n/zh_CN.GB2312/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po index 3b4e7acde91..7f12b8f11e3 100644 --- a/l10n/zh_CN.GB2312/lib.po +++ b/l10n/zh_CN.GB2312/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: zh_CN.GB2312\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "帮助" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "ç§äºº" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "设置" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "用户" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "程åº" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "管ç†å‘˜" diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po index 87544f1f101..08dfa5e4fff 100644 --- a/l10n/zh_CN.GB2312/settings.po +++ b/l10n/zh_CN.GB2312/settings.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# hyy0591 <yangyu.huang@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" @@ -28,7 +29,7 @@ msgstr "验è¯é”™è¯¯" #: ajax/changedisplayname.php:31 msgid "Your display name has been changed." -msgstr "" +msgstr "您的显示å称已修改" #: ajax/changedisplayname.php:34 msgid "Unable to change display name" @@ -136,16 +137,16 @@ msgstr "撤销" msgid "Unable to remove user" msgstr "æ— æ³•ç§»é™¤ç”¨æˆ·" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "群组" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "群组管ç†å‘˜" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "åˆ é™¤" @@ -199,13 +200,13 @@ msgstr "请åŒå‡»<a href='%s'>安装å‘导</a>。" #: templates/admin.php:44 msgid "Module 'fileinfo' missing" -msgstr "" +msgstr "模å—“fileinfoâ€ä¸¢å¤±ã€‚" #: templates/admin.php:47 msgid "" "The PHP module 'fileinfo' is missing. We strongly recommend to enable this " "module to get best results with mime-type detection." -msgstr "" +msgstr "PHP 模å—“fileinfoâ€ä¸¢å¤±ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®æ‰“å¼€æ¤æ¨¡å—æ¥èŽ·å¾— mine 类型检测的最佳结果。" #: templates/admin.php:58 msgid "Locale not working" @@ -217,7 +218,7 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "" +msgstr "ownCloud æœåС噍ä¸èƒ½æŠŠç³»ç»ŸåŒºåŸŸè®¾ç½®åˆ° %s。这æ„å‘³ç€æ–‡ä»¶åå¯å†…å¯èƒ½å«æœ‰æŸäº›å¼•起问题的å—符。我们强烈建议在您的系统上安装必è¦çš„åŒ…æ¥æ”¯æŒâ€œ%sâ€ã€‚" #: templates/admin.php:75 msgid "Internet connection not working" @@ -399,7 +400,7 @@ msgstr "获å–åº”ç”¨å¹¶åŒæ¥æ‚¨çš„æ–‡ä»¶" msgid "Show First Run Wizard again" msgstr "冿¬¡æ˜¾ç¤ºé¦–次è¿è¡Œå‘导" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "密ç " @@ -423,7 +424,7 @@ msgstr "新密ç " msgid "Change password" msgstr "改å˜å¯†ç " -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "显示åç§°" @@ -455,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "使用æ¤åœ°å€æ¥åœ¨æ‚¨çš„æ–‡ä»¶ç®¡ç†å™¨ä¸è¿žæŽ¥æ‚¨çš„ownCloud" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "登录å" @@ -463,34 +464,40 @@ msgstr "登录å" msgid "Create" msgstr "新建" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "默认容é‡" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "æ— é™åˆ¶" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "å…¶ä»–" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "容é‡" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "更改显示åç§°" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "设置新的密ç " -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "默认" diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po index ab8f79fa987..302dad9bdc5 100644 --- a/l10n/zh_CN.GB2312/user_ldap.po +++ b/l10n/zh_CN.GB2312/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index 36f0cca01cf..e64324185e3 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: zhangmin <zm1990s@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "å¹´å‰" msgid "Choose" msgstr "选择(&C)..." -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "å–æ¶ˆ" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "åŠ è½½æ–‡ä»¶é€‰æ‹©å™¨æ¨¡æ¿å‡ºé”™" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "是" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "å¦" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "好" diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index 2ff16b4102f..fff3cef778a 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: zhangmin <zm1990s@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po index 11cd8aa05f3..5384cb2ae23 100644 --- a/l10n/zh_CN/files_encryption.po +++ b/l10n/zh_CN/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# modokwang <modokwang@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-30 02:27+0200\n" -"PO-Revision-Date: 2013-05-30 00:27+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-08 02:03+0200\n" +"PO-Revision-Date: 2013-06-07 09:23+0000\n" +"Last-Translator: modokwang <modokwang@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,29 +20,29 @@ msgstr "" #: ajax/adminrecovery.php:29 msgid "Recovery key successfully enabled" -msgstr "" +msgstr "æ¢å¤å¯†é’¥æˆåŠŸå¯ç”¨" #: ajax/adminrecovery.php:34 msgid "" "Could not enable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "ä¸èƒ½å¯ç”¨æ¢å¤å¯†é’¥ã€‚请检查æ¢å¤å¯†é’¥å¯†ç ï¼" #: ajax/adminrecovery.php:48 msgid "Recovery key successfully disabled" -msgstr "" +msgstr "æ¢å¤å¯†é’¥æˆåŠŸç¦ç”¨" #: ajax/adminrecovery.php:53 msgid "" "Could not disable recovery key. Please check your recovery key password!" -msgstr "" +msgstr "ä¸èƒ½ç¦ç”¨æ¢å¤å¯†é’¥ã€‚请检查æ¢å¤å¯†é’¥å¯†ç ï¼" #: ajax/changeRecoveryPassword.php:49 msgid "Password successfully changed." -msgstr "" +msgstr "密ç 修改æˆåŠŸã€‚" #: ajax/changeRecoveryPassword.php:51 msgid "Could not change the password. Maybe the old password was not correct." -msgstr "" +msgstr "ä¸èƒ½ä¿®æ”¹å¯†ç 。旧密ç å¯èƒ½ä¸æ£ç¡®ã€‚" #: js/settings-admin.js:11 msgid "Saving..." @@ -54,50 +55,50 @@ msgstr "åŠ å¯†" #: templates/settings-admin.php:9 msgid "" "Enable encryption passwords recovery key (allow sharing to recovery key):" -msgstr "" +msgstr "å¯ç”¨åŠ å¯†å¯†ç æ¢å¤å¯†é’¥ï¼ˆå…许共享æ¢å¤å¯†é’¥ï¼‰ï¼š" #: templates/settings-admin.php:13 msgid "Recovery account password" -msgstr "" +msgstr "æ¢å¤è´¦æˆ·å¯†ç " #: templates/settings-admin.php:20 templates/settings-personal.php:18 msgid "Enabled" -msgstr "" +msgstr "å¼€å¯" #: templates/settings-admin.php:28 templates/settings-personal.php:26 msgid "Disabled" -msgstr "" +msgstr "ç¦ç”¨" #: templates/settings-admin.php:32 msgid "Change encryption passwords recovery key:" -msgstr "" +msgstr "å˜æ›´åŠ å¯†å¯†ç æ¢å¤å¯†é’¥ï¼š" #: templates/settings-admin.php:39 msgid "Old Recovery account password" -msgstr "" +msgstr "æ—§æ¢å¤è´¦å·å¯†ç " #: templates/settings-admin.php:46 msgid "New Recovery account password" -msgstr "" +msgstr "æ–°æ¢å¤è´¦å·å¯†ç " #: templates/settings-admin.php:51 msgid "Change Password" -msgstr "" +msgstr "修改密ç " #: templates/settings-personal.php:9 msgid "Enable password recovery by sharing all files with your administrator:" -msgstr "" +msgstr "通过与系统管ç†å‘˜å…±äº«å…¨éƒ¨æ–‡ä»¶å¯ç”¨å¯†ç æ¢å¤ï¼š" #: templates/settings-personal.php:11 msgid "" "Enabling this option will allow you to reobtain access to your encrypted " "files if your password is lost" -msgstr "" +msgstr "å¯ç”¨è¯¥é€‰é¡¹å°†å…è®¸ä½ ä¸¢å¤±å¯†ç æ—¶é‡æ–°å–å¾—åŠ å¯†è¿‡çš„æ–‡ä»¶ã€‚" #: templates/settings-personal.php:27 msgid "File recovery settings updated" -msgstr "" +msgstr "文件æ¢å¤è®¾ç½®å·²æ›´æ–°" #: templates/settings-personal.php:28 msgid "Could not update file recovery" -msgstr "" +msgstr "ä¸èƒ½æ›´æ–°æ–‡ä»¶æ¢å¤" diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po index 0fa060383ff..63ba4cbe144 100644 --- a/l10n/zh_CN/files_external.po +++ b/l10n/zh_CN/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po index 6290abd8891..f8391a08818 100644 --- a/l10n/zh_CN/files_sharing.po +++ b/l10n/zh_CN/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po index 4fa0595b775..f25059b251c 100644 --- a/l10n/zh_CN/files_trashbin.po +++ b/l10n/zh_CN/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po index 5f34000b907..abbe2135ccb 100644 --- a/l10n/zh_CN/lib.po +++ b/l10n/zh_CN/lib.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# modokwang <modokwang@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: modokwang <modokwang@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,27 +18,27 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "帮助" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "个人" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "设置" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "用户" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "应用" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "管ç†" @@ -123,7 +124,7 @@ msgstr "ä½ éœ€è¦è¾“入一个数æ®åº“ä¸å·²æœ‰çš„账户或管ç†å‘˜è´¦æˆ·ã€‚" #: setup.php:155 msgid "Oracle connection could not be established" -msgstr "" +msgstr "ä¸èƒ½å»ºç«‹ç”²éª¨æ–‡è¿žæŽ¥" #: setup.php:237 msgid "MySQL username and/or password not valid" diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index 4595ac60aba..43a903f31cf 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/settings.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# modokwang <modokwang@gmail.com>, 2013 # zhangmin <zm1990s@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -137,16 +138,16 @@ msgstr "撤销" msgid "Unable to remove user" msgstr "æ— æ³•ç§»é™¤ç”¨æˆ·" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "组" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "组管ç†å‘˜" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "åˆ é™¤" @@ -400,7 +401,7 @@ msgstr "å®‰è£…åº”ç”¨è¿›è¡Œæ–‡ä»¶åŒæ¥" msgid "Show First Run Wizard again" msgstr "冿¬¡æ˜¾ç¤ºé¦–次è¿è¡Œå‘导" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "密ç " @@ -424,7 +425,7 @@ msgstr "新密ç " msgid "Change password" msgstr "修改密ç " -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "显示åç§°" @@ -456,7 +457,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "ç”¨è¯¥åœ°å€æ¥è¿žæŽ¥æ–‡ä»¶ç®¡ç†å™¨ä¸çš„ ownCloud" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "登录åç§°" @@ -464,34 +465,40 @@ msgstr "登录åç§°" msgid "Create" msgstr "创建" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" +msgstr "ç®¡ç†æ¢å¤å¯†ç " + +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" msgstr "" -#: templates/users.php:38 +#: templates/users.php:42 msgid "Default Storage" msgstr "默认å˜å‚¨" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "æ— é™" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "其它" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "å˜å‚¨" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "修改显示åç§°" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "设置新密ç " -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "默认" diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po index 292b6729cfd..fb342a94f73 100644 --- a/l10n/zh_CN/user_ldap.po +++ b/l10n/zh_CN/user_ldap.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# modokwang <modokwang@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: modokwang <modokwang@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ajax/clearMappings.php:34 msgid "Failed to clear the mappings." -msgstr "" +msgstr "æ¸…é™¤æ˜ å°„å¤±è´¥ã€‚" #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" @@ -59,7 +60,7 @@ msgstr "æ— æ³•æ·»åŠ æœåС噍é…ç½®" #: js/settings.js:111 msgid "mappings cleared" -msgstr "" +msgstr "æ¸…é™¤æ˜ å°„" #: js/settings.js:112 msgid "Success" @@ -342,7 +343,7 @@ msgstr "将用户å称留空(默认)。å¦åˆ™æŒ‡å®šä¸€ä¸ªLDAP/AD属性" #: templates/settings.php:101 msgid "Internal Username" -msgstr "" +msgstr "内部用户å" #: templates/settings.php:102 msgid "" @@ -358,15 +359,15 @@ msgid "" "achieve a similar behaviour as before ownCloud 5 enter the user display name" " attribute in the following field. Leave it empty for default behaviour. " "Changes will have effect only on newly mapped (added) LDAP users." -msgstr "" +msgstr "默认情况下内部用户å具有唯一识别属性æ¥ç¡®ä¿ç”¨æˆ·å的唯一性和属性ä¸ç”¨è½¬æ¢ã€‚å†…éƒ¨ç”¨æˆ·åæœ‰ä¸¥æ ¼çš„å—符é™åˆ¶ï¼Œåªå…许使用 [ a-zA-Z0-9_.@- ]。其他å—符会被ASCIIç å–ä»£æˆ–è€…è¢«æ´»åŠ›ã€‚å½“å†²çªæ—¶ä¼šå¢žåŠ æˆ–è€…å‡å°‘一个数å—。内部用户åè¢«ç”¨äºŽå†…éƒ¨è¯†åˆ«ç”¨æˆ·ï¼ŒåŒæ—¶ä¹Ÿä½œä¸ºownCloudä¸ç”¨æˆ·æ ¹æ–‡ä»¶å¤¹çš„默认å。也作为远程URLs的一部分,比如为了所有的*DAVæœåŠ¡ã€‚åœ¨è¿™ç§è®¾ç½®ä¸‹ï¼Œé»˜è®¤è¡Œä¸ºå¯ä»¥è¢«è¶…越。实现一个类似的行为,owncloud 5输入用户的显示å称属性在以下领域之å‰ã€‚让它空ç€çš„默认行为。更改åªå¯¹æ–°æ˜ 射的影å“ï¼ˆå¢žåŠ ï¼‰çš„LDAP用户。" #: templates/settings.php:103 msgid "Internal Username Attribute:" -msgstr "" +msgstr "内部用户å属性:" #: templates/settings.php:104 msgid "Override UUID detection" -msgstr "" +msgstr "è¶…è¶ŠUUID检测" #: templates/settings.php:105 msgid "" @@ -377,15 +378,15 @@ msgid "" "You must make sure that the attribute of your choice can be fetched for both" " users and groups and it is unique. Leave it empty for default behaviour. " "Changes will have effect only on newly mapped (added) LDAP users and groups." -msgstr "" +msgstr "默认ownCloud自动检测UUID属性。UUIDå±žæ€§ç”¨æ¥æ— 误的识别LDAPç”¨æˆ·å’Œç»„ã€‚åŒæ—¶å†…部用户å也基于UUID创建,如果没有上述的指定。也å¯ä»¥è¶…越设置直接指定一ç§å±žæ€§ã€‚但一定è¦ç¡®ä¿æŒ‡å®šçš„属性å–å¾—çš„ç”¨æˆ·å’Œç»„æ˜¯å”¯ä¸€çš„ã€‚é»˜è®¤è¡Œä¸ºç©ºã€‚å˜æ›´åŸºäºŽæ–°æ˜ å°„(å¢žåŠ )LDAP用户和组æ‰ä¼šç”Ÿæ•ˆã€‚" #: templates/settings.php:106 msgid "UUID Attribute:" -msgstr "" +msgstr "UUID属性:" #: templates/settings.php:107 msgid "Username-LDAP User Mapping" -msgstr "" +msgstr "用户å-LDAPç”¨æˆ·æ˜ å°„" #: templates/settings.php:108 msgid "" @@ -400,15 +401,15 @@ msgid "" "configuration sensitive, it affects all LDAP configurations! Do never clear " "the mappings in a production environment. Only clear mappings in a testing " "or experimental stage." -msgstr "" +msgstr "ownCloud使用用户åå˜å‚¨å’Œåˆ†é…æ•°æ®(å…ƒ)。为了准确地识别和确认用户,æ¯ä¸ªç”¨æˆ·éƒ½æœ‰ä¸€ä¸ªå†…部用户å。需è¦ä»ŽownCloudç”¨æˆ·åæ˜ 射到LDAPç”¨æˆ·ã€‚åˆ›å»ºçš„ç”¨æˆ·åæ˜ 射到LDAP用户的UUID。æ¤å¤–,DN是缓å˜ä»¥åŠå‡å°‘LDAP交互,但它ä¸ç”¨äºŽè¯†åˆ«ã€‚如果DNå˜åŒ–,ownCloud也会å˜åŒ–。内部ownCloudå在ownCloudçš„å„å¤„ä½¿ç”¨ã€‚æ¸…é™¤æ˜ å°„å°†ä¸€ç‰‡æ··ä¹±ã€‚æ¸…é™¤æ˜ å°„ä¸æ˜¯å¸¸ç”¨çš„é…置,它影å“到所有LDAPé…ç½®ï¼åƒä¸‡ä¸è¦åœ¨æ£å¼çŽ¯å¢ƒä¸æ¸…é™¤æ˜ å°„ã€‚åªæœ‰åœ¨æµ‹è¯•或试验阶段å¯ä»¥æ¸…é™¤æ˜ å°„ã€‚" #: templates/settings.php:109 msgid "Clear Username-LDAP User Mapping" -msgstr "" +msgstr "清除用户-LDAPç”¨æˆ·æ˜ å°„" #: templates/settings.php:109 msgid "Clear Groupname-LDAP Group Mapping" -msgstr "" +msgstr "清除组用户-LDAPçº§æ˜ å°„" #: templates/settings.php:111 msgid "Test Configuration" diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po index 6d26d04e9e9..9a48e296c7d 100644 --- a/l10n/zh_HK/core.po +++ b/l10n/zh_HK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -216,23 +216,23 @@ msgstr "" msgid "Choose" msgstr "" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "å–æ¶ˆ" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "Yes" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "No" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "OK" diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po index 4882032c290..fbcb711c830 100644 --- a/l10n/zh_HK/files.po +++ b/l10n/zh_HK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po index 0603079bbdc..d80adda59db 100644 --- a/l10n/zh_HK/files_external.po +++ b/l10n/zh_HK/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po index 8c5df9beeeb..969b9139a9f 100644 --- a/l10n/zh_HK/files_sharing.po +++ b/l10n/zh_HK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po index ec8b7060659..4c69b76dbc2 100644 --- a/l10n/zh_HK/files_trashbin.po +++ b/l10n/zh_HK/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po index 978232f9626..79cd2c8f7c2 100644 --- a/l10n/zh_HK/lib.po +++ b/l10n/zh_HK/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -17,27 +17,27 @@ msgstr "" "Language: zh_HK\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "幫助" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "個人" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "è¨å®š" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "用戶" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "軟件" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "管ç†" diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po index 24c284164eb..e4ae4f4a137 100644 --- a/l10n/zh_HK/settings.po +++ b/l10n/zh_HK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -136,16 +136,16 @@ msgstr "" msgid "Unable to remove user" msgstr "" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "群組" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "刪除" @@ -399,7 +399,7 @@ msgstr "" msgid "Show First Run Wizard again" msgstr "" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "密碼" @@ -423,7 +423,7 @@ msgstr "新密碼" msgid "Change password" msgstr "" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "" @@ -463,34 +463,40 @@ msgstr "" msgid "Create" msgstr "" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "" diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po index a11180a5c72..09f43f32931 100644 --- a/l10n/zh_HK/user_ldap.po +++ b/l10n/zh_HK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po index 6c39f15829e..9616e4ff8b3 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -217,23 +217,23 @@ msgstr "幾年å‰" msgid "Choose" msgstr "鏿“‡" -#: js/oc-dialogs.js:121 +#: js/oc-dialogs.js:122 msgid "Cancel" msgstr "å–æ¶ˆ" -#: js/oc-dialogs.js:138 js/oc-dialogs.js:195 +#: js/oc-dialogs.js:141 js/oc-dialogs.js:200 msgid "Error loading file picker template" msgstr "è¼‰å…¥æª”æ¡ˆé¸æ“‡å™¨æ¨£æ¿ç™¼ç”ŸéŒ¯èª¤" -#: js/oc-dialogs.js:161 +#: js/oc-dialogs.js:164 msgid "Yes" msgstr "是" -#: js/oc-dialogs.js:168 +#: js/oc-dialogs.js:172 msgid "No" msgstr "å¦" -#: js/oc-dialogs.js:181 +#: js/oc-dialogs.js:185 msgid "Ok" msgstr "好" diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po index 7246facccca..f1e5469c0fc 100644 --- a/l10n/zh_TW/files.po +++ b/l10n/zh_TW/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:27+0000\n" "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po index 548dc15892e..b9c8f7e626f 100644 --- a/l10n/zh_TW/files_external.po +++ b/l10n/zh_TW/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po index 6ccb0ed3b5f..5668ed5042f 100644 --- a/l10n/zh_TW/files_sharing.po +++ b/l10n/zh_TW/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po index 9e8439392f9..236dc0c1d69 100644 --- a/l10n/zh_TW/files_trashbin.po +++ b/l10n/zh_TW/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po index 56ad9f03baa..333354a13b9 100644 --- a/l10n/zh_TW/lib.po +++ b/l10n/zh_TW/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -18,27 +18,27 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:357 +#: app.php:358 msgid "Help" msgstr "說明" -#: app.php:370 +#: app.php:371 msgid "Personal" msgstr "個人" -#: app.php:381 +#: app.php:382 msgid "Settings" msgstr "è¨å®š" -#: app.php:393 +#: app.php:394 msgid "Users" msgstr "使用者" -#: app.php:406 +#: app.php:407 msgid "Apps" msgstr "應用程å¼" -#: app.php:414 +#: app.php:415 msgid "Admin" msgstr "管ç†" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index 31864b4f64a..ff41fb0869d 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/settings.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:59+0200\n" -"PO-Revision-Date: 2013-05-30 23:15+0000\n" -"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" +"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -137,16 +137,16 @@ msgstr "復原" msgid "Unable to remove user" msgstr "無法刪除用戶" -#: js/users.js:92 templates/users.php:26 templates/users.php:83 -#: templates/users.php:108 +#: js/users.js:92 templates/users.php:26 templates/users.php:87 +#: templates/users.php:112 msgid "Groups" msgstr "群組" -#: js/users.js:95 templates/users.php:85 templates/users.php:120 +#: js/users.js:95 templates/users.php:89 templates/users.php:124 msgid "Group Admin" msgstr "群組 管ç†å“¡" -#: js/users.js:115 templates/users.php:160 +#: js/users.js:115 templates/users.php:164 msgid "Delete" msgstr "刪除" @@ -400,7 +400,7 @@ msgstr "下載應用程å¼ä¾†åŒæ¥æ‚¨çš„æª”案" msgid "Show First Run Wizard again" msgstr "冿¬¡é¡¯ç¤ºé¦–次使用精éˆ" -#: templates/personal.php:37 templates/users.php:23 templates/users.php:82 +#: templates/personal.php:37 templates/users.php:23 templates/users.php:86 msgid "Password" msgstr "密碼" @@ -424,7 +424,7 @@ msgstr "新密碼" msgid "Change password" msgstr "變更密碼" -#: templates/personal.php:56 templates/users.php:81 +#: templates/personal.php:56 templates/users.php:85 msgid "Display Name" msgstr "顯示å稱" @@ -456,7 +456,7 @@ msgstr "WebDAV" msgid "Use this address to connect to your ownCloud in your file manager" msgstr "在您的檔案管ç†å“¡ä¸ä½¿ç”¨é€™å€‹åœ°å€ä¾†é€£ç·šåˆ° ownCloud" -#: templates/users.php:21 templates/users.php:80 +#: templates/users.php:21 templates/users.php:84 msgid "Login Name" msgstr "登入å稱" @@ -464,34 +464,40 @@ msgstr "登入å稱" msgid "Create" msgstr "建立" -#: templates/users.php:34 +#: templates/users.php:36 msgid "Admin Recovery Password" msgstr "管ç†è€…復原密碼" -#: templates/users.php:38 +#: templates/users.php:37 templates/users.php:38 +msgid "" +"Enter the recovery password in order to recover the users files during " +"password change" +msgstr "" + +#: templates/users.php:42 msgid "Default Storage" msgstr "é è¨å„²å˜å€" -#: templates/users.php:44 templates/users.php:138 +#: templates/users.php:48 templates/users.php:142 msgid "Unlimited" msgstr "ç„¡é™åˆ¶" -#: templates/users.php:62 templates/users.php:153 +#: templates/users.php:66 templates/users.php:157 msgid "Other" msgstr "å…¶ä»–" -#: templates/users.php:87 +#: templates/users.php:91 msgid "Storage" msgstr "儲å˜å€" -#: templates/users.php:98 +#: templates/users.php:102 msgid "change display name" msgstr "修改顯示å稱" -#: templates/users.php:102 +#: templates/users.php:106 msgid "set new password" msgstr "è¨å®šæ–°å¯†ç¢¼" -#: templates/users.php:133 +#: templates/users.php:137 msgid "Default" msgstr "é è¨" diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po index 4a3726f9aa8..2a32a7a3fd4 100644 --- a/l10n/zh_TW/user_ldap.po +++ b/l10n/zh_TW/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-05-31 01:58+0200\n" -"PO-Revision-Date: 2013-05-30 23:16+0000\n" +"POT-Creation-Date: 2013-06-12 02:56+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" diff --git a/lib/app.php b/lib/app.php index c6f6e92e60e..3e6cadfe2c9 100644 --- a/lib/app.php +++ b/lib/app.php @@ -174,7 +174,8 @@ class OC_App{ $apps=array('files'); $sql = 'SELECT `appid` FROM `*PREFIX*appconfig`' .' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\''; - if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { //FIXME oracle hack + if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { + //FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison $sql = 'SELECT `appid` FROM `*PREFIX*appconfig`' .' WHERE `configkey` = \'enabled\' AND to_char(`configvalue`)=\'yes\''; } diff --git a/lib/backgroundjob/job.php b/lib/backgroundjob/job.php new file mode 100644 index 00000000000..49fbffbd684 --- /dev/null +++ b/lib/backgroundjob/job.php @@ -0,0 +1,49 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\BackgroundJob; + +abstract class Job { + protected $id; + protected $lastRun; + protected $argument; + + /** + * @param JobList $jobList + */ + public function execute($jobList) { + $jobList->setLastRun($this); + $this->run($this->argument); + } + + abstract protected function run($argument); + + public function setId($id) { + $this->id = $id; + } + + public function setLastRun($lastRun) { + $this->lastRun = $lastRun; + } + + public function setArgument($argument) { + $this->argument = $argument; + } + + public function getId() { + return $this->id; + } + + public function getLastRun() { + return $this->lastRun; + } + + public function getArgument() { + return $this->argument; + } +} diff --git a/lib/backgroundjob/joblist.php b/lib/backgroundjob/joblist.php new file mode 100644 index 00000000000..cc803dd9b5f --- /dev/null +++ b/lib/backgroundjob/joblist.php @@ -0,0 +1,172 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\BackgroundJob; + +/** + * Class QueuedJob + * + * create a background job that is to be executed once + * + * @package OC\BackgroundJob + */ +class JobList { + /** + * @param Job|string $job + * @param mixed $argument + */ + public function add($job, $argument = null) { + if (!$this->has($job, $argument)) { + if ($job instanceof Job) { + $class = get_class($job); + } else { + $class = $job; + } + $argument = json_encode($argument); + $query = \OC_DB::prepare('INSERT INTO `*PREFIX*jobs`(`class`, `argument`, `last_run`) VALUES(?, ?, 0)'); + $query->execute(array($class, $argument)); + } + } + + /** + * @param Job|string $job + * @param mixed $argument + */ + public function remove($job, $argument = null) { + if ($job instanceof Job) { + $class = get_class($job); + } else { + $class = $job; + } + if (!is_null($argument)) { + $argument = json_encode($argument); + $query = \OC_DB::prepare('DELETE FROM `*PREFIX*jobs` WHERE `class` = ? AND `argument` = ?'); + $query->execute(array($class, $argument)); + } else { + $query = \OC_DB::prepare('DELETE FROM `*PREFIX*jobs` WHERE `class` = ?'); + $query->execute(array($class)); + } + } + + /** + * check if a job is in the list + * + * @param $job + * @param mixed $argument + * @return bool + */ + public function has($job, $argument) { + if ($job instanceof Job) { + $class = get_class($job); + } else { + $class = $job; + } + $argument = json_encode($argument); + $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*jobs` WHERE `class` = ? AND `argument` = ?'); + $result = $query->execute(array($class, $argument)); + return (bool)$result->fetchRow(); + } + + /** + * get all jobs in the list + * + * @return Job[] + */ + public function getAll() { + $query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs`'); + $result = $query->execute(); + $jobs = array(); + while ($row = $result->fetchRow()) { + $jobs[] = $this->buildJob($row); + } + return $jobs; + } + + /** + * get the next job in the list + * + * @return Job + */ + public function getNext() { + $lastId = $this->getLastJob(); + $query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` WHERE `id` > ? ORDER BY `id` ASC', 1); + $result = $query->execute(array($lastId)); + if ($row = $result->fetchRow()) { + return $this->buildJob($row); + } else { + //begin at the start of the queue + $query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` ORDER BY `id` ASC', 1); + $result = $query->execute(); + if ($row = $result->fetchRow()) { + return $this->buildJob($row); + } else { + return null; //empty job list + } + } + } + + /** + * @param int $id + * @return Job + */ + public function getById($id) { + $query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` WHERE `id` = ?'); + $result = $query->execute(array($id)); + if ($row = $result->fetchRow()) { + return $this->buildJob($row); + } else { + return null; + } + } + + /** + * get the job object from a row in the db + * + * @param array $row + * @return Job + */ + private function buildJob($row) { + $class = $row['class']; + /** + * @var Job $job + */ + $job = new $class(); + $job->setId($row['id']); + $job->setLastRun($row['last_run']); + $job->setArgument(json_decode($row['argument'])); + return $job; + } + + /** + * set the job that was last ran + * + * @param Job $job + */ + public function setLastJob($job) { + \OC_Appconfig::setValue('backgroundjob', 'lastjob', $job->getId()); + } + + /** + * get the id of the last ran job + * + * @return int + */ + public function getLastJob() { + return \OC_Appconfig::getValue('backgroundjob', 'lastjob', 0); + } + + /** + * set the lastRun of $job to now + * + * @param Job $job + */ + public function setLastRun($job) { + $query = \OC_DB::prepare('UPDATE `*PREFIX*jobs` SET `last_run` = ? WHERE `id` = ?'); + $query->execute(array(time(), $job->getId())); + } +} diff --git a/lib/backgroundjob/legacy/queuedjob.php b/lib/backgroundjob/legacy/queuedjob.php new file mode 100644 index 00000000000..2bc001103b8 --- /dev/null +++ b/lib/backgroundjob/legacy/queuedjob.php @@ -0,0 +1,18 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\BackgroundJob\Legacy; + +class QueuedJob extends \OC\BackgroundJob\QueuedJob { + public function run($argument) { + $class = $argument['klass']; + $method = $argument['method']; + $parameters = $argument['parameters']; + call_user_func(array($class, $method), $parameters); + } +} diff --git a/lib/backgroundjob/legacy/regularjob.php b/lib/backgroundjob/legacy/regularjob.php new file mode 100644 index 00000000000..d4cfa348cea --- /dev/null +++ b/lib/backgroundjob/legacy/regularjob.php @@ -0,0 +1,15 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\BackgroundJob\Legacy; + +class RegularJob extends \OC\BackgroundJob\Job { + public function run($argument) { + call_user_func($argument); + } +} diff --git a/lib/backgroundjob/queuedjob.php b/lib/backgroundjob/queuedjob.php new file mode 100644 index 00000000000..1714182820d --- /dev/null +++ b/lib/backgroundjob/queuedjob.php @@ -0,0 +1,28 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\BackgroundJob; + +/** + * Class QueuedJob + * + * create a background job that is to be executed once + * + * @package OC\BackgroundJob + */ +abstract class QueuedJob extends Job { + /** + * run the job, then remove it from the joblist + * + * @param JobList $jobList + */ + public function execute($jobList) { + $jobList->remove($this); + $this->run($this->argument); + } +} diff --git a/lib/backgroundjob/queuedtask.php b/lib/backgroundjob/queuedtask.php deleted file mode 100644 index b2ce6f39ed8..00000000000 --- a/lib/backgroundjob/queuedtask.php +++ /dev/null @@ -1,105 +0,0 @@ -<?php -/** -* ownCloud -* -* @author Jakob Sack -* @copyright 2012 Jakob Sack owncloud@jakobsack.de -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - -/** - * This class manages our queued tasks. - */ -class OC_BackgroundJob_QueuedTask{ - /** - * @brief Gets one queued task - * @param $id ID of the task - * @return associative array - */ - public static function find( $id ) { - $stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks` WHERE `id` = ?' ); - $result = $stmt->execute(array($id)); - return $result->fetchRow(); - } - - /** - * @brief Gets all queued tasks - * @return array with associative arrays - */ - public static function all() { - // Array for objects - $return = array(); - - // Get Data - $stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks`' ); - $result = $stmt->execute(array()); - while( $row = $result->fetchRow()) { - $return[] = $row; - } - - return $return; - } - - /** - * @brief Gets all queued tasks of a specific app - * @param $app app name - * @return array with associative arrays - */ - public static function whereAppIs( $app ) { - // Array for objects - $return = array(); - - // Get Data - $stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks` WHERE `app` = ?' ); - $result = $stmt->execute(array($app)); - while( $row = $result->fetchRow()) { - $return[] = $row; - } - - // Und weg damit - return $return; - } - - /** - * @brief queues a task - * @param $app app name - * @param $klass class name - * @param $method method name - * @param $parameters all useful data as text - * @return id of task - */ - public static function add( $app, $klass, $method, $parameters ) { - $stmt = OC_DB::prepare( 'INSERT INTO `*PREFIX*queuedtasks` (`app`, `klass`, `method`, `parameters`)' - .' VALUES(?,?,?,?)' ); - $result = $stmt->execute(array($app, $klass, $method, $parameters )); - - return OC_DB::insertid(); - } - - /** - * @brief deletes a queued task - * @param $id id of task - * @return true/false - * - * Deletes a report - */ - public static function delete( $id ) { - $stmt = OC_DB::prepare( 'DELETE FROM `*PREFIX*queuedtasks` WHERE `id` = ?' ); - $result = $stmt->execute(array($id)); - - return true; - } -} diff --git a/lib/backgroundjob/regulartask.php b/lib/backgroundjob/regulartask.php deleted file mode 100644 index 9976872ee13..00000000000 --- a/lib/backgroundjob/regulartask.php +++ /dev/null @@ -1,52 +0,0 @@ -<?php -/** -* ownCloud -* -* @author Jakob Sack -* @copyright 2012 Jakob Sack owncloud@jakobsack.de -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - -/** - * This class manages the regular tasks. - */ -class OC_BackgroundJob_RegularTask{ - static private $registered = array(); - - /** - * @brief creates a regular task - * @param $klass class name - * @param $method method name - * @return true - */ - static public function register( $klass, $method ) { - // Create the data structure - self::$registered["$klass-$method"] = array( $klass, $method ); - - // No chance for failure ;-) - return true; - } - - /** - * @brief gets all regular tasks - * @return associative array - * - * key is string "$klass-$method", value is array( $klass, $method ) - */ - static public function all() { - return self::$registered; - } -} diff --git a/lib/backgroundjob/timedjob.php b/lib/backgroundjob/timedjob.php new file mode 100644 index 00000000000..ae9f33505ab --- /dev/null +++ b/lib/backgroundjob/timedjob.php @@ -0,0 +1,41 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\BackgroundJob; + +/** + * Class QueuedJob + * + * create a background job that is to be executed at an interval + * + * @package OC\BackgroundJob + */ +abstract class TimedJob extends Job { + protected $interval = 0; + + /** + * set the interval for the job + * + * @param int $interval + */ + public function setInterval($interval) { + $this->interval = $interval; + } + + /** + * run the job if + * + * @param JobList $jobList + */ + public function execute($jobList) { + if ((time() - $this->lastRun) > $this->interval) { + $jobList->setLastRun($this); + $this->run($this->argument); + } + } +} diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php deleted file mode 100644 index e966ac9647c..00000000000 --- a/lib/backgroundjob/worker.php +++ /dev/null @@ -1,118 +0,0 @@ -<?php -/** -* ownCloud -* -* @author Jakob Sack -* @copyright 2012 Jakob Sack owncloud@jakobsack.de -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - -/** - * This class does the dirty work. - * - * TODO: locking in doAllSteps - */ -class OC_BackgroundJob_Worker{ - /** - * @brief executes all tasks - * @return boolean - * - * This method executes all regular tasks and then all queued tasks. - * This method should be called by cli scripts that do not let the user - * wait. - */ - public static function doAllSteps() { - // Do our regular work - $lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' ); - - $regular_tasks = OC_BackgroundJob_RegularTask::all(); - ksort( $regular_tasks ); - foreach( $regular_tasks as $key => $value ) { - if( strcmp( $key, $lasttask ) > 0 ) { - // Set "restart here" config value - OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key ); - call_user_func( $value ); - } - } - // Reset "start here" config value - OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' ); - - // Do our queued tasks - $queued_tasks = OC_BackgroundJob_QueuedTask::all(); - foreach( $queued_tasks as $task ) { - OC_BackgroundJob_QueuedTask::delete( $task['id'] ); - call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] ); - } - - return true; - } - - /** - * @brief does a single task - * @return boolean - * - * This method executes one task. It saves the last state and continues - * with the next step. This method should be used by webcron and ajax - * services. - */ - public static function doNextStep() { - $laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' ); - - if( $laststep == 'regular_tasks' ) { - // get last app - $lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' ); - - // What's the next step? - $regular_tasks = OC_BackgroundJob_RegularTask::all(); - ksort( $regular_tasks ); - $done = false; - - // search for next background job - foreach( $regular_tasks as $key => $value ) { - if( strcmp( $key, $lasttask ) > 0 ) { - OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key ); - $done = true; - call_user_func( $value ); - break; - } - } - - if( $done == false ) { - // Next time load queued tasks - OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'queued_tasks' ); - } - } - else{ - $tasks = OC_BackgroundJob_QueuedTask::all(); - if( count( $tasks )) { - $task = $tasks[0]; - // delete job before we execute it. This prevents endless loops - // of failing jobs. - OC_BackgroundJob_QueuedTask::delete($task['id']); - - // execute job - call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] ); - } - else{ - // Next time load queued tasks - OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' ); - OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' ); - } - } - - return true; - } -} diff --git a/lib/base.php b/lib/base.php index 9d1d4b5e058..a6e4a47dbf5 100644 --- a/lib/base.php +++ b/lib/base.php @@ -265,6 +265,7 @@ class OC { OC_Util::addScript("jquery.infieldlabel"); OC_Util::addScript("jquery-tipsy"); OC_Util::addScript("compatibility"); + OC_Util::addScript("jquery.ocdialog"); OC_Util::addScript("oc-dialogs"); OC_Util::addScript("octemplate"); OC_Util::addScript("js"); @@ -278,6 +279,7 @@ class OC { OC_Util::addStyle("multiselect"); OC_Util::addStyle("jquery-ui-1.10.0.custom"); OC_Util::addStyle("jquery-tipsy"); + OC_Util::addStyle("jquery.ocdialog"); OC_Util::addScript("oc-requesttoken"); } @@ -441,14 +443,14 @@ class OC { stream_wrapper_register('oc', 'OC\Files\Stream\OC'); self::initTemplateEngine(); - self::checkConfig(); - self::checkInstalled(); - self::checkSSL(); if ( !self::$CLI ) { self::initSession(); } else { self::$session = new \OC\Session\Memory(''); } + self::checkConfig(); + self::checkInstalled(); + self::checkSSL(); $errors = OC_Util::checkServer(); if (count($errors) > 0) { @@ -537,9 +539,15 @@ class OC { * register hooks for the cache */ public static function registerCacheHooks() { - // register cache cleanup jobs - OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc'); - OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener'); + if (OC_Config::getValue('installed', false)) { //don't try to do this before we are properly setup + // register cache cleanup jobs + try { //if this is executed before the upgrade to the new backgroundjob system is completed it will throw an exception + \OCP\BackgroundJob::registerJob('OC_Cache_FileGlobalGC'); + } catch (Exception $e) { + + } + OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener'); + } } /** diff --git a/lib/cache/file.php b/lib/cache/file.php index f9ecf41dcac..531e1d50f40 100644 --- a/lib/cache/file.php +++ b/lib/cache/file.php @@ -14,6 +14,7 @@ class OC_Cache_File{ return $this->storage; } if(OC_User::isLoggedIn()) { + \OC\Files\Filesystem::initMountPoints(OC_User::getUser()); $subdir = 'cache'; $view = new \OC\Files\View('/'.OC_User::getUser()); if(!$view->file_exists($subdir)) { diff --git a/lib/cache/fileglobalgc.php b/lib/cache/fileglobalgc.php new file mode 100644 index 00000000000..a29c31f9063 --- /dev/null +++ b/lib/cache/fileglobalgc.php @@ -0,0 +1,8 @@ +<?php + + +class OC_Cache_FileGlobalGC extends \OC\BackgroundJob\Job{ + public function run($argument){ + OC_Cache_FileGlobal::gc(); + } +} diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php index e58e584fb41..745523c7a5b 100644 --- a/lib/connector/sabre/locks.php +++ b/lib/connector/sabre/locks.php @@ -45,7 +45,12 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract { // but otherwise reading locks from SQLite Databases will return // nothing $query = 'SELECT * FROM `*PREFIX*locks`' - .' WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( `uri` = ?)'; + .' WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( `uri` = ?)'; + if (OC_Config::getValue( "dbtype") === 'oci') { + //FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison + $query = 'SELECT * FROM `*PREFIX*locks`' + .' WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( to_char(`uri`) = ?)'; + } $params = array(OC_User::getUser(), $uri); // We need to check locks for every part in the uri. @@ -60,15 +65,24 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract { if ($currentPath) $currentPath.='/'; $currentPath.=$part; - - $query.=' OR (`depth` != 0 AND `uri` = ?)'; + //FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison + if (OC_Config::getValue( "dbtype") === 'oci') { + $query.=' OR (`depth` != 0 AND to_char(`uri`) = ?)'; + } else { + $query.=' OR (`depth` != 0 AND `uri` = ?)'; + } $params[] = $currentPath; } if ($returnChildLocks) { - $query.=' OR (`uri` LIKE ?)'; + //FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison + if (OC_Config::getValue( "dbtype") === 'oci') { + $query.=' OR (to_char(`uri`) LIKE ?)'; + } else { + $query.=' OR (`uri` LIKE ?)'; + } $params[] = $uri . '/%'; } diff --git a/lib/db.php b/lib/db.php index 61836551833..080e895e352 100644 --- a/lib/db.php +++ b/lib/db.php @@ -23,7 +23,8 @@ class DatabaseException extends Exception{ private $query; - public function __construct($message, $query){ + //FIXME getQuery seems to be unused, maybe use parent constructor with $message, $code and $previous + public function __construct($message, $query = null){ parent::__construct($message); $this->query = $query; } @@ -392,9 +393,59 @@ class OC_DB { } /** + * @brief execute a prepared statement, on error write log and throw exception + * @param mixed $stmt PDOStatementWrapper | MDB2_Statement_Common , + * an array with 'sql' and optionally 'limit' and 'offset' keys + * .. or a simple sql query string + * @param array $parameters + * @return result + * @throws DatabaseException + */ + static public function executeAudited( $stmt, array $parameters = null) { + if (is_string($stmt)) { + // convert to an array with 'sql' + if (stripos($stmt,'LIMIT') !== false) { //OFFSET requires LIMIT, se we only neet to check for LIMIT + // TODO try to convert LIMIT OFFSET notation to parameters, see fixLimitClauseForMSSQL + $message = 'LIMIT and OFFSET are forbidden for portability reasons,' + . ' pass an array with \'limit\' and \'offset\' instead'; + throw new DatabaseException($message); + } + $stmt = array('sql' => $stmt, 'limit' => null, 'offset' => null); + } + if (is_array($stmt)){ + // convert to prepared statement + if ( ! array_key_exists('sql', $stmt) ) { + $message = 'statement array must at least contain key \'sql\''; + throw new DatabaseException($message); + } + if ( ! array_key_exists('limit', $stmt) ) { + $stmt['limit'] = null; + } + if ( ! array_key_exists('limit', $stmt) ) { + $stmt['offset'] = null; + } + $stmt = self::prepare($stmt['sql'], $stmt['limit'], $stmt['offset']); + } + self::raiseExceptionOnError($stmt, 'Could not prepare statement'); + if ($stmt instanceof PDOStatementWrapper || $stmt instanceof MDB2_Statement_Common) { + $result = $stmt->execute($parameters); + self::raiseExceptionOnError($result, 'Could not execute statement'); + } else { + if (is_object($stmt)) { + $message = 'Expected a prepared statement or array got ' . get_class($stmt); + } else { + $message = 'Expected a prepared statement or array got ' . gettype($stmt); + } + throw new DatabaseException($message); + } + return $result; + } + + /** * @brief gets last value of autoincrement * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix * @return int id + * @throws DatabaseException * * MDB2 lastInsertID() * @@ -404,25 +455,27 @@ class OC_DB { public static function insertid($table=null) { self::connect(); $type = OC_Config::getValue( "dbtype", "sqlite" ); - if( $type == 'pgsql' ) { - $query = self::prepare('SELECT lastval() AS id'); - $row = $query->execute()->fetchRow(); + if( $type === 'pgsql' ) { + $result = self::executeAudited('SELECT lastval() AS id'); + $row = $result->fetchRow(); + self::raiseExceptionOnError($row, 'fetching row for insertid failed'); return $row['id']; - } - if( $type == 'mssql' ) { + } else if( $type === 'mssql') { if($table !== null) { $prefix = OC_Config::getValue( "dbtableprefix", "oc_" ); $table = str_replace( '*PREFIX*', $prefix, $table ); } - return self::$connection->lastInsertId($table); - }else{ + $result = self::$connection->lastInsertId($table); + } else { if($table !== null) { $prefix = OC_Config::getValue( "dbtableprefix", "oc_" ); $suffix = OC_Config::getValue( "dbsequencesuffix", "_id_seq" ); $table = str_replace( '*PREFIX*', $prefix, $table ).$suffix; } - return self::$connection->lastInsertId($table); + $result = self::$connection->lastInsertId($table); } + self::raiseExceptionOnError($result, 'insertid failed'); + return $result; } /** @@ -512,6 +565,8 @@ class OC_DB { //clean up memory unlink( $file2 ); + + self::raiseExceptionOnError($definition,'Failed to parse the database definition'); // Die in case something went wrong if( $definition instanceof MDB2_Schema_Error ) { @@ -528,11 +583,7 @@ class OC_DB { $ret=self::$schema->createDatabase( $definition ); - // Die in case something went wrong - if( $ret instanceof MDB2_Error ) { - OC_Template::printErrorPage( self::$MDB2->getDebugOutput().' '.$ret->getMessage() . ': ' - . $ret->getUserInfo() ); - } + self::raiseExceptionOnError($ret,'Failed to create the database structure'); return true; } @@ -552,13 +603,7 @@ class OC_DB { $content = file_get_contents( $file ); $previousSchema = self::$schema->getDefinitionFromDatabase(); - if (PEAR::isError($previousSchema)) { - $error = $previousSchema->getMessage(); - $detail = $previousSchema->getDebugInfo(); - $message = 'Failed to get existing database structure for updating ('.$error.', '.$detail.')'; - OC_Log::write('core', $message, OC_Log::FATAL); - throw new Exception($message); - } + self::raiseExceptionOnError($previousSchema,'Failed to get existing database structure for updating'); // Make changes and save them to an in-memory file $file2 = 'static://db_scheme'; @@ -582,13 +627,7 @@ class OC_DB { //clean up memory unlink( $file2 ); - if (PEAR::isError($op)) { - $error = $op->getMessage(); - $detail = $op->getDebugInfo(); - $message = 'Failed to update database structure ('.$error.', '.$detail.')'; - OC_Log::write('core', $message, OC_Log::FATAL); - throw new Exception($message); - } + self::raiseExceptionOnError($op,'Failed to update database structure'); return true; } @@ -641,15 +680,9 @@ class OC_DB { } $query = substr($query, 0, strlen($query) - 5); try { - $stmt = self::prepare($query); - $result = $stmt->execute($inserts); - - } catch(PDOException $e) { - $entry = 'DB Error: "'.$e->getMessage() . '"<br />'; - $entry .= 'Offending command was: ' . $query . '<br />'; - OC_Log::write('core', $entry, OC_Log::FATAL); - error_log('DB error: '.$entry); - OC_Template::printErrorPage( $entry ); + $result = self::executeAudited($query, $inserts); + } catch(DatabaseException $e) { + OC_Template::printExceptionErrorPage( $e ); } if((int)$result->numRows() === 0) { @@ -674,16 +707,12 @@ class OC_DB { } try { - $result = self::prepare($query); + $result = self::executeAudited($query, $inserts); } catch(PDOException $e) { - $entry = 'DB Error: "'.$e->getMessage() . '"<br />'; - $entry .= 'Offending command was: ' . $query.'<br />'; - OC_Log::write('core', $entry, OC_Log::FATAL); - error_log('DB error: ' . $entry); - OC_Template::printErrorPage( $entry ); + OC_Template::printExceptionErrorPage( $e ); } - return $result->execute($inserts); + return $result; } /** @@ -891,7 +920,32 @@ class OC_DB { return false; } } + /** + * check if a result is an error, writes a log entry and throws an exception, works with MDB2 and PDOException + * @param mixed $result + * @param string message + * @return void + * @throws DatabaseException + */ + public static function raiseExceptionOnError($result, $message = null) { + if(self::isError($result)) { + if ($message === null) { + $message = self::getErrorMessage($result); + } else { + $message .= ', Root cause:' . self::getErrorMessage($result); + } + throw new DatabaseException($message, getErrorCode($result)); + } + } + public static function getErrorCode($error) { + if ( self::$backend==self::BACKEND_MDB2 and PEAR::isError($error) ) { + $code = $error->getCode(); + } elseif ( self::$backend==self::BACKEND_PDO and self::$PDO ) { + $code = self::$PDO->errorCode(); + } + return $code; + } /** * returns the error code and message as a string for logging * works with MDB2 and PDOException @@ -901,9 +955,7 @@ class OC_DB { public static function getErrorMessage($error) { if ( self::$backend==self::BACKEND_MDB2 and PEAR::isError($error) ) { $msg = $error->getCode() . ': ' . $error->getMessage(); - if (defined('DEBUG') && DEBUG) { - $msg .= '(' . $error->getDebugInfo() . ')'; - } + $msg .= ' (' . $error->getDebugInfo() . ')'; } elseif (self::$backend==self::BACKEND_PDO and self::$PDO) { $msg = self::$PDO->errorCode() . ': '; $errorInfo = self::$PDO->errorInfo(); diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php index 8933101577d..8e68f41cf44 100644 --- a/lib/files/cache/backgroundwatcher.php +++ b/lib/files/cache/backgroundwatcher.php @@ -59,9 +59,9 @@ class BackgroundWatcher { */ static private function getNextFileId($previous, $folder) { if ($folder) { - $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` > ? AND mimetype = ' . self::getFolderMimetype() . ' ORDER BY `fileid` ASC', 1); + $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` > ? AND `mimetype` = ' . self::getFolderMimetype() . ' ORDER BY `fileid` ASC', 1); } else { - $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` > ? AND mimetype != ' . self::getFolderMimetype() . ' ORDER BY `fileid` ASC', 1); + $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` > ? AND `mimetype` != ' . self::getFolderMimetype() . ' ORDER BY `fileid` ASC', 1); } $result = $query->execute(array($previous)); if ($row = $result->fetchRow()) { diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index 0210d5a73f1..5b2fcfaadf9 100644 --- a/lib/files/cache/cache.php +++ b/lib/files/cache/cache.php @@ -96,10 +96,13 @@ class Cache { * get the stored metadata of a file or folder * * @param string/int $file - * @return array + * @return array | false */ public function get($file) { if (is_string($file) or $file == '') { + // normalize file + $file = $this->normalize($file); + $where = 'WHERE `storage` = ? AND `path_hash` = ?'; $params = array($this->getNumericStorageId(), md5($file)); } else { //file id @@ -112,6 +115,12 @@ class Cache { $result = $query->execute($params); $data = $result->fetchRow(); + //FIXME hide this HACK in the next database layer, or just use doctrine and get rid of MDB2 and PDO + //PDO returns false, MDB2 returns null, oracle always uses MDB2, so convert null to false + if ($data === null) { + $data = false; + } + //merge partial data if (!$data and is_string($file)) { if (isset($this->partial[$file])) { @@ -179,6 +188,9 @@ class Cache { $this->update($id, $data); return $id; } else { + // normalize file + $file = $this->normalize($file); + if (isset($this->partial[$file])) { //add any saved partial data $data = array_merge($this->partial[$file], $data); unset($this->partial[$file]); @@ -220,11 +232,22 @@ class Cache { * @param array $data */ public function update($id, array $data) { + + if(isset($data['path'])) { + // normalize path + $data['path'] = $this->normalize($data['path']); + } + + if(isset($data['name'])) { + // normalize path + $data['name'] = $this->normalize($data['name']); + } + list($queryParts, $params) = $this->buildParts($data); $params[] = $id; $query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET ' . implode(' = ?, ', $queryParts) . '=?' - . ' WHERE fileid = ?'); + . ' WHERE `fileid` = ?'); $query->execute($params); } @@ -267,6 +290,9 @@ class Cache { * @return int */ public function getId($file) { + // normalize file + $file = $this->normalize($file); + $pathHash = md5($file); $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?'); @@ -334,6 +360,10 @@ class Cache { * @param string $target */ public function move($source, $target) { + // normalize source and target + $source = $this->normalize($source); + $target = $this->normalize($target); + $sourceData = $this->get($source); $sourceId = $sourceData['fileid']; $newParentId = $this->getParentId($target); @@ -361,10 +391,10 @@ class Cache { * remove all entries for files that are stored on the storage from the cache */ public function clear() { - $query = \OC_DB::prepare('DELETE FROM `*PREFIX*filecache` WHERE storage = ?'); + $query = \OC_DB::prepare('DELETE FROM `*PREFIX*filecache` WHERE `storage` = ?'); $query->execute(array($this->getNumericStorageId())); - $query = \OC_DB::prepare('DELETE FROM `*PREFIX*storages` WHERE id = ?'); + $query = \OC_DB::prepare('DELETE FROM `*PREFIX*storages` WHERE `id` = ?'); $query->execute(array($this->storageId)); } @@ -374,6 +404,9 @@ class Cache { * @return int, Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE */ public function getStatus($file) { + // normalize file + $file = $this->normalize($file); + $pathHash = md5($file); $query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?'); $result = $query->execute(array($this->getNumericStorageId(), $pathHash)); @@ -402,6 +435,10 @@ class Cache { * @return array of file data */ public function search($pattern) { + + // normalize pattern + $pattern = $this->normalize($pattern); + $query = \OC_DB::prepare(' SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag` FROM `*PREFIX*filecache` WHERE `name` LIKE ? AND `storage` = ?' @@ -551,4 +588,14 @@ class Cache { return null; } } + + /** + * normalize the given path + * @param $path + * @return string + */ + public function normalize($path) { + + return \OC_Util::normalizeUnicode($path); + } } diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php index b8e2548639b..ab8ae6dfadd 100644 --- a/lib/files/cache/legacy.php +++ b/lib/files/cache/legacy.php @@ -45,7 +45,7 @@ class Legacy { return $this->cacheHasItems; } try { - $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*fscache` WHERE `user` = ? LIMIT 1'); + $query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*fscache` WHERE `user` = ?',1); } catch (\Exception $e) { $this->cacheHasItems = false; return false; diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index b10625e20de..d3fddf8c421 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -152,6 +152,9 @@ class Filesystem { * @return string */ static public function getMountPoint($path) { + if (!self::$mounts) { + \OC_Util::setupFS(); + } $mount = self::$mounts->find($path); if ($mount) { return $mount->getMountPoint(); @@ -167,6 +170,9 @@ class Filesystem { * @return string[] */ static public function getMountPoints($path) { + if (!self::$mounts) { + \OC_Util::setupFS(); + } $result = array(); $mounts = self::$mounts->findIn($path); foreach ($mounts as $mount) { @@ -182,6 +188,9 @@ class Filesystem { * @return \OC\Files\Storage\Storage */ public static function getStorage($mountPoint) { + if (!self::$mounts) { + \OC_Util::setupFS(); + } $mount = self::$mounts->find($mountPoint); return $mount->getStorage(); } @@ -191,6 +200,9 @@ class Filesystem { * @return Mount\Mount[] */ public static function getMountByStorageId($id) { + if (!self::$mounts) { + \OC_Util::setupFS(); + } return self::$mounts->findByStorageId($id); } @@ -199,6 +211,9 @@ class Filesystem { * @return Mount\Mount[] */ public static function getMountByNumericId($id) { + if (!self::$mounts) { + \OC_Util::setupFS(); + } return self::$mounts->findByNumericId($id); } @@ -209,6 +224,9 @@ class Filesystem { * @return array consisting of the storage and the internal path */ static public function resolvePath($path) { + if (!self::$mounts) { + \OC_Util::setupFS(); + } $mount = self::$mounts->find($path); if ($mount) { return array($mount->getStorage(), $mount->getInternalPath($path)); @@ -223,7 +241,7 @@ class Filesystem { } self::$defaultInstance = new View($root); - if(!self::$mounts) { + if (!self::$mounts) { self::$mounts = new Mount\Manager(); } @@ -235,8 +253,8 @@ class Filesystem { return true; } - static public function initMounts(){ - if(!self::$mounts) { + static public function initMounts() { + if (!self::$mounts) { self::$mounts = new Mount\Manager(); } } @@ -359,7 +377,9 @@ class Filesystem { * clear all mounts and storage backends */ public static function clearMounts() { - self::$mounts->clear(); + if (self::$mounts) { + self::$mounts->clear(); + } } /** @@ -370,6 +390,9 @@ class Filesystem { * @param string $mountpoint */ static public function mount($class, $arguments, $mountpoint) { + if (!self::$mounts) { + \OC_Util::setupFS(); + } $mount = new Mount\Mount($class, $mountpoint, $arguments); self::$mounts->addMount($mount); } @@ -631,9 +654,8 @@ class Filesystem { $path = substr($path, 0, -1); } //normalize unicode if possible - if (class_exists('Normalizer')) { - $path = \Normalizer::normalize($path); - } + $path = \OC_Util::normalizeUnicode($path); + return $path; } diff --git a/lib/files/view.php b/lib/files/view.php index ecb0f30400a..e2fc8d965b8 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -300,7 +300,7 @@ class View { list ($count, $result) = \OC_Helper::streamCopy($data, $target); fclose($target); fclose($data); - if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) { + if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path) && $result !== false) { if (!$exists) { \OC_Hook::emit( Filesystem::CLASSNAME, @@ -386,11 +386,13 @@ class View { $source = $this->fopen($path1 . $postFix1, 'r'); $target = $this->fopen($path2 . $postFix2, 'w'); list($count, $result) = \OC_Helper::streamCopy($source, $target); - list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1); - $storage1->unlink($internalPath1); + if ($result !== false) { + list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1); + $storage1->unlink($internalPath1); + } } } - if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1)) { + if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1) && $result !== false) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_rename, @@ -484,7 +486,7 @@ class View { list($count, $result) = \OC_Helper::streamCopy($source, $target); } } - if ($this->fakeRoot == Filesystem::getRoot()) { + if ($this->fakeRoot == Filesystem::getRoot() && $result !== false) { \OC_Hook::emit( Filesystem::CLASSNAME, Filesystem::signal_post_copy, @@ -648,7 +650,7 @@ class View { $result = $storage->$operation($internalPath); } $result = \OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result); - if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot()) { + if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && $result !== false) { if ($operation != 'fopen') { //no post hooks for fopen, the file stream is still open $this->runHooks($hooks, $path, true); } diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php index 2de4c0a6e68..8412ac9548f 100644 --- a/lib/l10n/bg_BG.php +++ b/lib/l10n/bg_BG.php @@ -21,16 +21,21 @@ "%s enter the database username." => "%s въведете потребителÑко име за базата Ñ Ð´Ð°Ð½Ð½Ð¸.", "%s enter the database name." => "%s въведете име на базата Ñ Ð´Ð°Ð½Ð½Ð¸.", "%s you may not use dots in the database name" => "%s, не можете да ползвате точки в името на базата от данни", +"%s set the database host." => "%s задай хоÑÑ‚ на базата данни.", "PostgreSQL username and/or password not valid" => "Ðевалидно PostgreSQL потребителÑко име и/или парола", "You need to enter either an existing account or the administrator." => "Ðеобходимо е да влезете в вÑъщеÑтвуващ акаунт или като админиÑтратора", +"Oracle connection could not be established" => "Oracle връзка не можа да Ñе оÑъщеÑтви", "MySQL username and/or password not valid" => "Ðевалидно MySQL потребителÑко име и/или парола", "DB Error: \"%s\"" => "Грешка в базата от данни: \"%s\"", +"Offending command was: \"%s\"" => "Проблемната команда беше: \"%s\"", "MySQL user '%s'@'localhost' exists already." => "MySQL потребителÑÑ‚ '%s'@'localhost' вече ÑъщеÑтвува", "Drop this user from MySQL" => "Изтриване на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð¾Ñ‚ MySQL", "MySQL user '%s'@'%%' already exists" => "MySQL потребителÑÑ‚ '%s'@'%%' вече ÑъщеÑтвува.", "Drop this user from MySQL." => "Изтриване на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð¾Ñ‚ MySQL.", "Oracle username and/or password not valid" => "Ðевалидно Oracle потребителÑко име и/или парола", +"Offending command was: \"%s\", name: %s, password: %s" => "Проблемната команда беше: \"%s\", име: %s, парола: %s", "MS SQL username and/or password not valid: %s" => "Ðевалидно MS SQL потребителÑко име и/или парола: %s", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "ВашиÑÑ‚ web Ñървър вÑе още не е удачно наÑтроен да позволÑва ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° файлове, защото WebDAV интерфейÑÑŠÑ‚ изглежда не работи.", "Please double check the <a href='%s'>installation guides</a>." => "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ повторна Ñправка Ñ <a href='%s'>ръководÑтвото за инÑталиране</a>.", "seconds ago" => "преди Ñекунди", "1 minute ago" => "преди 1 минута", diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php index 36469507d40..b74b9a7184c 100644 --- a/lib/l10n/cs_CZ.php +++ b/lib/l10n/cs_CZ.php @@ -24,6 +24,7 @@ "%s set the database host." => "Zadejte název poÄÃtaÄe s databázà %s.", "PostgreSQL username and/or password not valid" => "Uživatelské jméno, Äi heslo PostgreSQL nenà platné", "You need to enter either an existing account or the administrator." => "MusÃte zadat existujÃcà úÄet, Äi správce.", +"Oracle connection could not be established" => "Spojenà s Oracle nemohlo být navázáno", "MySQL username and/or password not valid" => "Uživatelské jméno, Äi heslo MySQL nenà platné", "DB Error: \"%s\"" => "Chyba DB: \"%s\"", "Offending command was: \"%s\"" => "PodezÅ™elý pÅ™Ãkaz byl: \"%s\"", diff --git a/lib/l10n/de.php b/lib/l10n/de.php index 74715bc66eb..4869689ba78 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -24,6 +24,7 @@ "%s set the database host." => "%s setze den Datenbank-Host", "PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig", "You need to enter either an existing account or the administrator." => "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.", +"Oracle connection could not be established" => "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt werden", "MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig", "DB Error: \"%s\"" => "DB Fehler: \"%s\"", "Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"", diff --git a/lib/l10n/he.php b/lib/l10n/he.php index dcd0545adba..0069d77eee4 100644 --- a/lib/l10n/he.php +++ b/lib/l10n/he.php @@ -15,6 +15,8 @@ "Files" => "קבצי×", "Text" => "טקסט", "Images" => "×ª×ž×•× ×•×ª", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "שרת ×”××™× ×˜×¨× ×˜ שלך ××™× ×• מוגדר לצורכי ×¡× ×›×¨×•×Ÿ ×§×‘×¦×™× ×¢×“×™×™×Ÿ כיוון ×©×ž× ×©×§ ×”Ö¾WebDAV ×›× ×¨××” ××™× ×• תקין.", +"Please double check the <a href='%s'>installation guides</a>." => "× × ×œ×¢×™×™×Ÿ שוב ב<a href='%s'>מדריכי ×”×”×ª×§× ×”</a>.", "seconds ago" => "×©× ×™×•×ª", "1 minute ago" => "×œ×¤× ×™ דקה ×חת", "%d minutes ago" => "×œ×¤× ×™ %d דקות", diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php index cebaa6937d8..b8268ed4376 100644 --- a/lib/l10n/lt_LT.php +++ b/lib/l10n/lt_LT.php @@ -14,13 +14,17 @@ "Token expired. Please reload page." => "Sesija baigÄ—si. PraÅ¡ome perkrauti puslapį.", "Files" => "Failai", "Text" => "ŽinuÄių", +"Images" => "PaveikslÄ—liai", "seconds ago" => "prieÅ¡ sekundÄ™", "1 minute ago" => "PrieÅ¡ 1 minutÄ™", "%d minutes ago" => "prieÅ¡ %d minuÄių", +"1 hour ago" => "prieÅ¡ 1 valandÄ…", +"%d hours ago" => "prieÅ¡ %d valandų", "today" => "Å¡iandien", "yesterday" => "vakar", "%d days ago" => "prieÅ¡ %d dienų", "last month" => "praeitÄ… mÄ—nesį", +"%d months ago" => "prieÅ¡ %d mÄ—nesių", "last year" => "praeitais metais", "years ago" => "prieÅ¡ metus" ); diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index e077b688c09..e3e3aee5a92 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -24,6 +24,7 @@ "%s set the database host." => "%s задайте хоÑÑ‚ базы данных.", "PostgreSQL username and/or password not valid" => "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль PostgreSQL", "You need to enter either an existing account or the administrator." => "Ð’Ñ‹ должны войти или в ÑущеÑтвующий аккаунт или под админиÑтратором.", +"Oracle connection could not be established" => "Ñоединение Ñ Oracle не может быть уÑтановлено", "MySQL username and/or password not valid" => "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MySQL", "DB Error: \"%s\"" => "Ошибка БД: \"%s\"", "Offending command was: \"%s\"" => "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\"", diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php index 3dcb26d5d8d..f2b7c892058 100644 --- a/lib/l10n/sv.php +++ b/lib/l10n/sv.php @@ -16,6 +16,25 @@ "Files" => "Filer", "Text" => "Text", "Images" => "Bilder", +"Set an admin username." => "Ange ett användarnamn för administratören.", +"Set an admin password." => "Ange ett administratörslösenord.", +"%s enter the database username." => "%s ange databasanvändare.", +"%s enter the database name." => "%s ange databasnamn", +"%s you may not use dots in the database name" => "%s du fÃ¥r inte använda punkter i databasnamnet", +"%s set the database host." => "%s ange databasserver/host.", +"PostgreSQL username and/or password not valid" => "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt", +"You need to enter either an existing account or the administrator." => "Du mÃ¥ste antingen ange ett befintligt konto eller administratör.", +"Oracle connection could not be established" => "Oracle-anslutning kunde inte etableras", +"MySQL username and/or password not valid" => "MySQL-användarnamnet och/eller lösenordet är felaktigt", +"DB Error: \"%s\"" => "DB error: \"%s\"", +"Offending command was: \"%s\"" => "Det felaktiga kommandot var: \"%s\"", +"MySQL user '%s'@'localhost' exists already." => "MySQL-användaren '%s'@'localhost' existerar redan.", +"Drop this user from MySQL" => "Radera denna användare frÃ¥n MySQL", +"MySQL user '%s'@'%%' already exists" => "MySQl-användare '%s'@'%%' existerar redan", +"Drop this user from MySQL." => "Radera denna användare frÃ¥n MySQL.", +"Oracle username and/or password not valid" => "Oracle-användarnamnet och/eller lösenordet är felaktigt", +"Offending command was: \"%s\", name: %s, password: %s" => "Det felande kommandot var: \"%s\", name: %s, password: %s", +"MS SQL username and/or password not valid: %s" => "MS SQL-användaren och/eller lösenordet var inte giltigt: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillÃ¥ta filsynkronisering eftersom WebDAV inte verkar fungera.", "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.", "seconds ago" => "sekunder sedan", diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php index 7996447b95d..2662d61649d 100644 --- a/lib/l10n/tr.php +++ b/lib/l10n/tr.php @@ -24,6 +24,7 @@ "%s set the database host." => "%s veritabanı sunucu adını tanımla", "PostgreSQL username and/or password not valid" => "PostgreSQL adi kullanici ve/veya parola yasal degildir. ", "You need to enter either an existing account or the administrator." => "Bir konto veya kullanici birlemek ihtiyacin. ", +"Oracle connection could not be established" => "Oracle baÄŸlantısı kurulamadı", "MySQL username and/or password not valid" => "MySQL kullanıcı adı ve/veya parolası geçerli deÄŸil", "DB Error: \"%s\"" => "DB Hata: ''%s''", "Offending command was: \"%s\"" => "Komut rahasiz ''%s''. ", diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php index 61e405d8058..edb0f81ee9d 100644 --- a/lib/l10n/zh_CN.php +++ b/lib/l10n/zh_CN.php @@ -24,6 +24,7 @@ "%s set the database host." => "%s 设置数æ®åº“所在主机。", "PostgreSQL username and/or password not valid" => "PostgreSQL æ•°æ®åº“用户åå’Œ/æˆ–å¯†ç æ— 效", "You need to enter either an existing account or the administrator." => "ä½ éœ€è¦è¾“入一个数æ®åº“ä¸å·²æœ‰çš„账户或管ç†å‘˜è´¦æˆ·ã€‚", +"Oracle connection could not be established" => "ä¸èƒ½å»ºç«‹ç”²éª¨æ–‡è¿žæŽ¥", "MySQL username and/or password not valid" => "MySQL æ•°æ®åº“用户åå’Œ/æˆ–å¯†ç æ— 效", "DB Error: \"%s\"" => "æ•°æ®åº“错误:\"%s\"", "Offending command was: \"%s\"" => "冲çªå‘½ä»¤ä¸ºï¼š\"%s\"", diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php index 601046fe691..cc076a3a845 100644 --- a/lib/public/backgroundjob.php +++ b/lib/public/backgroundjob.php @@ -1,49 +1,46 @@ <?php /** -* ownCloud -* -* @author Jakob Sack -* @copyright 2012 Jakob Sack owncloud@jakobsack.de -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ + * ownCloud + * + * @author Jakob Sack + * @copyright 2012 Jakob Sack owncloud@jakobsack.de + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ /** - * Public interface of ownCloud forbackground jobs. + * Public interface of ownCloud for background jobs. */ // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes namespace OCP; +use \OC\BackgroundJob\JobList; + /** - * This class provides functions to manage backgroundjobs in ownCloud - * - * There are two kind of background jobs in ownCloud: regular tasks and - * queued tasks. + * This class provides functions to register backgroundjobs in ownCloud * - * Regular tasks have to be registered in appinfo.php and - * will run on a regular base. Fetching news could be a task that should run - * frequently. + * To create a new backgroundjob create a new class that inharits from either \OC\BackgroundJob\Job, + * \OC\BackgroundJob\QueuedJob or \OC\BackgroundJob\TimedJob and register it using + * \OCP\BackgroundJob->registerJob($job, $argument), $argument will be passed to the run() function + * of the job when the job is executed. * - * Queued tasks have to be registered each time you want to execute them. - * An example of the queued task would be the creation of the thumbnail. As - * soon as the user uploads a picture the gallery app registers the queued - * task "create thumbnail" and saves the path in the parameter instead of doing - * the work right away. This makes the app more responsive. As soon as the task - * is done it will be deleted from the list. + * A regular Job will be executed every time cron.php is run, a QueuedJob will only run once and a TimedJob + * will only run at a specific interval which is to be specified in the constructor of the job by calling + * $this->setInterval($interval) with $interval in seconds. */ class BackgroundJob { /** @@ -59,82 +56,136 @@ class BackgroundJob { /** * @brief sets the background jobs execution type - * @param $type execution type + * @param string $type execution type * @return boolean * * This method sets the execution type of the background jobs. Possible types * are "none", "ajax", "webcron", "cron" */ - public static function setExecutionType( $type ) { - return \OC_BackgroundJob::setExecutionType( $type ); + public static function setExecutionType($type) { + return \OC_BackgroundJob::setExecutionType($type); + } + + /** + * @param \OC\BackgroundJob\Job|string $job + * @param mixed $argument + */ + public static function registerJob($job, $argument = null) { + $jobList = new JobList(); + $jobList->add($job, $argument); } /** + * @deprecated * @brief creates a regular task - * @param $klass class name - * @param $method method name + * @param string $klass class name + * @param string $method method name * @return true */ - public static function addRegularTask( $klass, $method ) { - return \OC_BackgroundJob_RegularTask::register( $klass, $method ); + public static function addRegularTask($klass, $method) { + self::registerJob('OC\BackgroundJob\Legacy\RegularJob', array($klass, $method)); + return true; } /** + * @deprecated * @brief gets all regular tasks * @return associative array * * key is string "$klass-$method", value is array( $klass, $method ) */ static public function allRegularTasks() { - return \OC_BackgroundJob_RegularTask::all(); + $jobList = new JobList(); + $allJobs = $jobList->getAll(); + $regularJobs = array(); + foreach ($allJobs as $job) { + if ($job instanceof RegularLegacyJob) { + $key = implode('-', $job->getArgument()); + $regularJobs[$key] = $job->getArgument(); + } + } + return $regularJobs; } /** + * @deprecated * @brief Gets one queued task - * @param $id ID of the task + * @param int $id ID of the task * @return associative array */ - public static function findQueuedTask( $id ) { - return \OC_BackgroundJob_QueuedTask::find( $id ); + public static function findQueuedTask($id) { + $jobList = new JobList(); + return $jobList->getById($id); } /** + * @deprecated * @brief Gets all queued tasks * @return array with associative arrays */ public static function allQueuedTasks() { - return \OC_BackgroundJob_QueuedTask::all(); + $jobList = new JobList(); + $allJobs = $jobList->getAll(); + $queuedJobs = array(); + foreach ($allJobs as $job) { + if ($job instanceof QueuedLegacyJob) { + $queuedJob = $job->getArgument(); + $queuedJob['id'] = $job->getId(); + $queuedJobs[] = $queuedJob; + } + } + return $queuedJobs; } /** + * @deprecated * @brief Gets all queued tasks of a specific app - * @param $app app name + * @param string $app app name * @return array with associative arrays */ - public static function queuedTaskWhereAppIs( $app ) { - return \OC_BackgroundJob_QueuedTask::whereAppIs( $app ); + public static function queuedTaskWhereAppIs($app) { + $jobList = new JobList(); + $allJobs = $jobList->getAll(); + $queuedJobs = array(); + foreach ($allJobs as $job) { + if ($job instanceof QueuedLegacyJob) { + $queuedJob = $job->getArgument(); + $queuedJob['id'] = $job->getId(); + if ($queuedJob['app'] === $app) { + $queuedJobs[] = $queuedJob; + } + } + } + return $queuedJobs; } /** + * @deprecated * @brief queues a task - * @param $app app name - * @param $klass class name - * @param $method method name - * @param $parameters all useful data as text - * @return id of task + * @param string $app app name + * @param string $class class name + * @param string $method method name + * @param string $parameters all useful data as text + * @return int id of task */ - public static function addQueuedTask( $app, $klass, $method, $parameters ) { - return \OC_BackgroundJob_QueuedTask::add( $app, $klass, $method, $parameters ); + public static function addQueuedTask($app, $class, $method, $parameters) { + self::registerJob('OC\BackgroundJob\Legacy\QueuedJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters)); + return true; } /** + * @deprecated * @brief deletes a queued task - * @param $id id of task - * @return true/false + * @param int $id id of task + * @return bool * * Deletes a report */ - public static function deleteQueuedTask( $id ) { - return \OC_BackgroundJob_QueuedTask::delete( $id ); + public static function deleteQueuedTask($id) { + $jobList = new JobList(); + $job = $jobList->getById($id); + if ($job) { + $jobList->remove($job); + } } } diff --git a/lib/public/share.php b/lib/public/share.php index 6c93139b107..6a26101a1ce 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -152,11 +152,11 @@ class Share { // Fetch all shares of this file path from DB $query = \OC_DB::prepare( - 'SELECT share_with + 'SELECT `share_with` FROM `*PREFIX*share` WHERE - item_source = ? AND share_type = ?' + `item_source` = ? AND `share_type` = ?' ); $result = $query->execute(array($source, self::SHARE_TYPE_USER)); @@ -171,11 +171,11 @@ class Share { // We also need to take group shares into account $query = \OC_DB::prepare( - 'SELECT share_with + 'SELECT `share_with` FROM `*PREFIX*share` WHERE - item_source = ? AND share_type = ?' + `item_source` = ? AND `share_type` = ?' ); $result = $query->execute(array($source, self::SHARE_TYPE_GROUP)); @@ -192,11 +192,11 @@ class Share { //check for public link shares if (!$publicShare) { $query = \OC_DB::prepare( - 'SELECT share_with + 'SELECT `share_with` FROM `*PREFIX*share` WHERE - item_source = ? AND share_type = ?' + `item_source` = ? AND `share_type` = ?' ); $result = $query->execute(array($source, self::SHARE_TYPE_LINK)); @@ -1009,7 +1009,7 @@ class Share { if (!isset($mounts[$row['storage']])) { $mountPoints = \OC\Files\Filesystem::getMountByNumericId($row['storage']); if (is_array($mountPoints)) { - $mounts[$row['storage']] = $mountPoints[key($mountPoints)]; + $mounts[$row['storage']] = current($mountPoints); } } if ($mounts[$row['storage']]) { diff --git a/lib/response.php b/lib/response.php index 49d79fda709..674176d078b 100644 --- a/lib/response.php +++ b/lib/response.php @@ -11,6 +11,7 @@ class OC_Response { const STATUS_NOT_MODIFIED = 304; const STATUS_TEMPORARY_REDIRECT = 307; const STATUS_NOT_FOUND = 404; + const STATUS_INTERNAL_SERVER_ERROR = 500; /** * @brief Enable response caching by sending correct HTTP headers @@ -70,6 +71,9 @@ class OC_Response { case self::STATUS_NOT_FOUND; $status = $status . ' Not Found'; break; + case self::STATUS_INTERNAL_SERVER_ERROR; + $status = $status . ' Internal Server Error'; + break; } header($protocol.' '.$status); } diff --git a/lib/setup.php b/lib/setup.php index a63cc664dbc..71a2d13937e 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -106,12 +106,6 @@ class OC_Setup { 'hint' => $e->getHint() ); return($error); - } catch (Exception $e) { - $error[] = array( - 'error' => $e->getMessage(), - 'hint' => '' - ); - return($error); } } elseif($dbtype == 'pgsql') { @@ -127,7 +121,7 @@ class OC_Setup { try { self::setupPostgreSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username); - } catch (Exception $e) { + } catch (DatabaseSetupException $e) { $error[] = array( 'error' => $l->t('PostgreSQL username and/or password not valid'), 'hint' => $l->t('You need to enter either an existing account or the administrator.') @@ -150,7 +144,7 @@ class OC_Setup { try { self::setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace, $username); - } catch (Exception $e) { + } catch (DatabaseSetupException $e) { $error[] = array( 'error' => $l->t('Oracle connection could not be established'), 'hint' => $e->getMessage().' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME') @@ -177,7 +171,7 @@ class OC_Setup { try { self::setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix); - } catch (Exception $e) { + } catch (DatabaseSetupException $e) { $error[] = array( 'error' => 'MS SQL username and/or password not valid', 'hint' => 'You need to enter either an existing account or the administrator.' @@ -326,7 +320,7 @@ class OC_Setup { $connection_string = "host='$e_host' dbname=postgres user='$e_user' password='$e_password'"; $connection = @pg_connect($connection_string); if(!$connection) { - throw new Exception($l->t('PostgreSQL username and/or password not valid')); + throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid')); } $e_user = pg_escape_string($dbuser); //check for roles creation rights in postgresql @@ -371,7 +365,7 @@ class OC_Setup { $connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'"; $connection = @pg_connect($connection_string); if(!$connection) { - throw new Exception($l->t('PostgreSQL username and/or password not valid')); + throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid')); } $query = "select count(*) FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1"; $result = pg_query($connection, $query); @@ -461,9 +455,9 @@ class OC_Setup { if(!$connection) { $e = oci_error(); if (is_array ($e) && isset ($e['message'])) { - throw new Exception($e['message']); + throw new DatabaseSetupException($e['message']); } - throw new Exception($l->t('Oracle username and/or password not valid')); + throw new DatabaseSetupException($l->t('Oracle username and/or password not valid')); } //check for roles creation rights in oracle @@ -530,7 +524,7 @@ class OC_Setup { } $connection = @oci_connect($dbuser, $dbpass, $easy_connect_string); if(!$connection) { - throw new Exception($l->t('Oracle username and/or password not valid')); + throw new DatabaseSetupException($l->t('Oracle username and/or password not valid')); } $query = "SELECT count(*) FROM user_tables WHERE table_name = :un"; $stmt = oci_parse($connection, $query); @@ -641,7 +635,7 @@ class OC_Setup { } else { $entry = ''; } - throw new Exception($l->t('MS SQL username and/or password not valid: %s', array($entry))); + throw new DatabaseSetupException($l->t('MS SQL username and/or password not valid: %s', array($entry))); } OC_Config::setValue('dbuser', $dbuser); diff --git a/lib/template.php b/lib/template.php index 9467dedb62a..01f0fc28b60 100644 --- a/lib/template.php +++ b/lib/template.php @@ -535,4 +535,25 @@ class OC_Template{ $content->printPage(); die(); } + + /** + * print error page using Exception details + * @param Exception $exception + */ + + public static function printExceptionErrorPage(Exception $exception) { + $error_msg = $exception->getMessage(); + if ($exception->getCode()) { + $error_msg = '['.$exception->getCode().'] '.$error_msg; + } + $hint = $exception->getTraceAsString(); + while ($exception = $exception->previous()) { + $error_msg .= '<br/>Caused by: '; + if ($exception->getCode()) { + $error_msg .= '['.$exception->getCode().'] '; + } + $error_msg .= $exception->getMessage(); + }; + self::printErrorPage($error_msg, $hint); + } } diff --git a/lib/user.php b/lib/user.php index 1dde87a1339..06ea8e791dd 100644 --- a/lib/user.php +++ b/lib/user.php @@ -30,35 +30,85 @@ * post_createUser(uid, password) * pre_deleteUser(&run, uid) * post_deleteUser(uid) - * pre_setPassword(&run, uid, password) - * post_setPassword(uid, password) + * pre_setPassword(&run, uid, password, recoveryPassword) + * post_setPassword(uid, password, recoveryPassword) * pre_login(&run, uid, password) * post_login(uid) * logout() */ class OC_User { - // The backend used for user management - private static $_usedBackends = array(); + public static $userSession = null; + + private static function getUserSession() { + if (!self::$userSession) { + $manager = new \OC\User\Manager(); + self::$userSession = new \OC\User\Session($manager, \OC::$session); + self::$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) { + \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password)); + }); + self::$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) { + /** @var $user \OC\User\User */ + \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password)); + }); + self::$userSession->listen('\OC\User', 'preDelete', function ($user) { + /** @var $user \OC\User\User */ + \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID())); + }); + self::$userSession->listen('\OC\User', 'postDelete', function ($user) { + /** @var $user \OC\User\User */ + \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID())); + }); + self::$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) { + /** @var $user \OC\User\User */ + OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword)); + }); + self::$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) { + /** @var $user \OC\User\User */ + OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword)); + }); + self::$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) { + \OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password)); + }); + self::$userSession->listen('\OC\User', 'postLogin', function ($user, $password) { + /** @var $user \OC\User\User */ + \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password)); + }); + self::$userSession->listen('\OC\User', 'logout', function () { + \OC_Hook::emit('OC_User', 'logout', array()); + }); + } + return self::$userSession; + } - private static $_setupedBackends = array(); + /** + * @return \OC\User\Manager + */ + private static function getManager() { + return self::getUserSession()->getManager(); + } - // Backends available (except database) private static $_backends = array(); + private static $_usedBackends = array(); + + private static $_setupedBackends = array(); + /** * @brief registers backend - * @param $name name of the backend - * @returns true/false + * @param string $backend name of the backend + * @deprecated Add classes by calling useBackend with a class instance instead + * @return bool * * Makes a list of backends that can be used by other modules */ - public static function registerBackend( $backend ) { + public static function registerBackend($backend) { self::$_backends[] = $backend; return true; } /** * @brief gets available backends + * @deprecated * @returns array of backends * * Returns the names of all backends. @@ -69,6 +119,7 @@ class OC_User { /** * @brief gets used backends + * @deprecated * @returns array of backends * * Returns the names of all used backends. @@ -79,33 +130,36 @@ class OC_User { /** * @brief Adds the backend to the list of used backends - * @param $backend default: database The backend to use for user managment - * @returns true/false + * @param string | OC_User_Backend $backend default: database The backend to use for user management + * @return bool * * Set the User Authentication Module */ - public static function useBackend( $backend = 'database' ) { - if($backend instanceof OC_User_Interface) { - OC_Log::write('core', 'Adding user backend instance of '.get_class($backend).'.', OC_Log::DEBUG); - self::$_usedBackends[get_class($backend)]=$backend; + public static function useBackend($backend = 'database') { + if ($backend instanceof OC_User_Interface) { + OC_Log::write('core', 'Adding user backend instance of ' . get_class($backend) . '.', OC_Log::DEBUG); + self::$_usedBackends[get_class($backend)] = $backend; + self::getManager()->registerBackend($backend); } else { // You'll never know what happens - if( null === $backend OR !is_string( $backend )) { + if (null === $backend OR !is_string($backend)) { $backend = 'database'; } // Load backend - switch( $backend ) { + switch ($backend) { case 'database': case 'mysql': case 'sqlite': - OC_Log::write('core', 'Adding user backend '.$backend.'.', OC_Log::DEBUG); + OC_Log::write('core', 'Adding user backend ' . $backend . '.', OC_Log::DEBUG); self::$_usedBackends[$backend] = new OC_User_Database(); + self::getManager()->registerBackend(self::$_usedBackends[$backend]); break; default: - OC_Log::write('core', 'Adding default user backend '.$backend.'.', OC_Log::DEBUG); + OC_Log::write('core', 'Adding default user backend ' . $backend . '.', OC_Log::DEBUG); $className = 'OC_USER_' . strToUpper($backend); self::$_usedBackends[$backend] = new $className(); + self::getManager()->registerBackend(self::$_usedBackends[$backend]); break; } } @@ -116,121 +170,73 @@ class OC_User { * remove all used backends */ public static function clearBackends() { - self::$_usedBackends=array(); + self::$_usedBackends = array(); + self::getManager()->clearBackends(); } /** * setup the configured backends in config.php */ public static function setupBackends() { - $backends=OC_Config::getValue('user_backends', array()); - foreach($backends as $i=>$config) { - $class=$config['class']; - $arguments=$config['arguments']; - if(class_exists($class)) { - if(array_search($i, self::$_setupedBackends)===false) { + $backends = OC_Config::getValue('user_backends', array()); + foreach ($backends as $i => $config) { + $class = $config['class']; + $arguments = $config['arguments']; + if (class_exists($class)) { + if (array_search($i, self::$_setupedBackends) === false) { // make a reflection object $reflectionObj = new ReflectionClass($class); // use Reflection to create a new instance, using the $args $backend = $reflectionObj->newInstanceArgs($arguments); self::useBackend($backend); - $_setupedBackends[]=$i; + $_setupedBackends[] = $i; } else { - OC_Log::write('core', 'User backend '.$class.' already initialized.', OC_Log::DEBUG); + OC_Log::write('core', 'User backend ' . $class . ' already initialized.', OC_Log::DEBUG); } } else { - OC_Log::write('core', 'User backend '.$class.' not found.', OC_Log::ERROR); + OC_Log::write('core', 'User backend ' . $class . ' not found.', OC_Log::ERROR); } } } /** * @brief Create a new user - * @param $uid The username of the user to create - * @param $password The password of the new user - * @returns true/false + * @param string $uid The username of the user to create + * @param string $password The password of the new user + * @throws Exception + * @return bool true/false * * Creates a new user. Basic checking of username is done in OC_User * itself, not in its subclasses. * * Allowed characters in the username are: "a-z", "A-Z", "0-9" and "_.@-" */ - public static function createUser( $uid, $password ) { - // Check the name for bad characters - // Allowed are: "a-z", "A-Z", "0-9" and "_.@-" - if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $uid )) { - throw new Exception('Only the following characters are allowed in a username:' - .' "a-z", "A-Z", "0-9", and "_.@-"'); - } - // No empty username - if(trim($uid) == '') { - throw new Exception('A valid username must be provided'); - } - // No empty password - if(trim($password) == '') { - throw new Exception('A valid password must be provided'); - } - - // Check if user already exists - if( self::userExistsForCreation($uid) ) { - throw new Exception('The username is already being used'); - } - - - $run = true; - OC_Hook::emit( "OC_User", "pre_createUser", array( "run" => &$run, "uid" => $uid, "password" => $password )); - - if( $run ) { - //create the user in the first backend that supports creating users - foreach(self::$_usedBackends as $backend) { - if(!$backend->implementsActions(OC_USER_BACKEND_CREATE_USER)) - continue; - - $backend->createUser($uid, $password); - OC_Hook::emit( "OC_User", "post_createUser", array( "uid" => $uid, "password" => $password )); - - return self::userExists($uid); - } - } - return false; + public static function createUser($uid, $password) { + return self::getManager()->createUser($uid, $password); } /** * @brief delete a user - * @param $uid The username of the user to delete - * @returns true/false + * @param string $uid The username of the user to delete + * @return bool * * Deletes a user */ - public static function deleteUser( $uid ) { - $run = true; - OC_Hook::emit( "OC_User", "pre_deleteUser", array( "run" => &$run, "uid" => $uid )); - - if( $run ) { - //delete the user from all backends - foreach(self::$_usedBackends as $backend) { - $backend->deleteUser($uid); - } - if (self::userExists($uid)) { - return false; - } + public static function deleteUser($uid) { + $user = self::getManager()->get($uid); + if ($user) { + $user->delete(); + // We have to delete the user from all groups - foreach( OC_Group::getUserGroups( $uid ) as $i ) { - OC_Group::removeFromGroup( $uid, $i ); + foreach (OC_Group::getUserGroups($uid) as $i) { + OC_Group::removeFromGroup($uid, $i); } // Delete the user's keys in preferences OC_Preferences::deleteUser($uid); // Delete user files in /data/ - OC_Helper::rmdirr(OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/'.$uid.'/'); - - // Emit and exit - OC_Hook::emit( "OC_User", "post_deleteUser", array( "uid" => $uid )); - return true; - } - else{ - return false; + OC_Helper::rmdirr(OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid . '/'); } } @@ -238,75 +244,34 @@ class OC_User { * @brief Try to login a user * @param $uid The username of the user to log in * @param $password The password of the user - * @returns true/false + * @return bool * * Log in a user and regenerate a new session - if the password is ok */ - public static function login( $uid, $password ) { - $run = true; - OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid, "password" => $password)); - - if( $run ) { - $uid = self::checkPassword( $uid, $password ); - $enabled = self::isEnabled($uid); - if($uid && $enabled) { - session_regenerate_id(true); - self::setUserId($uid); - self::setDisplayName($uid); - OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid, 'password'=>$password )); - return true; - } - } - return false; + public static function login($uid, $password) { + return self::getUserSession()->login($uid, $password); } /** * @brief Sets user id for session and triggers emit */ public static function setUserId($uid) { - \OC::$session->set('user_id', $uid); + OC::$session->set('user_id', $uid); } /** * @brief Sets user display name for session */ public static function setDisplayName($uid, $displayName = null) { - $result = false; - if ($displayName ) { - foreach(self::$_usedBackends as $backend) { - if($backend->implementsActions(OC_USER_BACKEND_SET_DISPLAYNAME)) { - if($backend->userExists($uid)) { - $result |= $backend->setDisplayName($uid, $displayName); - } - } - } - } else { - $displayName = self::determineDisplayName($uid); - $result = true; - } - if (OC_User::getUser() === $uid) { - \OC::$session->set('display_name', $displayName); + if (is_null($displayName)) { + $displayName = $uid; } - return $result; - } - - - /** - * @brief get display name - * @param $uid The username - * @returns string display name or uid if no display name is defined - * - */ - private static function determineDisplayName( $uid ) { - foreach(self::$_usedBackends as $backend) { - if($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) { - $result=$backend->getDisplayName( $uid ); - if($result) { - return $result; - } - } + $user = self::getManager()->get($uid); + if ($user) { + return $user->setDisplayName($displayName); + } else { + return false; } - return $uid; } /** @@ -315,36 +280,31 @@ class OC_User { * Logout, destroys session */ public static function logout() { - OC_Hook::emit( "OC_User", "logout", array()); - session_unset(); - session_destroy(); - OC_User::unsetMagicInCookie(); + self::getUserSession()->logout(); } /** * @brief Check if the user is logged in - * @returns true/false + * @returns bool * * Checks if the user is logged in */ public static function isLoggedIn() { - if( \OC::$session->get('user_id')) { + if (\OC::$session->get('user_id')) { OC_App::loadApps(array('authentication')); self::setupBackends(); - if (self::userExists(\OC::$session->get('user_id')) ) { - return true; - } + return self::userExists(\OC::$session->get('user_id')); } return false; } /** * @brief Check if the user is an admin user - * @param $uid uid of the admin - * @returns bool + * @param string $uid uid of the admin + * @return bool */ public static function isAdminUser($uid) { - if(OC_Group::inGroup($uid, 'admin' )) { + if (OC_Group::inGroup($uid, 'admin')) { return true; } return false; @@ -356,32 +316,40 @@ class OC_User { * @return string uid or false */ public static function getUser() { - if( \OC::$session->get('user_id') ) { - return \OC::$session->get('user_id'); - } - else{ + $uid = OC::$session->get('user_id'); + if (!is_null($uid)) { + return $uid; + } else { return false; } } /** * @brief get the display name of the user currently logged in. + * @param string $uid * @return string uid or false */ - public static function getDisplayName($user=null) { - if ( $user ) { - return self::determineDisplayName($user); - } else if( \OC::$session->get('display_name') ) { - return \OC::$session->get('display_name'); - } - else{ - return false; + public static function getDisplayName($uid = null) { + if ($uid) { + $user = self::getManager()->get($uid); + if ($user) { + return $user->getDisplayName(); + } else { + return $uid; + } + } else { + $user = self::getUserSession()->getUser(); + if ($user) { + return $user->getDisplayName(); + } else { + return false; + } } } /** * @brief Autogenerate a password - * @returns string + * @return string * * generates a password */ @@ -391,112 +359,89 @@ class OC_User { /** * @brief Set password - * @param $uid The username - * @param $password The new password - * @param $recoveryPassword for the encryption app to reset encryption keys - * @returns true/false + * @param string $uid The username + * @param string $password The new password + * @param string $recoveryPassword for the encryption app to reset encryption keys + * @return bool * * Change the password of a user */ - public static function setPassword( $uid, $password, $recoveryPassword = null ) { - $run = true; - OC_Hook::emit( "OC_User", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password, "recoveryPassword" => $recoveryPassword )); - - if( $run ) { - $success = false; - foreach(self::$_usedBackends as $backend) { - if($backend->implementsActions(OC_USER_BACKEND_SET_PASSWORD)) { - if($backend->userExists($uid)) { - $success |= $backend->setPassword($uid, $password); - } - } - } - // invalidate all login cookies - OC_Preferences::deleteApp($uid, 'login_token'); - OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password, "recoveryPassword" => $recoveryPassword )); - return $success; - } - else{ + public static function setPassword($uid, $password, $recoveryPassword = null) { + $user = self::getManager()->get($uid); + if ($user) { + return $user->setPassword($password, $recoveryPassword); + } else { return false; } } /** * @brief Check whether user can change his password - * @param $uid The username - * @returns true/false + * @param string $uid The username + * @return bool * * Check whether a specified user can change his password */ public static function canUserChangePassword($uid) { - foreach(self::$_usedBackends as $backend) { - if($backend->implementsActions(OC_USER_BACKEND_SET_PASSWORD)) { - if($backend->userExists($uid)) { - return true; - } - } + $user = self::getManager()->get($uid); + if ($user) { + return $user->canChangePassword(); + } else { + return false; } - return false; } /** * @brief Check whether user can change his display name - * @param $uid The username - * @returns true/false + * @param string $uid The username + * @return bool * * Check whether a specified user can change his display name */ public static function canUserChangeDisplayName($uid) { - if (OC_Config::getValue('allow_user_to_change_display_name', true)) { - foreach(self::$_usedBackends as $backend) { - if($backend->implementsActions(OC_USER_BACKEND_SET_DISPLAYNAME)) { - if($backend->userExists($uid)) { - return true; - } - } - } + $user = self::getManager()->get($uid); + if ($user) { + return $user->canChangeDisplayName(); + } else { + return false; } - return false; } /** * @brief Check if the password is correct - * @param $uid The username - * @param $password The password - * @returns string + * @param string $uid The username + * @param string $password The password + * @return bool * * Check if the password is correct without logging in the user * returns the user id or false */ - public static function checkPassword( $uid, $password ) { - foreach(self::$_usedBackends as $backend) { - if($backend->implementsActions(OC_USER_BACKEND_CHECK_PASSWORD)) { - $result=$backend->checkPassword( $uid, $password ); - if($result) { - return $result; - } + public static function checkPassword($uid, $password) { + $user = self::getManager()->get($uid); + if ($user) { + if ($user->checkPassword($password)) { + return $user->getUID(); + } else { + return false; } + } else { + return false; } } /** - * @brief Check if the password is correct * @param string $uid The username - * @param string $password The password - * @returns string + * @return string * * returns the path to the users home directory */ public static function getHome($uid) { - foreach(self::$_usedBackends as $backend) { - if($backend->implementsActions(OC_USER_BACKEND_GET_HOME) && $backend->userExists($uid)) { - $result=$backend->getHome($uid); - if($result) { - return $result; - } - } + $user = self::getManager()->get($uid); + if ($user) { + return $user->getHome(); + } else { + return OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid; } - return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid; } /** @@ -506,152 +451,93 @@ class OC_User { * Get a list of all users. */ public static function getUsers($search = '', $limit = null, $offset = null) { - $users = array(); - foreach (self::$_usedBackends as $backend) { - $backendUsers = $backend->getUsers($search, $limit, $offset); - if (is_array($backendUsers)) { - $users = array_merge($users, $backendUsers); - } + $users = self::getManager()->search($search, $limit, $offset); + $uids = array(); + foreach ($users as $user) { + $uids[] = $user->getUID(); } - asort($users); - return $users; + return $uids; } /** * @brief Get a list of all users display name - * @returns associative array with all display names (value) and corresponding uids (key) + * @param string $search + * @param int $limit + * @param int $offset + * @return array associative array with all display names (value) and corresponding uids (key) * * Get a list of all display names and user ids. */ public static function getDisplayNames($search = '', $limit = null, $offset = null) { $displayNames = array(); - foreach (self::$_usedBackends as $backend) { - $backendDisplayNames = $backend->getDisplayNames($search, $limit, $offset); - if (is_array($backendDisplayNames)) { - $displayNames = $displayNames + $backendDisplayNames; - } + $users = self::getManager()->searchDisplayName($search, $limit, $offset); + foreach ($users as $user) { + $displayNames[$user->getUID()] = $user->getDisplayName(); } - asort($displayNames); return $displayNames; } /** * @brief check if a user exists * @param string $uid the username - * @param string $excludingBackend (default none) * @return boolean */ - public static function userExists($uid, $excludingBackend=null) { - foreach(self::$_usedBackends as $backend) { - if (!is_null($excludingBackend) && !strcmp(get_class($backend), $excludingBackend)) { - OC_Log::write('OC_User', $excludingBackend . 'excluded from user existance check.', OC_Log::DEBUG); - continue; - } - $result=$backend->userExists($uid); - if($result===true) { - return true; - } - } - return false; + public static function userExists($uid) { + return self::getManager()->userExists($uid); } - public static function userExistsForCreation($uid) { - foreach(self::$_usedBackends as $backend) { - if(!$backend->hasUserListings()) - continue; - - $result=$backend->userExists($uid); - if($result===true) { - return true; - } - } - return false; - } - /** * disables a user - * @param string $userid the user to disable + * + * @param string $uid the user to disable */ - public static function disableUser($userid) { - $sql = "INSERT INTO `*PREFIX*preferences` (`userid`, `appid`, `configkey`, `configvalue`) VALUES(?, ?, ?, ?)"; - $stmt = OC_DB::prepare($sql); - if ( ! OC_DB::isError($stmt) ) { - $result = $stmt->execute(array($userid, 'core', 'enabled', 'false')); - if ( OC_DB::isError($result) ) { - OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR); - } - } else { - OC_Log::write('OC_User', 'could not disable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR); + public static function disableUser($uid) { + $user = self::getManager()->get($uid); + if ($user) { + $user->setEnabled(false); } } /** * enable a user - * @param string $userid + * + * @param string $uid */ - public static function enableUser($userid) { - $sql = 'DELETE FROM `*PREFIX*preferences`' - ." WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?"; - $stmt = OC_DB::prepare($sql); - if ( ! OC_DB::isError($stmt) ) { - $result = $stmt->execute(array($userid, 'core', 'enabled', 'false')); - if ( OC_DB::isError($result) ) { - OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR); - } - } else { - OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR); + public static function enableUser($uid) { + $user = self::getManager()->get($uid); + if ($user) { + $user->setEnabled(true); } } /** * checks if a user is enabled - * @param string $userid + * + * @param string $uid * @return bool */ - public static function isEnabled($userid) { - $sql = 'SELECT `userid` FROM `*PREFIX*preferences`' - .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?'; - if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { //FIXME oracle hack - $sql = 'SELECT `userid` FROM `*PREFIX*preferences`' - .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND to_char(`configvalue`) = ?'; - } - $stmt = OC_DB::prepare($sql); - if ( ! OC_DB::isError($stmt) ) { - $result = $stmt->execute(array($userid, 'core', 'enabled', 'false')); - if ( ! OC_DB::isError($result) ) { - return $result->numRows() ? false : true; - } else { - OC_Log::write('OC_User', - 'could not check if enabled: '. OC_DB::getErrorMessage($result), - OC_Log::ERROR); - } + public static function isEnabled($uid) { + $user = self::getManager()->get($uid); + if ($user) { + return $user->isEnabled(); } else { - OC_Log::write('OC_User', 'could not check if enabled: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR); + return false; } - return false; } /** * @brief Set cookie value to use in next page load * @param string $username username to be set + * @param string $token */ public static function setMagicInCookie($username, $token) { - $secure_cookie = OC_Config::getValue("forcessl", false); - $expires = time() + OC_Config::getValue('remember_login_cookie_lifetime', 60*60*24*15); - setcookie("oc_username", $username, $expires, OC::$WEBROOT, '', $secure_cookie); - setcookie("oc_token", $token, $expires, OC::$WEBROOT, '', $secure_cookie, true); - setcookie("oc_remember_login", true, $expires, OC::$WEBROOT, '', $secure_cookie); + self::getUserSession()->setMagicInCookie($username, $token); } /** * @brief Remove cookie for "remember username" */ public static function unsetMagicInCookie() { - unset($_COOKIE["oc_username"]); - unset($_COOKIE["oc_token"]); - unset($_COOKIE["oc_remember_login"]); - setcookie("oc_username", null, -1); - setcookie("oc_token", null, -1); - setcookie("oc_remember_login", null, -1); + self::getUserSession()->unsetMagicInCookie(); } } diff --git a/lib/user/backend.php b/lib/user/backend.php index 93e8f17ca98..e9be08e429c 100644 --- a/lib/user/backend.php +++ b/lib/user/backend.php @@ -58,7 +58,7 @@ abstract class OC_User_Backend implements OC_User_Interface { /** * @brief Get all supported actions - * @returns bitwise-or'ed actions + * @return int bitwise-or'ed actions * * Returns the supported actions as int to be * compared with OC_USER_BACKEND_CREATE_USER etc. @@ -76,8 +76,8 @@ abstract class OC_User_Backend implements OC_User_Interface { /** * @brief Check if backend implements actions - * @param $actions bitwise-or'ed actions - * @returns boolean + * @param int $actions bitwise-or'ed actions + * @return boolean * * Returns the supported actions as int to be * compared with OC_USER_BACKEND_CREATE_USER etc. @@ -87,12 +87,12 @@ abstract class OC_User_Backend implements OC_User_Interface { } /** - * @brief delete a user - * @param $uid The username of the user to delete - * @returns true/false - * - * Deletes a user - */ + * @brief delete a user + * @param string $uid The username of the user to delete + * @return bool + * + * Deletes a user + */ public function deleteUser( $uid ) { return false; } @@ -127,8 +127,8 @@ abstract class OC_User_Backend implements OC_User_Interface { /** * @brief get display name of the user - * @param $uid user ID of the user - * @return display name + * @param string $uid user ID of the user + * @return string display name */ public function getDisplayName($uid) { return $uid; diff --git a/lib/user/dummy.php b/lib/user/dummy.php index d63f60efbeb..b5b7a6c3c7a 100644 --- a/lib/user/dummy.php +++ b/lib/user/dummy.php @@ -1,114 +1,118 @@ <?php /** -* ownCloud -* -* @author Frank Karlitschek -* @copyright 2012 Frank Karlitschek frank@owncloud.org -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ + * ownCloud + * + * @author Frank Karlitschek + * @copyright 2012 Frank Karlitschek frank@owncloud.org + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ /** * dummy user backend, does not keep state, only for testing use */ class OC_User_Dummy extends OC_User_Backend { - private $users=array(); + private $users = array(); + /** - * @brief Create a new user - * @param $uid The username of the user to create - * @param $password The password of the new user - * @returns true/false - * - * Creates a new user. Basic checking of username is done in OC_User - * itself, not in its subclasses. - */ + * @brief Create a new user + * @param string $uid The username of the user to create + * @param string $password The password of the new user + * @return bool + * + * Creates a new user. Basic checking of username is done in OC_User + * itself, not in its subclasses. + */ public function createUser($uid, $password) { - if(isset($this->users[$uid])) { + if (isset($this->users[$uid])) { return false; - }else{ - $this->users[$uid]=$password; + } else { + $this->users[$uid] = $password; return true; } } /** - * @brief delete a user - * @param $uid The username of the user to delete - * @returns true/false - * - * Deletes a user - */ - public function deleteUser( $uid ) { - if(isset($this->users[$uid])) { + * @brief delete a user + * @param string $uid The username of the user to delete + * @return bool + * + * Deletes a user + */ + public function deleteUser($uid) { + if (isset($this->users[$uid])) { unset($this->users[$uid]); return true; - }else{ + } else { return false; } } /** - * @brief Set password - * @param $uid The username - * @param $password The new password - * @returns true/false - * - * Change the password of a user - */ + * @brief Set password + * @param string $uid The username + * @param string $password The new password + * @return bool + * + * Change the password of a user + */ public function setPassword($uid, $password) { - if(isset($this->users[$uid])) { - $this->users[$uid]=$password; + if (isset($this->users[$uid])) { + $this->users[$uid] = $password; return true; - }else{ + } else { return false; } } /** - * @brief Check if the password is correct - * @param $uid The username - * @param $password The password - * @returns string - * - * Check if the password is correct without logging in the user - * returns the user id or false - */ + * @brief Check if the password is correct + * @param string $uid The username + * @param string $password The password + * @return string + * + * Check if the password is correct without logging in the user + * returns the user id or false + */ public function checkPassword($uid, $password) { - if(isset($this->users[$uid])) { - return ($this->users[$uid]==$password); - }else{ + if (isset($this->users[$uid])) { + return ($this->users[$uid] == $password); + } else { return false; } } /** - * @brief Get a list of all users - * @returns array with all uids - * - * Get a list of all users. - */ + * @brief Get a list of all users + * @param string $search + * @param int $limit + * @param int $offset + * @return array with all uids + * + * Get a list of all users. + */ public function getUsers($search = '', $limit = null, $offset = null) { return array_keys($this->users); } /** - * @brief check if a user exists - * @param string $uid the username - * @return boolean - */ + * @brief check if a user exists + * @param string $uid the username + * @return boolean + */ public function userExists($uid) { return isset($this->users[$uid]); } diff --git a/lib/user/manager.php b/lib/user/manager.php new file mode 100644 index 00000000000..d17cdf1a200 --- /dev/null +++ b/lib/user/manager.php @@ -0,0 +1,228 @@ +<?php + +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\User; + +use OC\Hooks\PublicEmitter; + +/** + * Class Manager + * + * Hooks available in scope \OC\User: + * - preSetPassword(\OC\User\User $user, string $password, string $recoverPassword) + * - postSetPassword(\OC\User\User $user, string $password, string $recoverPassword) + * - preDelete(\OC\User\User $user) + * - postDelete(\OC\User\User $user) + * - preCreateUser(string $uid, string $password) + * - postCreateUser(\OC\User\User $user, string $password) + * + * @package OC\User + */ +class Manager extends PublicEmitter { + /** + * @var \OC_User_Backend[] $backends + */ + private $backends = array(); + + private $cachedUsers = array(); + + public function __construct() { + $cachedUsers = $this->cachedUsers; + $this->listen('\OC\User', 'postDelete', function ($user) use (&$cachedUsers) { + $i = array_search($user, $cachedUsers); + if ($i !== false) { + unset($cachedUsers[$i]); + } + }); + } + + /** + * register a user backend + * + * @param \OC_User_Backend $backend + */ + public function registerBackend($backend) { + $this->backends[] = $backend; + } + + /** + * remove a user backend + * + * @param \OC_User_Backend $backend + */ + public function removeBackend($backend) { + $this->cachedUsers = array(); + if (($i = array_search($backend, $this->backends)) !== false) { + unset($this->backends[$i]); + } + } + + /** + * remove all user backends + */ + public function clearBackends() { + $this->cachedUsers = array(); + $this->backends = array(); + } + + /** + * get a user by user id + * + * @param string $uid + * @return \OC\User\User + */ + public function get($uid) { + if (isset($this->cachedUsers[$uid])) { //check the cache first to prevent having to loop over the backends + return $this->cachedUsers[$uid]; + } + foreach ($this->backends as $backend) { + if ($backend->userExists($uid)) { + return $this->getUserObject($uid, $backend); + } + } + return null; + } + + /** + * get or construct the user object + * + * @param string $uid + * @param \OC_User_Backend $backend + * @return \OC\User\User + */ + protected function getUserObject($uid, $backend) { + if (isset($this->cachedUsers[$uid])) { + return $this->cachedUsers[$uid]; + } + $this->cachedUsers[$uid] = new User($uid, $backend, $this); + return $this->cachedUsers[$uid]; + } + + /** + * check if a user exists + * + * @param string $uid + * @return bool + */ + public function userExists($uid) { + $user = $this->get($uid); + return ($user !== null); + } + + /** + * search by user id + * + * @param string $pattern + * @param int $limit + * @param int $offset + * @return \OC\User\User[] + */ + public function search($pattern, $limit = null, $offset = null) { + $users = array(); + foreach ($this->backends as $backend) { + $backendUsers = $backend->getUsers($pattern, $limit, $offset); + if (is_array($backendUsers)) { + foreach ($backendUsers as $uid) { + $users[] = $this->getUserObject($uid, $backend); + if (!is_null($limit)) { + $limit--; + } + if (!is_null($offset) and $offset > 0) { + $offset--; + } + + } + } + } + + usort($users, function ($a, $b) { + /** + * @var \OC\User\User $a + * @var \OC\User\User $b + */ + return strcmp($a->getUID(), $b->getUID()); + }); + return $users; + } + + /** + * search by displayName + * + * @param string $pattern + * @param int $limit + * @param int $offset + * @return \OC\User\User[] + */ + public function searchDisplayName($pattern, $limit = null, $offset = null) { + $users = array(); + foreach ($this->backends as $backend) { + $backendUsers = $backend->getDisplayNames($pattern, $limit, $offset); + if (is_array($backendUsers)) { + foreach ($backendUsers as $uid => $displayName) { + $users[] = $this->getUserObject($uid, $backend); + if (!is_null($limit)) { + $limit--; + } + if (!is_null($offset) and $offset > 0) { + $offset--; + } + + } + } + } + + usort($users, function ($a, $b) { + /** + * @var \OC\User\User $a + * @var \OC\User\User $b + */ + return strcmp($a->getDisplayName(), $b->getDisplayName()); + }); + return $users; + } + + /** + * @param string $uid + * @param string $password + * @throws \Exception + * @return bool | \OC\User\User the created user of false + */ + public function createUser($uid, $password) { + // Check the name for bad characters + // Allowed are: "a-z", "A-Z", "0-9" and "_.@-" + if (preg_match('/[^a-zA-Z0-9 _\.@\-]/', $uid)) { + throw new \Exception('Only the following characters are allowed in a username:' + . ' "a-z", "A-Z", "0-9", and "_.@-"'); + } + // No empty username + if (trim($uid) == '') { + throw new \Exception('A valid username must be provided'); + } + // No empty password + if (trim($password) == '') { + throw new \Exception('A valid password must be provided'); + } + + // Check if user already exists + if ($this->userExists($uid)) { + throw new \Exception('The username is already being used'); + } + + $this->emit('\OC\User', 'preCreateUser', array($uid, $password)); + foreach ($this->backends as $backend) { + if ($backend->implementsActions(\OC_USER_BACKEND_CREATE_USER)) { + $backend->createUser($uid, $password); + $user = $this->getUserObject($uid, $backend); + $this->emit('\OC\User', 'postCreateUser', array($user, $password)); + return $user; + } + } + return false; + } +} diff --git a/lib/user/session.php b/lib/user/session.php new file mode 100644 index 00000000000..cf93d9593af --- /dev/null +++ b/lib/user/session.php @@ -0,0 +1,173 @@ +<?php + +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\User; + +use OC\Hooks\Emitter; + +/** + * Class Session + * + * Hooks available in scope \OC\User: + * - preSetPassword(\OC\User\User $user, string $password, string $recoverPassword) + * - postSetPassword(\OC\User\User $user, string $password, string $recoverPassword) + * - preDelete(\OC\User\User $user) + * - postDelete(\OC\User\User $user) + * - preCreateUser(string $uid, string $password) + * - postCreateUser(\OC\User\User $user) + * - preLogin(string $user, string $password) + * - postLogin(\OC\User\User $user) + * - logout() + * + * @package OC\User + */ +class Session implements Emitter { + /** + * @var \OC\User\Manager $manager + */ + private $manager; + + /** + * @var \OC\Session\Session $session + */ + private $session; + + /** + * @var \OC\User\User $activeUser + */ + protected $activeUser; + + /** + * @param \OC\User\Manager $manager + * @param \OC\Session\Session $session + */ + public function __construct($manager, $session) { + $this->manager = $manager; + $this->session = $session; + } + + /** + * @param string $scope + * @param string $method + * @param callable $callback + */ + public function listen($scope, $method, $callback) { + $this->manager->listen($scope, $method, $callback); + } + + /** + * @param string $scope optional + * @param string $method optional + * @param callable $callback optional + */ + public function removeListener($scope = null, $method = null, $callback = null) { + $this->manager->removeListener($scope, $method, $callback); + } + + /** + * get the manager object + * + * @return \OC\User\Manager + */ + public function getManager() { + return $this->manager; + } + + /** + * set the currently active user + * + * @param \OC\User\User $user + */ + public function setUser($user) { + if (is_null($user)) { + $this->session->remove('user_id'); + } else { + $this->session->set('user_id', $user->getUID()); + } + $this->activeUser = $user; + } + + /** + * get the current active user + * + * @return \OC\User\User + */ + public function getUser() { + if ($this->activeUser) { + return $this->activeUser; + } else { + $uid = $this->session->get('user_id'); + if ($uid) { + $this->activeUser = $this->manager->get($uid); + return $this->activeUser; + } else { + return null; + } + } + } + + /** + * try to login with the provided credentials + * + * @param string $uid + * @param string $password + * @return bool + */ + public function login($uid, $password) { + $this->manager->emit('\OC\User', 'preLogin', array($uid, $password)); + $user = $this->manager->get($uid); + if ($user) { + $result = $user->checkPassword($password); + if ($result and $user->isEnabled()) { + $this->setUser($user); + $this->manager->emit('\OC\User', 'postLogin', array($user, $password)); + return true; + } else { + return false; + } + } else { + return false; + } + } + + /** + * logout the user from the session + */ + public function logout() { + $this->manager->emit('\OC\User', 'logout'); + $this->setUser(null); + $this->unsetMagicInCookie(); + } + + /** + * Set cookie value to use in next page load + * + * @param string $username username to be set + * @param string $token + */ + public function setMagicInCookie($username, $token) { + $secure_cookie = \OC_Config::getValue("forcessl", false); //TODO: DI for cookies and OC_Config + $expires = time() + \OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15); + setcookie("oc_username", $username, $expires, \OC::$WEBROOT, '', $secure_cookie); + setcookie("oc_token", $token, $expires, \OC::$WEBROOT, '', $secure_cookie, true); + setcookie("oc_remember_login", true, $expires, \OC::$WEBROOT, '', $secure_cookie); + } + + /** + * Remove cookie for "remember username" + */ + public function unsetMagicInCookie() { + unset($_COOKIE["oc_username"]); //TODO: DI + unset($_COOKIE["oc_token"]); + unset($_COOKIE["oc_remember_login"]); + setcookie("oc_username", null, -1); + setcookie("oc_token", null, -1); + setcookie("oc_remember_login", null, -1); + } +} diff --git a/lib/user/user.php b/lib/user/user.php new file mode 100644 index 00000000000..55d7848a979 --- /dev/null +++ b/lib/user/user.php @@ -0,0 +1,197 @@ +<?php + +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\User; + +use OC\Hooks\Emitter; + +class User { + /** + * @var string $uid + */ + private $uid; + + /** + * @var string $displayName + */ + private $displayName; + + /** + * @var \OC_User_Backend $backend + */ + private $backend; + + /** + * @var bool $enabled + */ + private $enabled; + + /** + * @var Emitter | Manager $emitter + */ + private $emitter; + + /** + * @param string $uid + * @param \OC_User_Backend $backend + * @param Emitter $emitter + */ + public function __construct($uid, $backend, $emitter = null) { + $this->uid = $uid; + if ($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) { + $this->displayName = $backend->getDisplayName($uid); + } else { + $this->displayName = $uid; + } + $this->backend = $backend; + $this->emitter = $emitter; + $enabled = \OC_Preferences::getValue($uid, 'core', 'enabled', 'true'); //TODO: DI for OC_Preferences + $this->enabled = ($enabled === 'true'); + } + + /** + * get the user id + * + * @return string + */ + public function getUID() { + return $this->uid; + } + + /** + * get the displayname for the user, if no specific displayname is set it will fallback to the user id + * + * @return string + */ + public function getDisplayName() { + return $this->displayName; + } + + /** + * set the displayname for the user + * + * @param string $displayName + * @return bool + */ + public function setDisplayName($displayName) { + if ($this->canChangeDisplayName()) { + $this->displayName = $displayName; + $result = $this->backend->setDisplayName($this->uid, $displayName); + return $result !== false; + } else { + return false; + } + } + + /** + * Delete the user + * + * @return bool + */ + public function delete() { + if ($this->emitter) { + $this->emitter->emit('\OC\User', 'preDelete', array($this)); + } + $result = $this->backend->deleteUser($this->uid); + if ($this->emitter) { + $this->emitter->emit('\OC\User', 'postDelete', array($this)); + } + return !($result === false); + } + + /** + * Check if the password is valid for the user + * + * @param $password + * @return bool + */ + public function checkPassword($password) { + if ($this->backend->implementsActions(\OC_USER_BACKEND_CHECK_PASSWORD)) { + $result = $this->backend->checkPassword($this->uid, $password); + if ($result !== false) { + $this->uid = $result; + } + return !($result === false); + } else { + return false; + } + } + + /** + * Set the password of the user + * + * @param string $password + * @param string $recoveryPassword for the encryption app to reset encryption keys + * @return bool + */ + public function setPassword($password, $recoveryPassword) { + if ($this->emitter) { + $this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword)); + } + if ($this->backend->implementsActions(\OC_USER_BACKEND_SET_PASSWORD)) { + $result = $this->backend->setPassword($this->uid, $password); + if ($this->emitter) { + $this->emitter->emit('\OC\User', 'postSetPassword', array($this, $password, $recoveryPassword)); + } + return !($result === false); + } else { + return false; + } + } + + /** + * get the users home folder to mount + * + * @return string + */ + public function getHome() { + if ($this->backend->implementsActions(\OC_USER_BACKEND_GET_HOME) and $home = $this->backend->getHome($this->uid)) { + return $home; + } + return \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $this->uid; //TODO switch to Config object once implemented + } + + /** + * check if the backend supports changing passwords + * + * @return bool + */ + public function canChangePassword() { + return $this->backend->implementsActions(\OC_USER_BACKEND_SET_PASSWORD); + } + + /** + * check if the backend supports changing display names + * + * @return bool + */ + public function canChangeDisplayName() { + return $this->backend->implementsActions(\OC_USER_BACKEND_SET_DISPLAYNAME); + } + + /** + * check if the user is enabled + * + * @return bool + */ + public function isEnabled() { + return $this->enabled; + } + + /** + * set the enabled status for the user + * + * @param bool $enabled + */ + public function setEnabled($enabled) { + $this->enabled = $enabled; + $enabled = ($enabled) ? 'true' : 'false'; + \OC_Preferences::setValue($this->uid, 'core', 'enabled', $enabled); + } +} diff --git a/lib/util.php b/lib/util.php index 581f35bc0ac..95af22ed0ee 100755 --- a/lib/util.php +++ b/lib/util.php @@ -1,4 +1,7 @@ <?php + +require_once 'Patchwork/PHP/Shim/Normalizer.php'; + /** * Class for utility functions * @@ -77,7 +80,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. Reset minor/patchlevel when // updating major/minor version number. - return array(5, 80, 04); + return array(5, 80, 05); } /** @@ -641,11 +644,10 @@ class OC_Util { /** * Check if the ownCloud server can connect to the internet */ - public static function isinternetconnectionworking() { - - // in case there is no internet connection on purpose there is no need to display a warning - if (!\OC_Config::getValue("has_internet_connection", true)) { - return true; + public static function isInternetConnectionWorking() { + // in case there is no internet connection on purpose return false + if (self::isInternetConnectionEnabled() === false) { + return false; } // try to connect to owncloud.org to see if http connections to the internet are possible. @@ -667,6 +669,13 @@ class OC_Util { } } + + /** + * Check if the connection to the internet is disabled on purpose + */ + public static function isInternetConnectionEnabled(){ + return \OC_Config::getValue("has_internet_connection", true); + } /** * clear all levels of output buffering @@ -823,5 +832,21 @@ class OC_Util { return $theme; } + /** + * Normalize a unicode string + * @param string $value a not normalized string + * @return bool|string + */ + public static function normalizeUnicode($value) { + if(class_exists('Patchwork\PHP\Shim\Normalizer')) { + $normalizedValue = \Patchwork\PHP\Shim\Normalizer::normalize($value); + if($normalizedValue === false) { + \OC_Log::write( 'core', 'normalizing failed for "' . $value . '"', \OC_Log::WARN); + } else { + $value = $normalizedValue; + } + } + return $value; + } } diff --git a/public.php b/public.php index 759e8e91619..0154b59cce3 100644 --- a/public.php +++ b/public.php @@ -1,20 +1,31 @@ <?php $RUNTIME_NOAPPS = true; -require_once 'lib/base.php'; -if (!isset($_GET['service'])) { - header('HTTP/1.0 404 Not Found'); - exit; -} -$file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service'])); -if(is_null($file)) { - header('HTTP/1.0 404 Not Found'); - exit; -} -$parts=explode('/', $file, 2); -$app=$parts[0]; +try { -OC_Util::checkAppEnabled($app); -OC_App::loadApp($app); + require_once 'lib/base.php'; + OC::checkMaintenanceMode(); + if (!isset($_GET['service'])) { + header('HTTP/1.0 404 Not Found'); + exit; + } + $file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service'])); + if(is_null($file)) { + header('HTTP/1.0 404 Not Found'); + exit; + } -require_once OC_App::getAppPath($app) .'/'. $parts[1]; + $parts=explode('/', $file, 2); + $app=$parts[0]; + + OC_Util::checkAppEnabled($app); + OC_App::loadApp($app); + + require_once OC_App::getAppPath($app) .'/'. $parts[1]; + +} catch (Exception $ex) { + //show the user a detailed error page + OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR); + \OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL); + OC_Template::printExceptionErrorPage($ex); +}
\ No newline at end of file diff --git a/remote.php b/remote.php index 7738de04f60..ec0f2ecef72 100644 --- a/remote.php +++ b/remote.php @@ -1,40 +1,49 @@ <?php $RUNTIME_NOAPPS = true; -require_once 'lib/base.php'; -$path_info = OC_Request::getPathInfo(); -if ($path_info === false || $path_info === '') { - OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); - exit; -} -if (!$pos = strpos($path_info, '/', 1)) { - $pos = strlen($path_info); -} -$service=substr($path_info, 1, $pos-1); -$file = OC_AppConfig::getValue('core', 'remote_' . $service); +try { -if(is_null($file)) { - OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); - exit; -} + require_once 'lib/base.php'; + $path_info = OC_Request::getPathInfo(); + if ($path_info === false || $path_info === '') { + OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); + exit; + } + if (!$pos = strpos($path_info, '/', 1)) { + $pos = strlen($path_info); + } + $service=substr($path_info, 1, $pos-1); -$file=ltrim($file, '/'); + $file = OC_AppConfig::getValue('core', 'remote_' . $service); -$parts=explode('/', $file, 2); -$app=$parts[0]; -switch ($app) { - case 'core': - $file = OC::$SERVERROOT .'/'. $file; - break; - default: - OC_Util::checkAppEnabled($app); - OC_App::loadApp($app); - if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { - $file = OC_App::getAppPath($app) .'/'. $parts[1]; - }else{ - $file = '/' . OC_App::getAppPath($app) .'/'. $parts[1]; - } - break; -} -$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/'; -require_once $file; + if(is_null($file)) { + OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); + exit; + } + + $file=ltrim($file, '/'); + + $parts=explode('/', $file, 2); + $app=$parts[0]; + switch ($app) { + case 'core': + $file = OC::$SERVERROOT .'/'. $file; + break; + default: + OC_Util::checkAppEnabled($app); + OC_App::loadApp($app); + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + $file = OC_App::getAppPath($app) .'/'. $parts[1]; + }else{ + $file = '/' . OC_App::getAppPath($app) .'/'. $parts[1]; + } + break; + } + $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/'; + require_once $file; + +} catch (Exception $ex) { + OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR); + \OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL); + OC_Template::printExceptionErrorPage($ex); +}
\ No newline at end of file diff --git a/settings/admin.php b/settings/admin.php index 035cef5bf95..db041ef889c 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -24,7 +24,7 @@ $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 )); $tmpl->assign('entries', $entries); $tmpl->assign('entriesremain', $entriesremain); $tmpl->assign('htaccessworking', $htaccessworking); -$tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking()); +$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false); $tmpl->assign('islocaleworking', OC_Util::issetlocaleworking()); $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking()); $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded()); diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index cb66c57c743..30877810550 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -28,17 +28,29 @@ if(is_null($userstatus)) { exit(); } -$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username); $recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' ); -$recoveryEnabledForUser = $util->recoveryEnabledForUser(); -if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword == '') { + +$validRecoveryPassword = false; +$recoveryPasswordSupported = false; + +if ($recoveryAdminEnabled) { + $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username); + $validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword); + $recoveryPasswordSupported = $util->recoveryEnabledForUser(); +} + +if ($recoveryPasswordSupported && $recoveryPassword == '') { OC_JSON::error(array("data" => array( "message" => "Please provide a admin recovery password, otherwise all user data will be lost" ))); -}elseif ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) { +} elseif ( $recoveryPasswordSupported && ! $validRecoveryPassword) { OC_JSON::error(array("data" => array( "message" => "Wrong admin recovery password. Please check the password and try again." ))); -}elseif(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) { - OC_JSON::success(array("data" => array( "username" => $username ))); -} -else{ - OC_JSON::error(array("data" => array( "message" => "Unable to change password" ))); +} else { // now we know that everything is file regarding the recovery password, let's try to change the password + $result = OC_User::setPassword($username, $password, $recoveryPassword); + if (!$result && $recoveryPasswordSupported) { + OC_JSON::error(array("data" => array( "message" => "Back-end doesn't support password change, but the users encryption key was successfully updated." ))); + } elseif (!$result && !$recoveryPasswordSupported) { + OC_JSON::error(array("data" => array( "message" => "Unable to change password" ))); + } else { + OC_JSON::success(array("data" => array( "username" => $username ))); + } } diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php index bf3a34f1472..8732c6518a8 100644 --- a/settings/ajax/removeuser.php +++ b/settings/ajax/removeuser.php @@ -21,5 +21,6 @@ if( OC_User::deleteUser( $username )) { OC_JSON::success(array("data" => array( "username" => $username ))); } else{ + $l = OC_L10N::get('core'); OC_JSON::error(array("data" => array( "message" => $l->t("Unable to delete user") ))); } diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php index e5cc8bde398..d20e64f2e0b 100644 --- a/settings/l10n/bg_BG.php +++ b/settings/l10n/bg_BG.php @@ -22,6 +22,7 @@ "Delete" => "Изтриване", "add group" => "нова група", "__language_name__" => "__language_name__", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "ВашиÑÑ‚ web Ñървър вÑе още не е удачно наÑтроен да позволÑва ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° файлове, защото WebDAV интерфейÑÑŠÑ‚ изглежда не работи.", "Please double check the <a href='%s'>installation guides</a>." => "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ повторна Ñправка Ñ <a href='%s'>ръководÑтвото за инÑталиране</a>.", "Cron" => "Крон", "Sharing" => "СподелÑне", diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php index 769c25d7bff..268fbc29964 100644 --- a/settings/l10n/ca.php +++ b/settings/l10n/ca.php @@ -102,6 +102,7 @@ "Login Name" => "Nom d'accés", "Create" => "Crea", "Admin Recovery Password" => "Recuperació de contrasenya d'administrador", +"Enter the recovery password in order to recover the users files during password change" => "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya", "Default Storage" => "Emmagatzemament per defecte", "Unlimited" => "Il·limitat", "Other" => "Un altre", diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php index 6fec132701b..c0668676ddd 100644 --- a/settings/l10n/cs_CZ.php +++ b/settings/l10n/cs_CZ.php @@ -101,6 +101,8 @@ "Use this address to connect to your ownCloud in your file manager" => "Použijte tuto adresu pro pÅ™ipojenà k vaÅ¡emu ownCloud skrze správce souborů", "Login Name" => "PÅ™ihlaÅ¡ovacà jméno", "Create" => "VytvoÅ™it", +"Admin Recovery Password" => "Heslo obnovy správce", +"Enter the recovery password in order to recover the users files during password change" => "Zadejte heslo obnovy pro obnovenà souborů uživatele pÅ™i zmÄ›nÄ› hesla", "Default Storage" => "Výchozà úložiÅ¡tÄ›", "Unlimited" => "NeomezenÄ›", "Other" => "Jiný", diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 2cf828e7342..928130f398e 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -101,6 +101,7 @@ "Use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden", "Login Name" => "Loginname", "Create" => "Anlegen", +"Admin Recovery Password" => "Admin-Wiederherstellungspasswort", "Default Storage" => "Standard-Speicher", "Unlimited" => "Unbegrenzt", "Other" => "Andere", diff --git a/settings/l10n/el.php b/settings/l10n/el.php index 3558ae72988..24f3a099ccf 100644 --- a/settings/l10n/el.php +++ b/settings/l10n/el.php @@ -101,6 +101,7 @@ "Use this address to connect to your ownCloud in your file manager" => "ΧÏήση αυτής της διεÏθυνσης για σÏνδεση στο ownCloud με τον διαχειÏιστή αÏχείων σας", "Login Name" => "Όνομα ΣÏνδεσης", "Create" => "ΔημιουÏγία", +"Admin Recovery Password" => "Κωδικός ΕπαναφοÏάς ΔιαχειÏιστή ", "Default Storage" => "Î ÏοκαθοÏισμÎνη Αποθήκευση ", "Unlimited" => "ΑπεÏιόÏιστο", "Other" => "Άλλο", diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php index 8a9e237e120..baf25a274b7 100644 --- a/settings/l10n/et_EE.php +++ b/settings/l10n/et_EE.php @@ -102,6 +102,7 @@ "Login Name" => "Kasutajanimi", "Create" => "Lisa", "Admin Recovery Password" => "Admin taasteparool", +"Enter the recovery password in order to recover the users files during password change" => "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus", "Default Storage" => "Vaikimisi maht", "Unlimited" => "Piiramatult", "Other" => "Muu", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 0067236bad1..2067fbc4c5d 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -101,6 +101,7 @@ "Use this address to connect to your ownCloud in your file manager" => "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers", "Login Name" => "Nom de la connexion", "Create" => "Créer", +"Admin Recovery Password" => "Récupération du mot de passe administrateur", "Default Storage" => "Support de stockage par défaut", "Unlimited" => "Illimité", "Other" => "Autre", diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php index 05f3dc07c4a..ee60aa82a27 100644 --- a/settings/l10n/gl.php +++ b/settings/l10n/gl.php @@ -94,14 +94,15 @@ "Display Name" => "Amosar o nome", "Email" => "Correo", "Your email address" => "O seu enderezo de correo", -"Fill in an email address to enable password recovery" => "Escriba un enderezo de correo para activar a recuperación do contrasinal", +"Fill in an email address to enable password recovery" => "Escriba un enderezo de correo para activar o contrasinal de recuperación", "Language" => "Idioma", "Help translate" => "Axude na tradución", "WebDAV" => "WebDAV", "Use this address to connect to your ownCloud in your file manager" => "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros", "Login Name" => "Nome de acceso", "Create" => "Crear", -"Admin Recovery Password" => "Recuperación do contrasinal do administrador", +"Admin Recovery Password" => "Contrasinal de recuperación do administrador", +"Enter the recovery password in order to recover the users files during password change" => "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal", "Default Storage" => "Almacenamento predeterminado", "Unlimited" => "Sen lÃmites", "Other" => "Outro", diff --git a/settings/l10n/he.php b/settings/l10n/he.php index 5aeba49dcf7..77c6d37fbbe 100644 --- a/settings/l10n/he.php +++ b/settings/l10n/he.php @@ -1,6 +1,8 @@ <?php $TRANSLATIONS = array( "Unable to load list from App Store" => "×œ× × ×™×ª×Ÿ לטעון רשימה מה־App Store", "Authentication error" => "שגי×ת הזדהות", +"Your display name has been changed." => "×©× ×”×ª×¦×•×’×” שלך הוחלף.", +"Unable to change display name" => "×œ× × ×™×ª×Ÿ ×œ×©× ×•×ª ×ת ×©× ×”×ª×¦×•×’×”", "Group already exists" => "הקבוצה כבר קיימת", "Unable to add group" => "×œ× × ×™×ª×Ÿ להוסיף קבוצה", "Could not enable app. " => "×œ× × ×™×ª×Ÿ להפעיל ×ת היישו×", @@ -13,18 +15,49 @@ "Admins can't remove themself from the admin group" => "×ž× ×”×œ×™× ×œ× ×™×›×•×œ×™× ×œ×”×¡×™×¨ ×ת ×¢×¦×ž× ×ž×§×‘×•×¦×ª ×”×ž× ×”×œ×™×", "Unable to add user to group %s" => "×œ× × ×™×ª×Ÿ להוסיף משתמש לקבוצה %s", "Unable to remove user from group %s" => "×œ× × ×™×ª×Ÿ להסיר משתמש מהקבוצה %s", +"Couldn't update app." => "×œ× × ×™×ª×Ÿ לעדכן ×ת היישו×.", +"Update to {appversion}" => "עדכון לגרסה {appversion}", "Disable" => "בטל", "Enable" => "הפעלה", +"Please wait...." => "× × ×œ×”×ž×ª×™×Ÿâ€¦", "Error" => "שגי××”", +"Updating...." => "מתבצע עדכון…", +"Error while updating app" => "×ירעה שגי××” בעת עדכון היישו×", +"Updated" => "מעודכן", "Saving..." => "שמירה…", +"deleted" => "× ×ž×—×§", "undo" => "ביטול", +"Unable to remove user" => "×œ× × ×™×ª×Ÿ להסיר ×ת המשתמש", "Groups" => "קבוצות", "Group Admin" => "×ž× ×”×œ הקבוצה", "Delete" => "מחיקה", +"add group" => "הוספת קבוצה", +"A valid username must be provided" => "יש לספק ×©× ×ž×©×ª×ž×© ×ª×§× ×™", +"Error creating user" => "יצירת המשתמש × ×›×©×œ×”", +"A valid password must be provided" => "יש לספק ססמה ×ª×§× ×™×ª", "__language_name__" => "עברית", "Security Warning" => "×זהרת ×בטחה", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "יתכן שתיקיית ×”× ×ª×•× ×™× ×•×”×§×‘×¦×™× ×©×œ×š × ×’×™×©×™× ×“×¨×š ×”××™× ×˜×¨× ×˜. קובץ ה־‎.htaccess שמסופק על ידי ownCloud ×›× ×¨××” ××™× ×• עובד. ×× ×• ×ž×ž×œ×™×¦×™× ×‘×—×•× ×œ×”×’×“×™×¨ ×ת שרת ×”××™× ×˜×¨× ×˜ שלך בדרך שבה תיקיית ×”× ×ª×•× ×™× ×œ× ×ª×”×™×” ×–×ž×™× ×” עוד ×ו להעביר ×ת תיקיית ×”× ×ª×•× ×™× ×ž×—×•×¥ לספריית העל של שרת ×”××™× ×˜×¨× ×˜.", +"Setup Warning" => "שגי×ת הגדרה", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "שרת ×”××™× ×˜×¨× ×˜ שלך ××™× ×• מוגדר לצורכי ×¡× ×›×¨×•×Ÿ ×§×‘×¦×™× ×¢×“×™×™×Ÿ כיוון ×©×ž× ×©×§ ×”Ö¾WebDAV ×›× ×¨××” ××™× ×• תקין.", +"Please double check the <a href='%s'>installation guides</a>." => "× × ×œ×¢×™×™×Ÿ שוב ב<a href='%s'>מדריכי ×”×”×ª×§× ×”</a>.", +"Module 'fileinfo' missing" => "המודול „fileinfo“ חסר", +"Internet connection not working" => "החיבור ל××™× ×˜×¨× ×˜ ××™× ×• פעיל", +"Cron" => "Cron", +"Execute one task with each page loaded" => "יש להפעיל משימה ×חת ×¢× ×›×œ עמוד ×©× ×˜×¢×Ÿ", +"Sharing" => "שיתוף", +"Enable Share API" => "הפעלת API השיתוף", +"Allow apps to use the Share API" => "ל×פשר ×œ×™×™×©×•× ×œ×”×©×ª×ž×© ב־API השיתוף", +"Allow links" => "ל×פשר קישורי×", +"Allow users to share items to the public with links" => "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¤×¨×™×˜×™× ", +"Allow resharing" => "ל×פשר שיתוף מחדש", +"Allow users to share items shared with them again" => "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ הל××” ×¤×¨×™×˜×™× ×©×©×•×ª×¤×• ×ת×", +"Allow users to share with anyone" => "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¢× ×›×œ ×חד", +"Allow users to only share with users in their groups" => "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¢× ×ž×©×ª×ž×©×™× ×‘×§×‘×•×¦×•×ª ×©×œ×”× ×‘×œ×‘×“", +"Security" => "×בטחה", +"Enforce HTTPS" => "ל×לץ HTTPS", "Log" => "יומן", +"Log level" => "רמת הדיווח", "More" => "יותר", "Less" => "פחות", "Version" => "גרס×", @@ -39,21 +72,33 @@ "Administrator Documentation" => "תיעוד ×ž× ×”×œ×™×", "Online Documentation" => "תיעוד מקוון", "Forum" => "פורו×", +"Bugtracker" => "עוקב תקלות", "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" => "השג ×ת ×”×פליקציות על ×ž× ×ª ×œ×¡× ×›×¨×Ÿ ×ת ×”×§×‘×¦×™× ×©×œ×š", +"Show First Run Wizard again" => "הצגת ×שף ההפעלה הר××©×•× ×™×ª שוב", "Password" => "סיסמ×", "Your password was changed" => "הססמה שלך הוחלפה", "Unable to change your password" => "×œ× × ×™×ª×Ÿ ×œ×©× ×•×ª ×ת הססמה שלך", "Current password" => "ססמה × ×•×›×—×™×ª", "New password" => "ססמה חדשה", "Change password" => "×©×™× ×•×™ ססמה", +"Display Name" => "×©× ×ª×¦×•×’×”", "Email" => "דו×ר ××œ×§×˜×¨×•× ×™", "Your email address" => "כתובת הדו×״ל שלך", "Fill in an email address to enable password recovery" => "× × ×œ×ž×œ× ×ת כתובת הדו×״ל שלך כדי ל×פשר שחזור ססמה", "Language" => "פה", "Help translate" => "עזרה בתרגו×", +"WebDAV" => "WebDAV", "Use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת ×–×ת על ×ž× ×ª להתחבר ×ל ownCloud דרך סייר קבצי×.", +"Login Name" => "×©× ×›× ×™×¡×”", "Create" => "יצירה", -"Other" => "×חר" +"Admin Recovery Password" => "ססמת השחזור של ×”×ž× ×”×œ", +"Default Storage" => "×חסון בררת המחדל", +"Unlimited" => "×œ×œ× ×”×’×‘×œ×”", +"Other" => "×חר", +"Storage" => "×חסון", +"change display name" => "החלפת ×©× ×”×ª×¦×•×’×”", +"set new password" => "הגדרת ססמה חדשה", +"Default" => "בררת מחדל" ); diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php index 70cbf3d1365..550796c3c79 100644 --- a/settings/l10n/hu_HU.php +++ b/settings/l10n/hu_HU.php @@ -37,12 +37,12 @@ "A valid password must be provided" => "Érvényes jelszót kell megadnia", "__language_name__" => "__language_name__", "Security Warning" => "Biztonsági figyelmeztetés", -"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Az adatkönytára és az itt levÅ‘ fájlok valószÃnűleg elérhetÅ‘k az internetrÅ‘l. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár nem legyen közvetlenül kÃvülrÅ‘l elérhetÅ‘, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kÃvülre.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Az adatkönytára és az itt levÅ‘ fájlok valószÃnűleg elérhetÅ‘k az internetrÅ‘l. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kÃvülrÅ‘l elérhetÅ‘, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kÃvülre.", "Setup Warning" => "A beállÃtással kapcsolatos figyelmeztetés", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelÅ‘en beállÃtva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.", "Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepÃtési útmutatót</a>.", "Module 'fileinfo' missing" => "A 'fileinfo' modul hiányzik", -"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "A 'fileinfo' PHP modul hiányzik. ErÅ‘sen javasolt ennek a modulnak az telepÃtése, ha az ember jó eredményt szeretne a MIME-tÃpusok felismerésében.", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "A 'fileinfo' PHP modul hiányzik. ErÅ‘sen javasolt ennek a modulnak a telepÃtése a MIME-tÃpusok felismerésének eredményessé tételéhez.", "Locale not working" => "A nyelvi lokalizáció nem működik", "This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ezen az ownCloud kiszolgálón nem használható a %s nyelvi beállÃtás. Ez azt jelenti, hogy a fájlnevekben gond lehet bizonyos karakterekkel. Nyomatékosan ajánlott, hogy telepÃtse a szükséges csomagokat annak érdekében, hogy a rendszer támogassa a %s beállÃtást.", "Internet connection not working" => "Az internet kapcsolat nem működik", diff --git a/settings/l10n/is.php b/settings/l10n/is.php index b3172855c14..e8f64966ce7 100644 --- a/settings/l10n/is.php +++ b/settings/l10n/is.php @@ -15,8 +15,12 @@ "Unable to remove user from group %s" => "Ekki tókst að fjarlægja notanda úr hópnum %s", "Disable" => "Gera óvirkt", "Enable" => "Virkja", +"Please wait...." => "Andartak....", "Error" => "Villa", +"Updating...." => "Uppfæri...", +"Updated" => "Uppfært", "Saving..." => "Er að vista ...", +"deleted" => "eytt", "undo" => "afturkalla", "Groups" => "Hópar", "Group Admin" => "Hópstjóri", @@ -47,6 +51,7 @@ "Current password" => "Núverandi lykilorð", "New password" => "Nýtt lykilorð", "Change password" => "Breyta lykilorði", +"Display Name" => "VÃsa nafn", "Email" => "Netfang", "Your email address" => "Netfangið þitt", "Fill in an email address to enable password recovery" => "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði", diff --git a/settings/l10n/it.php b/settings/l10n/it.php index 38c22ea06de..c2ee1e4997f 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -102,6 +102,7 @@ "Login Name" => "Nome utente", "Create" => "Crea", "Admin Recovery Password" => "Password di ripristino amministrativa", +"Enter the recovery password in order to recover the users files during password change" => "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.", "Default Storage" => "Archiviazione predefinita", "Unlimited" => "Illimitata", "Other" => "Altro", diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php index ad42d3f085b..f9ef8e86829 100644 --- a/settings/l10n/ja_JP.php +++ b/settings/l10n/ja_JP.php @@ -102,6 +102,7 @@ "Login Name" => "ãƒã‚°ã‚¤ãƒ³å", "Create" => "作æˆ", "Admin Recovery Password" => "管ç†è€…復旧パスワード", +"Enter the recovery password in order to recover the users files during password change" => "パスワード変更ã®é–“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ•ァイルを回復ã™ã‚‹ãŸã‚ã«ã€ãƒªã‚«ãƒãƒªãƒ‘スワードを入力ã—ã¦ãã ã•ã„", "Default Storage" => "デフォルトストレージ", "Unlimited" => "無制é™", "Other" => "ãã®ä»–", diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php index dba1f92017e..225185686d0 100644 --- a/settings/l10n/lt_LT.php +++ b/settings/l10n/lt_LT.php @@ -27,6 +27,7 @@ "Select an App" => "Pasirinkite programÄ…", "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>", "Update" => "Atnaujinti", +"Get the apps to sync your files" => "Atsisiųskite programÄ—lių, kad sinchronizuotumÄ—te savo failus", "Password" => "Slaptažodis", "Your password was changed" => "JÅ«sų slaptažodis buvo pakeistas", "Unable to change your password" => "Neįmanoma pakeisti slaptažodžio", diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index 00de9e8b49a..bab1babd938 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -82,8 +82,8 @@ "Forum" => "Forum", "Bugtracker" => "Bugtracker", "Commercial Support" => "Commerciële ondersteuning", -"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "U heeft <strong>%s</strong> van de <strong>%s</strong> beschikbaren gebruikt", -"Get the apps to sync your files" => "Download de apps om bestanden te synchen", +"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>", +"Get the apps to sync your files" => "Download de apps om bestanden te syncen", "Show First Run Wizard again" => "Toon de Eerste start Wizard opnieuw", "Password" => "Wachtwoord", "Your password was changed" => "Je wachtwoord is veranderd", @@ -94,7 +94,7 @@ "Display Name" => "Weergavenaam", "Email" => "E-mailadres", "Your email address" => "Uw e-mailadres", -"Fill in an email address to enable password recovery" => "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren", +"Fill in an email address to enable password recovery" => "Vul een mailadres in om je wachtwoord te kunnen herstellen", "Language" => "Taal", "Help translate" => "Help met vertalen", "WebDAV" => "WebDAV", @@ -102,11 +102,11 @@ "Login Name" => "Inlognaam", "Create" => "Creëer", "Admin Recovery Password" => "Beheer herstel wachtwoord", -"Default Storage" => "Default opslag", +"Default Storage" => "Standaard Opslaglimiet", "Unlimited" => "Ongelimiteerd", "Other" => "Anders", -"Storage" => "Opslag", +"Storage" => "Opslaglimiet", "change display name" => "wijzig weergavenaam", "set new password" => "Instellen nieuw wachtwoord", -"Default" => "Default" +"Default" => "Standaard" ); diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php index 824940da583..e78e907cf86 100644 --- a/settings/l10n/pt_BR.php +++ b/settings/l10n/pt_BR.php @@ -102,6 +102,7 @@ "Login Name" => "Nome de Login", "Create" => "Criar", "Admin Recovery Password" => "Recuperação da Senha do Administrador", +"Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.", "Default Storage" => "Armazenamento Padrão", "Unlimited" => "Ilimitado", "Other" => "Outro", diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index e10e022e8e5..1531f6a361f 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -101,6 +101,7 @@ "Use this address to connect to your ownCloud in your file manager" => "ИÑпользуйте Ñтот URL Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð³Ð¾ менеджера к Вашему хранилищу", "Login Name" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ", "Create" => "Создать", +"Admin Recovery Password" => "ВоÑÑтановление ÐŸÐ°Ñ€Ð¾Ð»Ñ ÐдминиÑтратора", "Default Storage" => "Хранилище по-умолчанию", "Unlimited" => "Ðеограниченно", "Other" => "Другое", diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php index db4f63d2219..d0475c0263d 100644 --- a/settings/l10n/sv.php +++ b/settings/l10n/sv.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "Unable to load list from App Store" => "Kan inte ladda listan frÃ¥n App Store", "Authentication error" => "Fel vid autentisering", +"Your display name has been changed." => "Ditt visningsnamn har ändrats.", "Unable to change display name" => "Kan inte ändra visningsnamn", "Group already exists" => "Gruppen finns redan", "Unable to add group" => "Kan inte lägga till grupp", @@ -15,7 +16,7 @@ "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", -"Update to {appversion}" => "Uppdaterar till {appversion}", +"Update to {appversion}" => "Uppdatera till {appversion}", "Disable" => "Deaktivera", "Enable" => "Aktivera", "Please wait...." => "Var god vänta...", @@ -42,6 +43,10 @@ "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.", "Module 'fileinfo' missing" => "Modulen \"fileinfo\" saknas", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.", +"Locale not working" => "Locale fungerar inte", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denna ownCloud server kan inte sätta system locale till %s. Det innebär att det kan vara problem med vissa tecken i filnamnet. Vi vill verkligen rekommendera att du installerar nödvändiga paket pÃ¥ ditt system för att stödja %s.", +"Internet connection not working" => "Internetförbindelsen fungerar inte", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Den här ownCloudservern har ingen fungerande internetförbindelse. Det innebär att nÃ¥gra funktioner som t.ex. att montera externa lagringsplatser, meddelanden om uppdateringar eller installation av tredjepartsappar inte fungerar. Det kan vara sÃ¥ att det inte gÃ¥r att fÃ¥ fjärrÃ¥tkomst till filer och att e-post inte fungerar. Vi rekommenderar att du tillÃ¥ter internetÃ¥tkomst för den här servern om du vill ha tillgÃ¥ng till alla funktioner hos ownCloud", "Cron" => "Cron", "Execute one task with each page loaded" => "Exekvera en uppgift vid varje sidladdning", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php är registrerad som en webcron-tjänst. Anropa cron.php sidan i ownCloud en gÃ¥ng i minuten över HTTP.", @@ -56,12 +61,15 @@ "Allow users to share with anyone" => "TillÃ¥t delning med alla", "Allow users to only share with users in their groups" => "TillÃ¥t bara delning med användare i egna grupper", "Security" => "Säkerhet", +"Enforce HTTPS" => "Kräv HTTPS", +"Enforces the clients to connect to ownCloud via an encrypted connection." => "Tvingar klienter att ansluta till ownCloud via en krypterad förbindelse.", +"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Vänligen anslut till denna instans av ownCloud via HTTPS för att aktivera/avaktivera SSL", "Log" => "Logg", "Log level" => "NivÃ¥ pÃ¥ loggning", "More" => "Mer", "Less" => "Mindre", "Version" => "Version", -"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", "Add your App" => "Lägg till din applikation", "More Apps" => "Fler Appar", "Select an App" => "Välj en App", @@ -69,13 +77,13 @@ "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>", "Update" => "Uppdatera", "User Documentation" => "Användardokumentation", -"Administrator Documentation" => "Administratördokumentation", +"Administrator Documentation" => "Administratörsdokumentation", "Online Documentation" => "Onlinedokumentation", "Forum" => "Forum", "Bugtracker" => "Bugtracker", "Commercial Support" => "Kommersiell support", "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>", -"Get the apps to sync your files" => "Skaffa appar för att synkronisera dina filer", +"Get the apps to sync your files" => "Skaffa apparna för att synkronisera dina filer", "Show First Run Wizard again" => "Visa Första uppstarts-guiden igen", "Password" => "Lösenord", "Your password was changed" => "Ditt lösenord har ändrats", @@ -83,7 +91,7 @@ "Current password" => "Nuvarande lösenord", "New password" => "Nytt lösenord", "Change password" => "Ändra lösenord", -"Display Name" => "Visat namn", +"Display Name" => "Visningsnamn", "Email" => "E-post", "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", @@ -93,11 +101,13 @@ "Use this address to connect to your ownCloud in your file manager" => "Använd denna adress för att ansluta till ownCloud i din filhanterare", "Login Name" => "Inloggningsnamn", "Create" => "Skapa", +"Admin Recovery Password" => "Admin Ã¥terställningslösenord", +"Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the users files during password change", "Default Storage" => "Förvald lagring", "Unlimited" => "Obegränsad", "Other" => "Annat", "Storage" => "Lagring", -"change display name" => "ändra visat namn", +"change display name" => "ändra visningsnamn", "set new password" => "ange nytt lösenord", "Default" => "Förvald" ); diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index 0a803d64ec0..e694b627afd 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -101,6 +101,7 @@ "Use this address to connect to your ownCloud in your file manager" => "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde baÄŸlanın", "Login Name" => "GiriÅŸ Adı", "Create" => "OluÅŸtur", +"Admin Recovery Password" => "Yönetici kurtarma parolası", "Default Storage" => "Varsayılan Depolama", "Unlimited" => "Limitsiz", "Other" => "DiÄŸer", diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php index e2f59e72d0f..6e88d71fe44 100644 --- a/settings/l10n/zh_CN.GB2312.php +++ b/settings/l10n/zh_CN.GB2312.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "Unable to load list from App Store" => "ä¸èƒ½ä»ŽApp Store ä¸åŠ è½½åˆ—è¡¨", "Authentication error" => "验è¯é”™è¯¯", +"Your display name has been changed." => "您的显示å称已修改", "Unable to change display name" => "æ— æ³•æ›´æ”¹æ˜¾ç¤ºåç§°", "Group already exists" => "群组已å˜åœ¨", "Unable to add group" => "æœªèƒ½æ·»åŠ ç¾¤ç»„", @@ -40,7 +41,10 @@ "Setup Warning" => "é…置注æ„", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "å› WebDAVæŽ¥å£æ•…障,您的网络æœåС噍好åƒå¹¶æœªå…è®¸æ–‡ä»¶åŒæ¥ã€‚", "Please double check the <a href='%s'>installation guides</a>." => "请åŒå‡»<a href='%s'>安装å‘导</a>。", +"Module 'fileinfo' missing" => "模å—“fileinfoâ€ä¸¢å¤±ã€‚", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 模å—“fileinfoâ€ä¸¢å¤±ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®æ‰“å¼€æ¤æ¨¡å—æ¥èŽ·å¾— mine 类型检测的最佳结果。", "Locale not working" => "区域设置未è¿ä½œ", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ownCloud æœåС噍ä¸èƒ½æŠŠç³»ç»ŸåŒºåŸŸè®¾ç½®åˆ° %s。这æ„å‘³ç€æ–‡ä»¶åå¯å†…å¯èƒ½å«æœ‰æŸäº›å¼•起问题的å—符。我们强烈建议在您的系统上安装必è¦çš„åŒ…æ¥æ”¯æŒâ€œ%sâ€ã€‚", "Internet connection not working" => "互è”网连接未è¿ä½œ", "Cron" => "Cron", "Execute one task with each page loaded" => "在æ¯ä¸ªé¡µé¢è½½å…¥æ—¶æ‰§è¡Œä¸€é¡¹ä»»åŠ¡", diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php index 1ec0b004c60..bb2553e4c67 100644 --- a/settings/l10n/zh_CN.php +++ b/settings/l10n/zh_CN.php @@ -101,6 +101,7 @@ "Use this address to connect to your ownCloud in your file manager" => "ç”¨è¯¥åœ°å€æ¥è¿žæŽ¥æ–‡ä»¶ç®¡ç†å™¨ä¸çš„ ownCloud", "Login Name" => "登录åç§°", "Create" => "创建", +"Admin Recovery Password" => "ç®¡ç†æ¢å¤å¯†ç ", "Default Storage" => "默认å˜å‚¨", "Unlimited" => "æ— é™", "Other" => "其它", diff --git a/settings/templates/personal.php b/settings/templates/personal.php index f0002c505c8..b11f1912f51 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -4,12 +4,6 @@ * See the COPYING-README file. */?> -<div id="quota" class="personalblock"><div style="width:<?php p($_['usage_relative']);?>%;"> - <p id="quotatext"><?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', - array($_['usage'], $_['total_space'])));?></p> -</div></div> - - <div class="clientsbox"> <h2><?php p($l->t('Get the apps to sync your files'));?></h2> @@ -28,6 +22,15 @@ </div> +<div id="quota" class="personalblock"> + <div style="width:<?php p($_['usage_relative']);?>%;"> + <p id="quotatext"> + <?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', + array($_['usage'], $_['total_space'])));?> + </p> + </div> +</div> + <?php if($_['passwordChangeSupported']) { diff --git a/settings/templates/users.php b/settings/templates/users.php index a6df85983dd..b0637814f5d 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -31,7 +31,11 @@ $_['subadmingroups'] = array_flip($items); </form> <?php if((bool)$_['recoveryAdminEnabled']): ?> <div class="recoveryPassword"> - <input id="recoveryPassword" type="password" placeholder="<?php p($l->t('Admin Recovery Password'))?>" /> + <input id="recoveryPassword" + type="password" + placeholder="<?php p($l->t('Admin Recovery Password'))?>" + title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>" + alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/> </div> <?php endif; ?> <div class="quota"> diff --git a/status.php b/status.php index 9d6ac87c671..bac01c11b28 100644 --- a/status.php +++ b/status.php @@ -23,13 +23,20 @@ $RUNTIME_NOAPPS = true; //no apps, yet -require_once 'lib/base.php'; +try { -if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='false'; -$values=array( - 'installed'=>$installed, - 'version'=>implode('.', OC_Util::getVersion()), - 'versionstring'=>OC_Util::getVersionString(), - 'edition'=>OC_Util::getEditionString()); + require_once 'lib/base.php'; -echo(json_encode($values)); + if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='false'; + $values=array( + 'installed'=>$installed, + 'version'=>implode('.', OC_Util::getVersion()), + 'versionstring'=>OC_Util::getVersionString(), + 'edition'=>OC_Util::getEditionString()); + + echo(json_encode($values)); + +} catch (Exception $ex) { + OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR); + \OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL); +}
\ No newline at end of file diff --git a/tests/data/db_structure.xml b/tests/data/db_structure.xml index af2e5ce3439..8f6dc5e2ecd 100644 --- a/tests/data/db_structure.xml +++ b/tests/data/db_structure.xml @@ -9,7 +9,7 @@ <table> - <name>*dbprefix*contacts_addressbooks</name> + <name>*dbprefix*cntcts_addrsbks</name> <declaration> @@ -77,7 +77,7 @@ <table> - <name>*dbprefix*contacts_cards</name> + <name>*dbprefix*cntcts_cards</name> <declaration> diff --git a/tests/data/db_structure2.xml b/tests/data/db_structure2.xml index c1bbb550483..fc6fe0bba7d 100644 --- a/tests/data/db_structure2.xml +++ b/tests/data/db_structure2.xml @@ -9,7 +9,7 @@ <table> - <name>*dbprefix*contacts_addressbooks</name> + <name>*dbprefix*cntcts_addrsbks</name> <declaration> diff --git a/tests/lib/backgroundjob/dummyjoblist.php b/tests/lib/backgroundjob/dummyjoblist.php new file mode 100644 index 00000000000..d91d6b344b5 --- /dev/null +++ b/tests/lib/backgroundjob/dummyjoblist.php @@ -0,0 +1,131 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\BackgroundJob; + +class JobRun extends \Exception { +} + +/** + * Class DummyJobList + * + * in memory job list for testing purposes + */ +class DummyJobList extends \OC\BackgroundJob\JobList { + /** + * @var \OC\BackgroundJob\Job[] + */ + private $jobs = array(); + + private $last = 0; + + /** + * @param \OC\BackgroundJob\Job|string $job + * @param mixed $argument + */ + public function add($job, $argument = null) { + $job->setArgument($argument); + if (!$this->has($job, null)) { + $this->jobs[] = $job; + } + } + + /** + * @param \OC\BackgroundJob\Job|string $job + * @param mixed $argument + */ + public function remove($job, $argument = null) { + $index = array_search($job, $this->jobs); + if ($index !== false) { + unset($this->jobs[$index]); + } + } + + /** + * check if a job is in the list + * + * @param $job + * @param mixed $argument + * @return bool + */ + public function has($job, $argument) { + return array_search($job, $this->jobs) !== false; + } + + /** + * get all jobs in the list + * + * @return \OC\BackgroundJob\Job[] + */ + public function getAll() { + return $this->jobs; + } + + /** + * get the next job in the list + * + * @return \OC\BackgroundJob\Job + */ + public function getNext() { + if (count($this->jobs) > 0) { + if ($this->last < (count($this->jobs) - 1)) { + $i = $this->last + 1; + } else { + $i = 0; + } + return $this->jobs[$i]; + } else { + return null; + } + } + + /** + * set the job that was last ran + * + * @param \OC\BackgroundJob\Job $job + */ + public function setLastJob($job) { + $i = array_search($job, $this->jobs); + if ($i !== false) { + $this->last = $i; + } else { + $this->last = 0; + } + } + + /** + * @param int $id + * @return Job + */ + public function getById($id) { + foreach ($this->jobs as $job) { + if ($job->getId() === $id) { + return $job; + } + } + return null; + } + + /** + * get the id of the last ran job + * + * @return int + */ + public function getLastJob() { + return $this->last; + } + + /** + * set the lastRun of $job to now + * + * @param \OC\BackgroundJob\Job $job + */ + public function setLastRun($job) { + $job->setLastRun(time()); + } +} diff --git a/tests/lib/backgroundjob/queuedjob.php b/tests/lib/backgroundjob/queuedjob.php new file mode 100644 index 00000000000..1d373473cd7 --- /dev/null +++ b/tests/lib/backgroundjob/queuedjob.php @@ -0,0 +1,42 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\BackgroundJob; + +class TestQueuedJob extends \OC\BackgroundJob\QueuedJob { + public function run($argument) { + throw new JobRun(); //throw an exception so we can detect if this function is called + } +} + +class QueuedJob extends \PHPUnit_Framework_TestCase { + /** + * @var DummyJobList $jobList + */ + private $jobList; + /** + * @var \OC\BackgroundJob\TimedJob $job + */ + private $job; + + public function setup() { + $this->jobList = new DummyJobList(); + $this->job = new TestQueuedJob(); + $this->jobList->add($this->job); + } + + public function testJobShouldBeRemoved() { + try { + $this->assertTrue($this->jobList->has($this->job, null)); + $this->job->execute($this->jobList); + $this->fail("job should have been run"); + } catch (JobRun $e) { + $this->assertFalse($this->jobList->has($this->job, null)); + } + } +} diff --git a/tests/lib/backgroundjob/timedjob.php b/tests/lib/backgroundjob/timedjob.php new file mode 100644 index 00000000000..0af933afef8 --- /dev/null +++ b/tests/lib/backgroundjob/timedjob.php @@ -0,0 +1,68 @@ +<?php +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\BackgroundJob; + +class TestTimedJob extends \OC\BackgroundJob\TimedJob { + public function __construct() { + $this->setInterval(10); + } + + public function run($argument) { + throw new JobRun(); //throw an exception so we can detect if this function is called + } +} + +class TimedJob extends \PHPUnit_Framework_TestCase { + /** + * @var DummyJobList $jobList + */ + private $jobList; + /** + * @var \OC\BackgroundJob\TimedJob $job + */ + private $job; + + public function setup() { + $this->jobList = new DummyJobList(); + $this->job = new TestTimedJob(); + $this->jobList->add($this->job); + } + + public function testShouldRunAfterInterval() { + $this->job->setLastRun(time() - 12); + try { + $this->job->execute($this->jobList); + $this->fail("job should have run"); + } catch (JobRun $e) { + } + } + + public function testShouldNotRunWithinInterval() { + $this->job->setLastRun(time() - 5); + try { + $this->job->execute($this->jobList); + } catch (JobRun $e) { + $this->fail("job should not have run"); + } + } + + public function testShouldNotTwice() { + $this->job->setLastRun(time() - 15); + try { + $this->job->execute($this->jobList); + $this->fail("job should have run the first time"); + } catch (JobRun $e) { + try { + $this->job->execute($this->jobList); + } catch (JobRun $e) { + $this->fail("job should not have run the second time"); + } + } + } +} diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index 7da5a8b85c6..038cb21b257 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -22,7 +22,8 @@ class Test_Cache_File extends Test_Cache { private $user; - + private $datadir; + function skip() { //$this->skipUnless(OC_User::isLoggedIn()); } @@ -40,7 +41,11 @@ class Test_Cache_File extends Test_Cache { //set up temporary storage \OC\Files\Filesystem::clearMounts(); - \OC\Files\Filesystem::mount('\OC\Files\Storage\Temporary',array(),'/'); + $storage = new \OC\Files\Storage\Temporary(array()); + \OC\Files\Filesystem::mount($storage,array(),'/'); + $datadir = str_replace('local::', '', $storage->getId()); + $this->datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data'); + OC_Config::setValue('datadirectory', $datadir); OC_User::clearBackends(); OC_User::useBackend(new OC_User_Dummy()); @@ -60,5 +65,6 @@ class Test_Cache_File extends Test_Cache { public function tearDown() { OC_User::setUserId($this->user); + OC_Config::setValue('datadirectory', $this->datadir); } } diff --git a/tests/lib/db.php b/tests/lib/db.php index 440f3fb6bfd..afbdb413c3d 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -22,8 +22,8 @@ class Test_DB extends PHPUnit_Framework_TestCase { OC_DB::createDbFromStructure(self::$schema_file); $this->test_prefix = $r; - $this->table1 = $this->test_prefix.'contacts_addressbooks'; - $this->table2 = $this->test_prefix.'contacts_cards'; + $this->table1 = $this->test_prefix.'cntcts_addrsbks'; + $this->table2 = $this->test_prefix.'cntcts_cards'; $this->table3 = $this->test_prefix.'vcategory'; } @@ -33,38 +33,41 @@ class Test_DB extends PHPUnit_Framework_TestCase { } public function testQuotes() { - $query = OC_DB::prepare('SELECT `fullname` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?'); + $query = OC_DB::prepare('SELECT `fullname` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?'); $result = $query->execute(array('uri_1')); $this->assertTrue((bool)$result); $row = $result->fetchRow(); - $this->assertFalse($row); - $query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (?,?)'); + $this->assertFalse((bool)$row); //PDO returns false, MDB2 returns null + $query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (?,?)'); $result = $query->execute(array('fullname test', 'uri_1')); $this->assertTrue((bool)$result); - $query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?'); + $query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?'); $result = $query->execute(array('uri_1')); $this->assertTrue((bool)$result); $row = $result->fetchRow(); $this->assertArrayHasKey('fullname', $row); $this->assertEquals($row['fullname'], 'fullname test'); $row = $result->fetchRow(); - $this->assertFalse($row); + $this->assertFalse((bool)$row); //PDO returns false, MDB2 returns null } + /** + * @medium + */ public function testNOW() { - $query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (NOW(),?)'); + $query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (NOW(),?)'); $result = $query->execute(array('uri_2')); $this->assertTrue((bool)$result); - $query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?'); + $query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?'); $result = $query->execute(array('uri_2')); $this->assertTrue((bool)$result); } public function testUNIX_TIMESTAMP() { - $query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (UNIX_TIMESTAMP(),?)'); + $query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (UNIX_TIMESTAMP(),?)'); $result = $query->execute(array('uri_3')); $this->assertTrue((bool)$result); - $query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?'); + $query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?'); $result = $query->execute(array('uri_3')); $this->assertTrue((bool)$result); } @@ -88,7 +91,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { $this->assertTrue((bool)$result); } - $query = OC_DB::prepare('SELECT * FROM *PREFIX*'.$this->table3); + $query = OC_DB::prepare('SELECT * FROM `*PREFIX*'.$this->table3.'`'); $result = $query->execute(); $this->assertTrue((bool)$result); $this->assertEquals('4', $result->numRows()); @@ -100,10 +103,10 @@ class Test_DB extends PHPUnit_Framework_TestCase { $carddata = 'This is a vCard'; // Normal test to have same known data inserted. - $query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`, `uri`, `carddata`) VALUES (?, ?, ?)'); + $query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`, `uri`, `carddata`) VALUES (?, ?, ?)'); $result = $query->execute(array($fullname, $uri, $carddata)); $this->assertTrue((bool)$result); - $query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?'); + $query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?'); $result = $query->execute(array($uri)); $this->assertTrue((bool)$result); $row = $result->fetchRow(); @@ -119,7 +122,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { )); $this->assertTrue((bool)$result); - $query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?'); + $query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?'); $result = $query->execute(array($uri)); $this->assertTrue((bool)$result); $row = $result->fetchRow(); diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php index e20a04ef7fd..6631c929cf2 100644 --- a/tests/lib/dbschema.php +++ b/tests/lib/dbschema.php @@ -26,8 +26,8 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase { file_put_contents( self::$schema_file2, $content ); $this->test_prefix = $r; - $this->table1 = $this->test_prefix.'contacts_addressbooks'; - $this->table2 = $this->test_prefix.'contacts_cards'; + $this->table1 = $this->test_prefix.'cntcts_addrsbks'; + $this->table2 = $this->test_prefix.'cntcts_cards'; } public function tearDown() { @@ -36,6 +36,9 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase { } // everything in one test, they depend on each other + /** + * @medium + */ public function testSchema() { $this->doTestSchemaCreating(); $this->doTestSchemaChanging(); diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php index d8b6541bd0c..f272655925b 100644 --- a/tests/lib/files/cache/cache.php +++ b/tests/lib/files/cache/cache.php @@ -8,6 +8,8 @@ namespace Test\Files\Cache; +use PHPUnit_Framework_MockObject_MockObject; + class LongId extends \OC\Files\Storage\Temporary { public function getId() { return 'long:' . str_repeat('foo', 50) . parent::getId(); @@ -262,6 +264,89 @@ class Cache extends \PHPUnit_Framework_TestCase { $this->assertEquals(array(md5($storageId), 'foo'), \OC\Files\Cache\Cache::getById($id)); } + /** + * @brief this test show the bug resulting if we have no normalizer installed + */ + public function testWithoutNormalizer() { + // folder name "Schön" with U+00F6 (normalized) + $folderWith00F6 = "\x53\x63\x68\xc3\xb6\x6e"; + + // folder name "Schön" with U+0308 (un-normalized) + $folderWith0308 = "\x53\x63\x68\x6f\xcc\x88\x6e"; + + /** + * @var \OC\Files\Cache\Cache | PHPUnit_Framework_MockObject_MockObject $cacheMock + */ + $cacheMock = $this->getMock('\OC\Files\Cache\Cache', array('normalize'), array($this->storage), '', true); + + $cacheMock->expects($this->any()) + ->method('normalize') + ->will($this->returnArgument(0)); + + $data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory'); + + // put root folder + $this->assertFalse($cacheMock->get('folder')); + $this->assertGreaterThan(0, $cacheMock->put('folder', $data)); + + // put un-normalized folder + $this->assertFalse($cacheMock->get('folder/' .$folderWith0308)); + $this->assertGreaterThan(0, $cacheMock->put('folder/' .$folderWith0308, $data)); + + // get un-normalized folder by name + $unNormalizedFolderName = $cacheMock->get('folder/' .$folderWith0308); + + // check if database layer normalized the folder name (this should not happen) + $this->assertEquals($folderWith0308, $unNormalizedFolderName['name']); + + // put normalized folder + $this->assertFalse($cacheMock->get('folder/' . $folderWith00F6)); + $this->assertGreaterThan(0, $cacheMock->put('folder/' .$folderWith00F6, $data)); + + // this is our bug, we have two different hashes with the same name (Schön) + $this->assertEquals(2, count($cacheMock->getFolderContents('folder'))); + } + + /** + * @brief this test shows that there is no bug if we use the normalizer + */ + public function testWithNormalizer() { + + if(!class_exists('Patchwork\PHP\Shim\Normalizer')) { + $this->markTestSkipped('The 3rdparty Normalizer extension is not available.'); + return; + } + + // folder name "Schön" with U+00F6 (normalized) + $folderWith00F6 = "\x53\x63\x68\xc3\xb6\x6e"; + + // folder name "Schön" with U+0308 (un-normalized) + $folderWith0308 = "\x53\x63\x68\x6f\xcc\x88\x6e"; + + $data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory'); + + // put root folder + $this->assertFalse($this->cache->get('folder')); + $this->assertGreaterThan(0, $this->cache->put('folder', $data)); + + // put un-normalized folder + $this->assertFalse($this->cache->get('folder/' .$folderWith0308)); + $this->assertGreaterThan(0, $this->cache->put('folder/' .$folderWith0308, $data)); + + // get un-normalized folder by name + $unNormalizedFolderName = $this->cache->get('folder/' .$folderWith0308); + + // check if folder name was normalized + $this->assertEquals($folderWith00F6, $unNormalizedFolderName['name']); + + // put normalized folder + $this->assertTrue(is_array($this->cache->get('folder/' . $folderWith00F6))); + $this->assertGreaterThan(0, $this->cache->put('folder/' .$folderWith00F6, $data)); + + // at this point we should have only one folder named "Schön" + $this->assertEquals(1, count($this->cache->getFolderContents('folder'))); + } + public function tearDown() { $this->cache->clear(); } diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php index e43c86ed438..749b1ab75a3 100644 --- a/tests/lib/files/cache/watcher.php +++ b/tests/lib/files/cache/watcher.php @@ -29,6 +29,9 @@ class Watcher extends \PHPUnit_Framework_TestCase { } } + /** + * @medium + */ function testWatcher() { $storage = $this->getTestStorage(); $cache = $storage->getCache(); @@ -63,6 +66,9 @@ class Watcher extends \PHPUnit_Framework_TestCase { $this->assertFalse($cache->inCache('folder/bar2.txt')); } + /** + * @medium + */ public function testFileToFolder() { $storage = $this->getTestStorage(); $cache = $storage->getCache(); diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php index 6ce45e6178a..bef70cc725b 100644 --- a/tests/lib/files/filesystem.php +++ b/tests/lib/files/filesystem.php @@ -72,7 +72,7 @@ class Filesystem extends \PHPUnit_Framework_TestCase { $this->assertEquals('/path', \OC\Files\Filesystem::normalizePath('\path')); $this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo//bar/')); $this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo////bar')); - if (class_exists('Normalizer')) { + if (class_exists('Patchwork\PHP\Shim\Normalizer')) { $this->assertEquals("/foo/bar\xC3\xBC", \OC\Files\Filesystem::normalizePath("/foo/baru\xCC\x88")); } } diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index 01f9a9cca11..830913a91ad 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -33,6 +33,9 @@ class View extends \PHPUnit_Framework_TestCase { } } + /** + * @medium + */ public function testCacheAPI() { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); @@ -104,6 +107,9 @@ class View extends \PHPUnit_Framework_TestCase { $this->assertEquals(array(), $rootView->getDirectoryContent('/non/existing')); } + /** + * @medium + */ function testGetPath() { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); @@ -127,6 +133,9 @@ class View extends \PHPUnit_Framework_TestCase { $this->assertNull($folderView->getPath($id1)); } + /** + * @medium + */ function testMountPointOverwrite() { $storage1 = $this->getTestStorage(false); $storage2 = $this->getTestStorage(); @@ -170,6 +179,9 @@ class View extends \PHPUnit_Framework_TestCase { $this->assertEquals($textSize, $folderData[0]['size']); } + /** + * @medium + */ function testSearch() { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); @@ -217,6 +229,9 @@ class View extends \PHPUnit_Framework_TestCase { $this->assertEquals(3, count($folderView->searchByMime('text'))); } + /** + * @medium + */ function testWatcher() { $storage1 = $this->getTestStorage(); \OC\Files\Filesystem::mount($storage1, array(), '/'); @@ -234,6 +249,9 @@ class View extends \PHPUnit_Framework_TestCase { $this->assertEquals(3, $cachedData['size']); } + /** + * @medium + */ function testCopyBetweenStorages() { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); @@ -255,6 +273,9 @@ class View extends \PHPUnit_Framework_TestCase { $this->assertTrue($rootView->file_exists('/substorage/folder/bar.txt')); } + /** + * @medium + */ function testMoveBetweenStorages() { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); @@ -271,6 +292,9 @@ class View extends \PHPUnit_Framework_TestCase { $this->assertTrue($rootView->file_exists('anotherfolder/bar.txt')); } + /** + * @medium + */ function testTouch() { $storage = $this->getTestStorage(true, '\Test\Files\TemporaryNoTouch'); diff --git a/tests/lib/geo.php b/tests/lib/geo.php index 82e61608687..2c3611c092e 100644 --- a/tests/lib/geo.php +++ b/tests/lib/geo.php @@ -7,6 +7,10 @@ */ class Test_Geo extends PHPUnit_Framework_TestCase { + + /** + * @medium + */ function testTimezone() { $result = OC_Geo::timezone(3, 3); $expected = 'Africa/Porto-Novo'; diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php new file mode 100644 index 00000000000..40674424c96 --- /dev/null +++ b/tests/lib/user/backend.php @@ -0,0 +1,99 @@ +<?php +/** +* ownCloud +* +* @author Robin Appelman +* @copyright 2012 Robin Appelman icewind@owncloud.com +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +/** + * Abstract class to provide the basis of backend-specific unit test classes. + * + * All subclasses MUST assign a backend property in setUp() which implements + * user operations (add, remove, etc.). Test methods in this class will then be + * run on each separate subclass and backend therein. + * + * For an example see /tests/lib/user/dummy.php + */ + +abstract class Test_User_Backend extends PHPUnit_Framework_TestCase { + /** + * @var OC_User_Backend $backend + */ + protected $backend; + + /** + * get a new unique user name + * test cases can override this in order to clean up created user + * @return array + */ + public function getUser() { + return uniqid('test_'); + } + + public function testAddRemove() { + //get the number of groups we start with, in case there are exising groups + $startCount=count($this->backend->getUsers()); + + $name1=$this->getUser(); + $name2=$this->getUser(); + $this->backend->createUser($name1, ''); + $count=count($this->backend->getUsers())-$startCount; + $this->assertEquals(1, $count); + $this->assertTrue((array_search($name1, $this->backend->getUsers())!==false)); + $this->assertFalse((array_search($name2, $this->backend->getUsers())!==false)); + $this->backend->createUser($name2, ''); + $count=count($this->backend->getUsers())-$startCount; + $this->assertEquals(2, $count); + $this->assertTrue((array_search($name1, $this->backend->getUsers())!==false)); + $this->assertTrue((array_search($name2, $this->backend->getUsers())!==false)); + + $this->backend->deleteUser($name2); + $count=count($this->backend->getUsers())-$startCount; + $this->assertEquals(1, $count); + $this->assertTrue((array_search($name1, $this->backend->getUsers())!==false)); + $this->assertFalse((array_search($name2, $this->backend->getUsers())!==false)); + } + + public function testLogin() { + $name1=$this->getUser(); + $name2=$this->getUser(); + + $this->assertFalse($this->backend->userExists($name1)); + $this->assertFalse($this->backend->userExists($name2)); + + $this->backend->createUser($name1, 'pass1'); + $this->backend->createUser($name2, 'pass2'); + + $this->assertTrue($this->backend->userExists($name1)); + $this->assertTrue($this->backend->userExists($name2)); + + $this->assertTrue($this->backend->checkPassword($name1, 'pass1')); + $this->assertTrue($this->backend->checkPassword($name2, 'pass2')); + + $this->assertFalse($this->backend->checkPassword($name1, 'pass2')); + $this->assertFalse($this->backend->checkPassword($name2, 'pass1')); + + $this->assertFalse($this->backend->checkPassword($name1, 'dummy')); + $this->assertFalse($this->backend->checkPassword($name2, 'foobar')); + + $this->backend->setPassword($name1, 'newpass1'); + $this->assertFalse($this->backend->checkPassword($name1, 'pass1')); + $this->assertTrue($this->backend->checkPassword($name1, 'newpass1')); + $this->assertFalse($this->backend->checkPassword($name2, 'newpass1')); + } +} diff --git a/tests/lib/user/database.php b/tests/lib/user/database.php new file mode 100644 index 00000000000..fe7d87c44de --- /dev/null +++ b/tests/lib/user/database.php @@ -0,0 +1,44 @@ +<?php +/** +* ownCloud +* +* @author Robin Appelman +* @copyright 2012 Robin Appelman icewind@owncloud.com +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +class Test_User_Database extends Test_User_Backend { + /** + * get a new unique user name + * test cases can override this in order to clean up created user + * @return array + */ + public function getUser() { + $user=uniqid('test_'); + $this->users[]=$user; + return $user; + } + + public function setUp() { + $this->backend=new OC_User_Dummy(); + } + + public function tearDown() { + foreach($this->users as $user) { + $this->backend->deleteUser($user); + } + } +} diff --git a/tests/lib/user/dummy.php b/tests/lib/user/dummy.php new file mode 100644 index 00000000000..e417fd97603 --- /dev/null +++ b/tests/lib/user/dummy.php @@ -0,0 +1,27 @@ +<?php +/** +* ownCloud +* +* @author Robin Appelman +* @copyright 2012 Robin Appelman icewind@owncloud.com +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +class Test_User_Dummy extends Test_User_Backend { + public function setUp() { + $this->backend=new OC_User_Dummy(); + } +} diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php new file mode 100644 index 00000000000..bc49f6db4b2 --- /dev/null +++ b/tests/lib/user/manager.php @@ -0,0 +1,304 @@ +<?php + +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\User; + +class Manager extends \PHPUnit_Framework_TestCase { + public function testUserExistsSingleBackendExists() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(true)); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend); + + $this->assertTrue($manager->userExists('foo')); + } + + public function testUserExistsSingleBackendNotExists() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(false)); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend); + + $this->assertFalse($manager->userExists('foo')); + } + + public function testUserExistsNoBackends() { + $manager = new \OC\User\Manager(); + + $this->assertFalse($manager->userExists('foo')); + } + + public function testUserExistsTwoBackendsSecondExists() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1 + */ + $backend1 = $this->getMock('\OC_User_Dummy'); + $backend1->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(false)); + + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2 + */ + $backend2 = $this->getMock('\OC_User_Dummy'); + $backend2->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(true)); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend1); + $manager->registerBackend($backend2); + + $this->assertTrue($manager->userExists('foo')); + } + + public function testUserExistsTwoBackendsFirstExists() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1 + */ + $backend1 = $this->getMock('\OC_User_Dummy'); + $backend1->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(true)); + + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2 + */ + $backend2 = $this->getMock('\OC_User_Dummy'); + $backend2->expects($this->never()) + ->method('userExists'); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend1); + $manager->registerBackend($backend2); + + $this->assertTrue($manager->userExists('foo')); + } + + public function testGetOneBackendExists() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(true)); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend); + + $this->assertEquals('foo', $manager->get('foo')->getUID()); + } + + public function testGetOneBackendNotExists() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(false)); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend); + + $this->assertEquals(null, $manager->get('foo')); + } + + public function testSearchOneBackend() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('getUsers') + ->with($this->equalTo('fo')) + ->will($this->returnValue(array('foo', 'afoo'))); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend); + + $result = $manager->search('fo'); + $this->assertEquals(2, count($result)); + $this->assertEquals('afoo', $result[0]->getUID()); + $this->assertEquals('foo', $result[1]->getUID()); + } + + public function testSearchTwoBackendLimitOffset() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1 + */ + $backend1 = $this->getMock('\OC_User_Dummy'); + $backend1->expects($this->once()) + ->method('getUsers') + ->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1)) + ->will($this->returnValue(array('foo1', 'foo2'))); + + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2 + */ + $backend2 = $this->getMock('\OC_User_Dummy'); + $backend2->expects($this->once()) + ->method('getUsers') + ->with($this->equalTo('fo'), $this->equalTo(1), $this->equalTo(0)) + ->will($this->returnValue(array('foo3'))); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend1); + $manager->registerBackend($backend2); + + $result = $manager->search('fo', 3, 1); + $this->assertEquals(3, count($result)); + $this->assertEquals('foo1', $result[0]->getUID()); + $this->assertEquals('foo2', $result[1]->getUID()); + $this->assertEquals('foo3', $result[2]->getUID()); + } + + public function testCreateUserSingleBackendNotExists() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $backend->expects($this->once()) + ->method('createUser') + ->with($this->equalTo('foo'), $this->equalTo('bar')); + + $backend->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(false)); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend); + + $user = $manager->createUser('foo', 'bar'); + $this->assertEquals('foo', $user->getUID()); + } + + /** + * @expectedException \Exception + */ + public function testCreateUserSingleBackendExists() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $backend->expects($this->never()) + ->method('createUser'); + + $backend->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(true)); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend); + + $manager->createUser('foo', 'bar'); + } + + public function testCreateUserSingleBackendNotSupported() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(false)); + + $backend->expects($this->never()) + ->method('createUser'); + + $backend->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(false)); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend); + + $this->assertFalse($manager->createUser('foo', 'bar')); + } + + public function testCreateUserNoBackends() { + $manager = new \OC\User\Manager(); + + $this->assertFalse($manager->createUser('foo', 'bar')); + } + + /** + * @expectedException \Exception + */ + public function testCreateUserTwoBackendExists() { + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1 + */ + $backend1 = $this->getMock('\OC_User_Dummy'); + $backend1->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $backend1->expects($this->never()) + ->method('createUser'); + + $backend1->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(false)); + + /** + * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2 + */ + $backend2 = $this->getMock('\OC_User_Dummy'); + $backend2->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(true)); + + $backend2->expects($this->never()) + ->method('createUser'); + + $backend2->expects($this->once()) + ->method('userExists') + ->with($this->equalTo('foo')) + ->will($this->returnValue(true)); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend1); + $manager->registerBackend($backend2); + + $manager->createUser('foo', 'bar'); + } +} diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php new file mode 100644 index 00000000000..274e9e2831e --- /dev/null +++ b/tests/lib/user/session.php @@ -0,0 +1,155 @@ +<?php + +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\User; + +class Session extends \PHPUnit_Framework_TestCase { + public function testGetUser() { + $session = $this->getMock('\OC\Session\Memory', array(), array('')); + $session->expects($this->once()) + ->method('get') + ->with('user_id') + ->will($this->returnValue('foo')); + + $backend = $this->getMock('OC_User_Dummy'); + $backend->expects($this->once()) + ->method('userExists') + ->with('foo') + ->will($this->returnValue(true)); + + $manager = new \OC\User\Manager(); + $manager->registerBackend($backend); + + $userSession = new \OC\User\Session($manager, $session); + $user = $userSession->getUser(); + $this->assertEquals('foo', $user->getUID()); + } + + public function testSetUser() { + $session = $this->getMock('\OC\Session\Memory', array(), array('')); + $session->expects($this->once()) + ->method('set') + ->with('user_id', 'foo'); + + $manager = $this->getMock('\OC\User\Manager'); + + $backend = $this->getMock('OC_User_Dummy'); + + $user = $this->getMock('\OC\User\User', array(), array('foo', $backend)); + $user->expects($this->once()) + ->method('getUID') + ->will($this->returnValue('foo')); + + $userSession = new \OC\User\Session($manager, $session); + $userSession->setUser($user); + } + + public function testLoginValidPasswordEnabled() { + $session = $this->getMock('\OC\Session\Memory', array(), array('')); + $session->expects($this->once()) + ->method('set') + ->with('user_id', 'foo'); + + $manager = $this->getMock('\OC\User\Manager'); + + $backend = $this->getMock('OC_User_Dummy'); + + $user = $this->getMock('\OC\User\User', array(), array('foo', $backend)); + $user->expects($this->once()) + ->method('checkPassword') + ->with('bar') + ->will($this->returnValue(true)); + $user->expects($this->once()) + ->method('isEnabled') + ->will($this->returnValue(true)); + $user->expects($this->any()) + ->method('getUID') + ->will($this->returnValue('foo')); + + $manager->expects($this->once()) + ->method('get') + ->with('foo') + ->will($this->returnValue($user)); + + $userSession = new \OC\User\Session($manager, $session); + $userSession->login('foo', 'bar'); + $this->assertEquals($user, $userSession->getUser()); + } + + public function testLoginValidPasswordDisabled() { + $session = $this->getMock('\OC\Session\Memory', array(), array('')); + $session->expects($this->never()) + ->method('set'); + + $manager = $this->getMock('\OC\User\Manager'); + + $backend = $this->getMock('OC_User_Dummy'); + + $user = $this->getMock('\OC\User\User', array(), array('foo', $backend)); + $user->expects($this->once()) + ->method('checkPassword') + ->with('bar') + ->will($this->returnValue(true)); + $user->expects($this->once()) + ->method('isEnabled') + ->will($this->returnValue(false)); + + $manager->expects($this->once()) + ->method('get') + ->with('foo') + ->will($this->returnValue($user)); + + $userSession = new \OC\User\Session($manager, $session); + $userSession->login('foo', 'bar'); + } + + public function testLoginInValidPassword() { + $session = $this->getMock('\OC\Session\Memory', array(), array('')); + $session->expects($this->never()) + ->method('set'); + + $manager = $this->getMock('\OC\User\Manager'); + + $backend = $this->getMock('OC_User_Dummy'); + + $user = $this->getMock('\OC\User\User', array(), array('foo', $backend)); + $user->expects($this->once()) + ->method('checkPassword') + ->with('bar') + ->will($this->returnValue(false)); + $user->expects($this->never()) + ->method('isEnabled'); + + $manager->expects($this->once()) + ->method('get') + ->with('foo') + ->will($this->returnValue($user)); + + $userSession = new \OC\User\Session($manager, $session); + $userSession->login('foo', 'bar'); + } + + public function testLoginNonExisting() { + $session = $this->getMock('\OC\Session\Memory', array(), array('')); + $session->expects($this->never()) + ->method('set'); + + $manager = $this->getMock('\OC\User\Manager'); + + $backend = $this->getMock('OC_User_Dummy'); + + $manager->expects($this->once()) + ->method('get') + ->with('foo') + ->will($this->returnValue(null)); + + $userSession = new \OC\User\Session($manager, $session); + $userSession->login('foo', 'bar'); + } +} diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php new file mode 100644 index 00000000000..b0d170cbfc5 --- /dev/null +++ b/tests/lib/user/user.php @@ -0,0 +1,364 @@ +<?php + +/** + * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace Test\User; + +use OC\Hooks\PublicEmitter; + +class User extends \PHPUnit_Framework_TestCase { + public function testDisplayName() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Backend'); + $backend->expects($this->once()) + ->method('getDisplayName') + ->with($this->equalTo('foo')) + ->will($this->returnValue('Foo')); + + $backend->expects($this->any()) + ->method('implementsActions') + ->with($this->equalTo(\OC_USER_BACKEND_GET_DISPLAYNAME)) + ->will($this->returnValue(true)); + + $user = new \OC\User\User('foo', $backend); + $this->assertEquals('Foo', $user->getDisplayName()); + } + + public function testDisplayNameNotSupported() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Backend'); + $backend->expects($this->never()) + ->method('getDisplayName'); + + $backend->expects($this->any()) + ->method('implementsActions') + ->with($this->equalTo(\OC_USER_BACKEND_GET_DISPLAYNAME)) + ->will($this->returnValue(false)); + + $user = new \OC\User\User('foo', $backend); + $this->assertEquals('foo', $user->getDisplayName()); + } + + public function testSetPassword() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('setPassword') + ->with($this->equalTo('foo'), $this->equalTo('bar')); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnCallback(function ($actions) { + if ($actions === \OC_USER_BACKEND_SET_PASSWORD) { + return true; + } else { + return false; + } + })); + + $user = new \OC\User\User('foo', $backend); + $this->assertTrue($user->setPassword('bar','')); + } + + public function testSetPasswordNotSupported() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->never()) + ->method('setPassword'); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(false)); + + $user = new \OC\User\User('foo', $backend); + $this->assertFalse($user->setPassword('bar','')); + } + + public function testDelete() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('deleteUser') + ->with($this->equalTo('foo')); + + $user = new \OC\User\User('foo', $backend); + $this->assertTrue($user->delete()); + } + + public function testCheckPassword() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('checkPassword') + ->with($this->equalTo('foo'), $this->equalTo('bar')) + ->will($this->returnValue(true)); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnCallback(function ($actions) { + if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) { + return true; + } else { + return false; + } + })); + + $user = new \OC\User\User('foo', $backend); + $this->assertTrue($user->checkPassword('bar')); + } + + public function testCheckPasswordNotSupported() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->never()) + ->method('checkPassword'); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(false)); + + $user = new \OC\User\User('foo', $backend); + $this->assertFalse($user->checkPassword('bar')); + } + + public function testGetHome() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('getHome') + ->with($this->equalTo('foo')) + ->will($this->returnValue('/home/foo')); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnCallback(function ($actions) { + if ($actions === \OC_USER_BACKEND_GET_HOME) { + return true; + } else { + return false; + } + })); + + $user = new \OC\User\User('foo', $backend); + $this->assertEquals('/home/foo', $user->getHome()); + } + + public function testGetHomeNotSupported() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->never()) + ->method('getHome'); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(false)); + + $user = new \OC\User\User('foo', $backend); + $this->assertEquals(\OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/foo', $user->getHome()); + } + + public function testCanChangePassword() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnCallback(function ($actions) { + if ($actions === \OC_USER_BACKEND_SET_PASSWORD) { + return true; + } else { + return false; + } + })); + + $user = new \OC\User\User('foo', $backend); + $this->assertTrue($user->canChangePassword()); + } + + public function testCanChangePasswordNotSupported() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(false)); + + $user = new \OC\User\User('foo', $backend); + $this->assertFalse($user->canChangePassword()); + } + + public function testCanChangeDisplayName() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnCallback(function ($actions) { + if ($actions === \OC_USER_BACKEND_SET_DISPLAYNAME) { + return true; + } else { + return false; + } + })); + + $user = new \OC\User\User('foo', $backend); + $this->assertTrue($user->canChangeDisplayName()); + } + + public function testCanChangeDisplayNameNotSupported() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnValue(false)); + + $user = new \OC\User\User('foo', $backend); + $this->assertFalse($user->canChangeDisplayName()); + } + + public function testSetDisplayNameSupported() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Database'); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnCallback(function ($actions) { + if ($actions === \OC_USER_BACKEND_SET_DISPLAYNAME) { + return true; + } else { + return false; + } + })); + + $backend->expects($this->once()) + ->method('setDisplayName') + ->with('foo','Foo'); + + $user = new \OC\User\User('foo', $backend); + $this->assertTrue($user->setDisplayName('Foo')); + $this->assertEquals('Foo',$user->getDisplayName()); + } + + public function testSetDisplayNameNotSupported() { + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Database'); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnCallback(function ($actions) { + return false; + })); + + $backend->expects($this->never()) + ->method('setDisplayName'); + + $user = new \OC\User\User('foo', $backend); + $this->assertFalse($user->setDisplayName('Foo')); + $this->assertEquals('foo',$user->getDisplayName()); + } + + public function testSetPasswordHooks() { + $hooksCalled = 0; + $test = $this; + + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('setPassword'); + + /** + * @param \OC\User\User $user + * @param string $password + */ + $hook = function ($user, $password) use ($test, &$hooksCalled) { + $hooksCalled++; + $test->assertEquals('foo', $user->getUID()); + $test->assertEquals('bar', $password); + }; + + $emitter = new PublicEmitter(); + $emitter->listen('\OC\User', 'preSetPassword', $hook); + $emitter->listen('\OC\User', 'postSetPassword', $hook); + + $backend->expects($this->any()) + ->method('implementsActions') + ->will($this->returnCallback(function ($actions) { + if ($actions === \OC_USER_BACKEND_SET_PASSWORD) { + return true; + } else { + return false; + } + })); + + $user = new \OC\User\User('foo', $backend, $emitter); + + $user->setPassword('bar',''); + $this->assertEquals(2, $hooksCalled); + } + + public function testDeleteHooks() { + $hooksCalled = 0; + $test = $this; + + /** + * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend + */ + $backend = $this->getMock('\OC_User_Dummy'); + $backend->expects($this->once()) + ->method('deleteUser'); + + /** + * @param \OC\User\User $user + */ + $hook = function ($user) use ($test, &$hooksCalled) { + $hooksCalled++; + $test->assertEquals('foo', $user->getUID()); + }; + + $emitter = new PublicEmitter(); + $emitter->listen('\OC\User', 'preDelete', $hook); + $emitter->listen('\OC\User', 'postDelete', $hook); + + $user = new \OC\User\User('foo', $backend, $emitter); + $this->assertTrue($user->delete()); + $this->assertEquals(2, $hooksCalled); + } +} diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml index 23cd123edc6..71fe69c6aa8 100644 --- a/tests/phpunit-autotest.xml +++ b/tests/phpunit-autotest.xml @@ -1,14 +1,34 @@ <?xml version="1.0" encoding="utf-8" ?> -<phpunit bootstrap="bootstrap.php"> +<phpunit bootstrap="bootstrap.php" + strict="true" + timeoutForSmallTests="900" + timeoutForMediumTests="900" + timeoutForLargeTests="900" +> <testsuite name='ownCloud'> <directory suffix='.php'>lib/</directory> <file>apps.php</file> </testsuite> <!-- filters for code coverage --> - <whitelist processUncoveredFilesFromWhitelist="true"> - <directory suffix=".php">..</directory> - <exclude> - <directory suffix=".php">../3rdparty</directory> - </exclude> - </whitelist> + <filter> + <!-- whitelist processUncoveredFilesFromWhitelist="true" --> + <whitelist> + <directory suffix=".php">..</directory> + <exclude> + <directory suffix=".php">../3rdparty</directory> + <directory suffix=".php">../apps/files/l10n</directory> + <directory suffix=".php">../apps/files_external/l10n</directory> + <directory suffix=".php">../apps/files_external/3rdparty</directory> + <directory suffix=".php">../apps/files_versions/l10n</directory> + <directory suffix=".php">../apps/files_encryption/l10n</directory> + <directory suffix=".php">../apps/files_encryption/3rdparty</directory> + <directory suffix=".php">../apps/files_sharing/l10n</directory> + <directory suffix=".php">../apps/files_trashbin/l10n</directory> + <directory suffix=".php">../apps/user_ldap/l10n</directory> + <directory suffix=".php">../apps/user_webdavauth/l10n</directory> + <directory suffix=".php">../lib/MDB2</directory> + </exclude> + </whitelist> + </filter> </phpunit> + diff --git a/tests/phpunit.xml b/tests/phpunit.xml index f5a686c3020..510c38a3c8b 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -5,12 +5,16 @@ <file>apps.php</file> </testsuite> <!-- filters for code coverage --> - <whitelist processUncoveredFilesFromWhitelist="true"> - <directory suffix=".php">..</directory> - <exclude> - <directory suffix=".php">../3rdparty</directory> - </exclude> - </whitelist> + <filter> + <!-- whitelist processUncoveredFilesFromWhitelist="true" --> + <whitelist> + <directory suffix=".php">..</directory> + <exclude> + <directory suffix=".php">../3rdparty</directory> + <directory suffix=".php">../lib/MDB2</directory> + </exclude> + </whitelist> + </filter> <listeners> <listener class="PHPUnit_Util_Log_JSON"></listener> </listeners> |