diff options
603 files changed, 10198 insertions, 12262 deletions
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 98b72ae8329..01ab0df9724 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -3,7 +3,9 @@ $TRANSLATIONS = array( "Could not move %s - File with this name already exists" => "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel", "Could not move %s" => "Nem sikerült %s áthelyezése", "File name cannot be empty." => "A fájlnév nem lehet semmi.", +"\"%s\" is an invalid file name." => "\"%s\" érvénytelen, mint fájlnév.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'", +"The target folder has been moved or deleted." => "A célmappa törlődött, vagy áthelyezésre került.", "The name %s is already used in the folder %s. Please choose a different name." => "A %s név már létezik a %s mappában. Kérem válasszon másik nevet!", "Not a valid source" => "A kiinduló állomány érvénytelen", "Server is not allowed to open URLs, please check the server configuration" => "A kiszolgálón nincs engedélyezve URL-ek megnyitása, kérem ellenőrizze a beállításokat", @@ -26,7 +28,10 @@ $TRANSLATIONS = array( "Upload failed. Could not get file info." => "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el.", "Invalid directory." => "Érvénytelen mappa.", "Files" => "Fájlok", +"All files" => "Az összes állomány", "Unable to upload {filename} as it is a directory or has 0 bytes" => "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.", +"Total file size {size1} exceeds upload limit {size2}" => "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}", +"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.", "Upload cancelled." => "A feltöltést megszakítottuk.", "Could not get result from server." => "A kiszolgálótól nem kapható meg az eredmény.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.", @@ -41,6 +46,7 @@ $TRANSLATIONS = array( "Rename" => "Átnevezés", "Your download is being prepared. This might take some time if the files are big." => "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok.", "Pending" => "Folyamatban", +"Error moving file." => "Hiba történt a fájl áthelyezése közben.", "Error moving file" => "Az állomány áthelyezése nem sikerült.", "Error" => "Hiba", "Could not rename file" => "Az állomány nem nevezhető át", @@ -51,6 +57,7 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n mappa","%n mappa"), "_%n file_::_%n files_" => array("%n állomány","%n állomány"), "_Uploading %n file_::_Uploading %n files_" => array("%n állomány feltöltése","%n állomány feltöltése"), +"\"{name}\" is an invalid file name." => "\"{name}\" érvénytelen, mint fájlnév.", "Your storage is full, files can not be updated or synced anymore!" => "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.", "Your storage is almost full ({usedSpacePercent}%)" => "A tároló majdnem tele van ({usedSpacePercent}%)", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!", @@ -58,12 +65,13 @@ $TRANSLATIONS = array( "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani.", "{dirs} and {files}" => "{dirs} és {files}", "%s could not be renamed" => "%s átnevezése nem sikerült", +"Upload (max. %s)" => "Feltöltés (max. %s)", "File handling" => "Fájlkezelés", "Maximum upload size" => "Maximális feltölthető fájlméret", "max. possible: " => "max. lehetséges: ", "Save" => "Mentés", "WebDAV" => "WebDAV", -"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a címet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>", +"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a címet használja, ha <a href=\"%s\" target=\"_blank\">WebDAV-on keresztül szeretné elérni a fájljait</a>", "New" => "Új", "New text file" => "Új szöveges file", "Text file" => "Szövegfájl", @@ -76,6 +84,7 @@ $TRANSLATIONS = array( "Download" => "Letöltés", "Upload too large" => "A feltöltés túl nagy", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.", -"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!" +"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!", +"Currently scanning" => "Mappaellenőrzés: " ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php index 841aafb2661..4f920134bad 100644 --- a/apps/files_encryption/l10n/ar.php +++ b/apps/files_encryption/l10n/ar.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "المستخدمين التاليين لم يتم تعيين لهم التشفيير:", "Initial encryption started... This can take some time. Please wait." => "بدأ التشفير... من الممكن ان ياخذ بعض الوقت. يرجى الانتظار.", "Initial encryption running... Please try again later." => "جاري تفعيل التشفير المبدئي ، الرجاء المحاولة لاحقا", -"Go directly to your " => "انتقل مباشرة الى ", -"personal settings" => "اعدادات شخصية", "Encryption" => "التشفير", "Enable recovery key (allow to recover users files in case of password loss):" => "تفعيل استعادة المفتاح (سوف يمكنك من استعادة ملفات المستخدمين في حال فقدان كلمة المرور):", "Recovery key password" => "استعادة كلمة مرور المفتاح", diff --git a/apps/files_encryption/l10n/ast.php b/apps/files_encryption/l10n/ast.php index 505d5f361ee..b6e663cf219 100644 --- a/apps/files_encryption/l10n/ast.php +++ b/apps/files_encryption/l10n/ast.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Los siguientes usuarios nun se configuraron pal cifráu:", "Initial encryption started... This can take some time. Please wait." => "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera.", "Initial encryption running... Please try again later." => "Cifráu inicial en cursu... Inténtalo dempués.", -"Go directly to your " => "Dir direutamente a", -"personal settings" => "opciones personales", "Encryption" => "Cifráu", "Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);", "Recovery key password" => "Contraseña de clave de recuperación", diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php index 766a8205f7c..8ecd56c7b94 100644 --- a/apps/files_encryption/l10n/ca.php +++ b/apps/files_encryption/l10n/ca.php @@ -16,8 +16,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Els usuaris següents no estan configurats per a l'encriptació:", "Initial encryption started... This can take some time. Please wait." => "La encriptació inicial ha començat... Pot trigar una estona, espereu.", "Initial encryption running... Please try again later." => "encriptació inicial en procés... Proveu-ho més tard.", -"Go directly to your " => "Vés directament a", -"personal settings" => "arranjament personal", "Encryption" => "Xifrat", "Enable recovery key (allow to recover users files in case of password loss):" => "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):", "Recovery key password" => "Clau de recuperació de la contrasenya", diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php index de604182581..f622885d2c0 100644 --- a/apps/files_encryption/l10n/cs_CZ.php +++ b/apps/files_encryption/l10n/cs_CZ.php @@ -17,8 +17,7 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Následující uživatelé nemají nastavené šifrování:", "Initial encryption started... This can take some time. Please wait." => "Počáteční šifrování zahájeno... Toto může chvíli trvat. Počkejte prosím.", "Initial encryption running... Please try again later." => "Probíhá počáteční šifrování... Zkuste to prosím znovu později.", -"Go directly to your " => "Běžte přímo do vašeho", -"personal settings" => "osobní nastavení", +"Go directly to your %spersonal settings%s." => "Přejít přímo do svého %sosobního nastaveni%s.", "Encryption" => "Šifrování", "Enable recovery key (allow to recover users files in case of password loss):" => "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)", "Recovery key password" => "Heslo klíče pro obnovu", diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php index 4ae9a5883d5..16b34643d60 100644 --- a/apps/files_encryption/l10n/da.php +++ b/apps/files_encryption/l10n/da.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Følgende brugere er ikke sat op til kryptering:", "Initial encryption started... This can take some time. Please wait." => "Førstegangskryptering er påbegyndt... Dette kan tage nogen tid. Vent venligst.", "Initial encryption running... Please try again later." => "Kryptering foretages... Prøv venligst igen senere.", -"Go directly to your " => "Gå direkte til din ", -"personal settings" => "Personlige indstillinger", "Encryption" => "Kryptering", "Enable recovery key (allow to recover users files in case of password loss):" => "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):", "Recovery key password" => "Gendannelsesnøgle kodeord", diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php index 6bcb50aef5f..5f978b8bab5 100644 --- a/apps/files_encryption/l10n/de.php +++ b/apps/files_encryption/l10n/de.php @@ -17,8 +17,7 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:", "Initial encryption started... This can take some time. Please wait." => "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.", "Initial encryption running... Please try again later." => "Initiale Verschlüsselung läuft... Bitte versuche es später wieder.", -"Go directly to your " => "Direkt wechseln zu Deinem", -"personal settings" => "Private Einstellungen", +"Go directly to your %spersonal settings%s." => "Wechsle direkt zu Deinen %spersonal settings%s.", "Encryption" => "Verschlüsselung", "Enable recovery key (allow to recover users files in case of password loss):" => "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):", "Recovery key password" => "Wiederherstellungsschlüssel-Passwort", diff --git a/apps/files_encryption/l10n/de_CH.php b/apps/files_encryption/l10n/de_CH.php index 875efa84f27..f2f5db58d5a 100644 --- a/apps/files_encryption/l10n/de_CH.php +++ b/apps/files_encryption/l10n/de_CH.php @@ -11,7 +11,6 @@ $TRANSLATIONS = array( "Missing requirements." => "Fehlende Voraussetzungen", "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.", "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:", -"personal settings" => "Persönliche Einstellungen", "Encryption" => "Verschlüsselung", "Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).", "Recovery key password" => "Wiederherstellungschlüsselpasswort", diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php index f5a6683f615..9d649697b01 100644 --- a/apps/files_encryption/l10n/de_DE.php +++ b/apps/files_encryption/l10n/de_DE.php @@ -17,8 +17,7 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:", "Initial encryption started... This can take some time. Please wait." => "Anfangsverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.", "Initial encryption running... Please try again later." => "Anfangsverschlüsselung läuft... Bitte versuchen Sie es später wieder.", -"Go directly to your " => "Direkt wechseln zu Ihrem", -"personal settings" => "Persönliche Einstellungen", +"Go directly to your %spersonal settings%s." => "Wechseln Sie direkt zu Ihren %spersonal settings%s.", "Encryption" => "Verschlüsselung", "Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).", "Recovery key password" => "Wiederherstellungschlüsselpasswort", diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php index e72090c916a..0aa31113435 100644 --- a/apps/files_encryption/l10n/el.php +++ b/apps/files_encryption/l10n/el.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:", "Initial encryption started... This can take some time. Please wait." => "Η αρχική κρυπτογράφηση άρχισε... Αυτό μπορεί να πάρει κάποια ώρα. Παρακαλώ περιμένετε.", "Initial encryption running... Please try again later." => "Εκτέλεση αρχικής κρυπτογράφησης... Παρακαλώ προσπαθήστε αργότερα.", -"Go directly to your " => "Πηγαίνε απευθείας στο ", -"personal settings" => "προσωπικές ρυθμίσεις", "Encryption" => "Κρυπτογράφηση", "Enable recovery key (allow to recover users files in case of password loss):" => "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):", "Recovery key password" => "Επαναφορά κωδικού κλειδιού", diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php index 78b1bccba62..150173da63b 100644 --- a/apps/files_encryption/l10n/en_GB.php +++ b/apps/files_encryption/l10n/en_GB.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Following users are not set up for encryption:", "Initial encryption started... This can take some time. Please wait." => "Initial encryption started... This can take some time. Please wait.", "Initial encryption running... Please try again later." => "Initial encryption running... Please try again later.", -"Go directly to your " => "Go directly to your ", -"personal settings" => "personal settings", "Encryption" => "Encryption", "Enable recovery key (allow to recover users files in case of password loss):" => "Enable recovery key (allow to recover users files in case of password loss):", "Recovery key password" => "Recovery key password", diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php index 05d30f2f6c4..a77ef9813a5 100644 --- a/apps/files_encryption/l10n/eo.php +++ b/apps/files_encryption/l10n/eo.php @@ -4,8 +4,6 @@ $TRANSLATIONS = array( "Could not change the password. Maybe the old password was not correct." => "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.", "Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.", "Missing requirements." => "Mankas neproj.", -"Go directly to your " => "Iri direkte al via", -"personal settings" => "persona agordo", "Encryption" => "Ĉifrado", "Enabled" => "Kapabligita", "Disabled" => "Malkapabligita", diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php index 080db0bdc74..f8bed2f720b 100644 --- a/apps/files_encryption/l10n/es.php +++ b/apps/files_encryption/l10n/es.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:", "Initial encryption started... This can take some time. Please wait." => "Encriptación iniciada..... Esto puede tomar un tiempo. Por favor espere.", "Initial encryption running... Please try again later." => "Cifrado inicial en curso... Inténtelo más tarde.", -"Go directly to your " => "Ir directamente a su", -"personal settings" => "opciones personales", "Encryption" => "Cifrado", "Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);", "Recovery key password" => "Contraseña de clave de recuperación", diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php index 0209c589493..696ef46d9b3 100644 --- a/apps/files_encryption/l10n/es_AR.php +++ b/apps/files_encryption/l10n/es_AR.php @@ -16,8 +16,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Los siguientes usuarios no fueron configurados para encriptar:", "Initial encryption started... This can take some time. Please wait." => "Encriptación inicial comenzada... Esto puede durar un tiempo. Por favor espere.", "Initial encryption running... Please try again later." => "Encriptación inicial corriendo... Por favor intente mas tarde. ", -"Go directly to your " => "Ve directamente a tu", -"personal settings" => "Configuración personal", "Encryption" => "Encriptación", "Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso que pierdas la contraseña):", "Recovery key password" => "Contraseña de recuperación de clave", diff --git a/apps/files_encryption/l10n/es_MX.php b/apps/files_encryption/l10n/es_MX.php index b3ac75e082d..0232100a8fe 100644 --- a/apps/files_encryption/l10n/es_MX.php +++ b/apps/files_encryption/l10n/es_MX.php @@ -15,8 +15,6 @@ $TRANSLATIONS = array( "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.", "Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:", "Initial encryption started... This can take some time. Please wait." => "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere.", -"Go directly to your " => "Ir directamente a su", -"personal settings" => "opciones personales", "Encryption" => "Cifrado", "Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);", "Recovery key password" => "Contraseña de clave de recuperación", diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php index 2bc29283d63..67ca7458c80 100644 --- a/apps/files_encryption/l10n/et_EE.php +++ b/apps/files_encryption/l10n/et_EE.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Järgmised kasutajad pole seadistatud krüpteeringuks:", "Initial encryption started... This can take some time. Please wait." => "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota.", "Initial encryption running... Please try again later." => "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti.", -"Go directly to your " => "Liigu otse oma", -"personal settings" => "isiklikes seadetes", "Encryption" => "Krüpteerimine", "Enable recovery key (allow to recover users files in case of password loss):" => "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):", "Recovery key password" => "Taastevõtme parool", diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php index d67f3f320ff..e0b4b210bcb 100644 --- a/apps/files_encryption/l10n/eu.php +++ b/apps/files_encryption/l10n/eu.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:", "Initial encryption started... This can take some time. Please wait." => "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.", "Initial encryption running... Please try again later." => "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.", -"Go directly to your " => "Joan zuzenean zure", -"personal settings" => "ezarpen pertsonalak", "Encryption" => "Enkriptazioa", "Enable recovery key (allow to recover users files in case of password loss):" => "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):", "Recovery key password" => "Berreskuratze gako pasahitza", diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php index 420fd7423f8..dd710d286e6 100644 --- a/apps/files_encryption/l10n/fa.php +++ b/apps/files_encryption/l10n/fa.php @@ -10,7 +10,6 @@ $TRANSLATIONS = array( "Could not update the private key password. Maybe the old password was not correct." => "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.", "Missing requirements." => "نیازمندی های گمشده", "Following users are not set up for encryption:" => "کاربران زیر برای رمزنگاری تنظیم نشده اند", -"personal settings" => "تنظیمات شخصی", "Encryption" => "رمزگذاری", "Enable recovery key (allow to recover users files in case of password loss):" => "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):", "Recovery key password" => "رمزعبور کلید بازیابی", diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php index 7f3e55a5bc1..4f83dd8ac35 100644 --- a/apps/files_encryption/l10n/fi_FI.php +++ b/apps/files_encryption/l10n/fi_FI.php @@ -8,7 +8,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Seuraavat käyttäjät eivät ole määrittäneet salausta:", "Initial encryption started... This can take some time. Please wait." => "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.", "Initial encryption running... Please try again later." => "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.", -"personal settings" => "henkilökohtaiset asetukset", "Encryption" => "Salaus", "Recovery key password" => "Palautusavaimen salasana", "Enabled" => "Käytössä", diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php index a7aa064cfb9..173e93c7afd 100644 --- a/apps/files_encryption/l10n/fr.php +++ b/apps/files_encryption/l10n/fr.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :", "Initial encryption started... This can take some time. Please wait." => "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.", "Initial encryption running... Please try again later." => "Chiffrement initial en cours... Veuillez re-essayer ultérieurement.", -"Go directly to your " => "Allez directement à votre", -"personal settings" => "paramètres personnel", "Encryption" => "Chiffrement", "Enable recovery key (allow to recover users files in case of password loss):" => "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).", "Recovery key password" => "Mot de passe de la clef de récupération", diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php index 936aaa328d2..1b044d6126f 100644 --- a/apps/files_encryption/l10n/gl.php +++ b/apps/files_encryption/l10n/gl.php @@ -17,8 +17,7 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:", "Initial encryption started... This can take some time. Please wait." => "Comezou o cifrado inicial... Isto pode levar bastante tempo. Agarde.", "Initial encryption running... Please try again later." => "O cifrado inicial está en execución... Tenteo máis tarde.", -"Go directly to your " => "Vaia directamente ao seu", -"personal settings" => "axustes persoais", +"Go directly to your %spersonal settings%s." => "Vaia directamente aos seus %saxustes persoais%s.", "Encryption" => "Cifrado", "Enable recovery key (allow to recover users files in case of password loss):" => "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):", "Recovery key password" => "Contrasinal da chave de recuperación", diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php index 278aa3cc0bf..05f33624939 100644 --- a/apps/files_encryption/l10n/hu_HU.php +++ b/apps/files_encryption/l10n/hu_HU.php @@ -16,8 +16,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "A következő felhasználók nem állították be a titkosítást:", "Initial encryption started... This can take some time. Please wait." => "A titkosítási folyamat megkezdődött... Ez hosszabb ideig is eltarthat. Kérem várjon.", "Initial encryption running... Please try again later." => "Kezedeti titkosítás fut... Próbálja később.", -"Go directly to your " => "Ugrás ide:", -"personal settings" => "személyes beállítások", "Encryption" => "Titkosítás", "Enable recovery key (allow to recover users files in case of password loss):" => "A helyreállítási kulcs beállítása (lehetővé teszi a felhasználók állományainak visszaállítását, ha elfelejtik a jelszavukat):", "Recovery key password" => "A helyreállítási kulcs jelszava", diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php index 1d2642b8f2e..dfcbc11c207 100644 --- a/apps/files_encryption/l10n/id.php +++ b/apps/files_encryption/l10n/id.php @@ -12,8 +12,6 @@ $TRANSLATIONS = array( "Missing requirements." => "Persyaratan yang hilang.", "Following users are not set up for encryption:" => "Pengguna berikut belum diatur untuk enkripsi:", "Initial encryption started... This can take some time. Please wait." => "Inisial enskripsi dijalankan... Ini dapat memakan waktu. Silakan tunggu.", -"Go directly to your " => "Langsung ke anda", -"personal settings" => "pengaturan pribadi", "Encryption" => "Enkripsi", "Enable recovery key (allow to recover users files in case of password loss):" => "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):", "Recovery key password" => "Sandi kunci pemulihan", diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php index b969b08105d..523c52475ea 100644 --- a/apps/files_encryption/l10n/it.php +++ b/apps/files_encryption/l10n/it.php @@ -17,8 +17,7 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:", "Initial encryption started... This can take some time. Please wait." => "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.", "Initial encryption running... Please try again later." => "Cifratura iniziale in esecuzione... Riprova più tardi.", -"Go directly to your " => "Passa direttamente a", -"personal settings" => "impostazioni personali", +"Go directly to your %spersonal settings%s." => "Vai direttamente alle tue %simpostazioni personali%s.", "Encryption" => "Cifratura", "Enable recovery key (allow to recover users files in case of password loss):" => "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):", "Recovery key password" => "Password della chiave di recupero", diff --git a/apps/files_encryption/l10n/ja.php b/apps/files_encryption/l10n/ja.php index 81de8419c20..fc9f15eaa08 100644 --- a/apps/files_encryption/l10n/ja.php +++ b/apps/files_encryption/l10n/ja.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "以下のユーザーは、暗号化設定がされていません：", "Initial encryption started... This can take some time. Please wait." => "暗号化の初期化作業を開始しました... この処理にはしばらく時間がかかります。お待ちください。", "Initial encryption running... Please try again later." => "初期暗号化実行中... 後でもう一度お試しください。", -"Go directly to your " => "あなたのディレクトリへ", -"personal settings" => "秘密鍵をアンロックできます", "Encryption" => "暗号化", "Enable recovery key (allow to recover users files in case of password loss):" => "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):", "Recovery key password" => "リカバリキーのパスワード", diff --git a/apps/files_encryption/l10n/km.php b/apps/files_encryption/l10n/km.php index 0defe6c5388..e095f96faa3 100644 --- a/apps/files_encryption/l10n/km.php +++ b/apps/files_encryption/l10n/km.php @@ -2,7 +2,6 @@ $TRANSLATIONS = array( "Password successfully changed." => "បានប្ដូរពាក្យសម្ងាត់ដោយជោគជ័យ។", "Could not change the password. Maybe the old password was not correct." => "មិនអាចប្ដូរពាក្យសម្ងាត់បានទេ។ ប្រហែលពាក្យសម្ងាត់ចាស់មិនត្រឹមត្រូវ។", -"personal settings" => "ការកំណត់ផ្ទាល់ខ្លួន", "Encryption" => "កូដនីយកម្ម", "Enabled" => "បានបើក", "Disabled" => "បានបិទ", diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php index 3526635e857..983414a32a6 100644 --- a/apps/files_encryption/l10n/ko.php +++ b/apps/files_encryption/l10n/ko.php @@ -15,8 +15,6 @@ $TRANSLATIONS = array( "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "PHP 5.3.3 이상 설치 여부, PHP의 OpenSSL 확장 기능 활성화 및 설정 여부를 확인하십시오. 암호화 앱이 비활성화 되었습니다.", "Following users are not set up for encryption:" => "다음 사용자는 암호화를 사용할 수 없습니다:", "Initial encryption started... This can take some time. Please wait." => "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오.", -"Go directly to your " => "다음으로 바로 가기: ", -"personal settings" => "개인 설정", "Encryption" => "암호화", "Enable recovery key (allow to recover users files in case of password loss):" => "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):", "Recovery key password" => "복구 키 암호", diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php index 29d9afbaa83..5fca96d51ab 100644 --- a/apps/files_encryption/l10n/lt_LT.php +++ b/apps/files_encryption/l10n/lt_LT.php @@ -15,8 +15,6 @@ $TRANSLATIONS = array( "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta.", "Following users are not set up for encryption:" => "Sekantys naudotojai nenustatyti šifravimui:", "Initial encryption started... This can take some time. Please wait." => "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti.", -"Go directly to your " => "Eiti tiesiai į Jūsų", -"personal settings" => "asmeniniai nustatymai", "Encryption" => "Šifravimas", "Enable recovery key (allow to recover users files in case of password loss):" => "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):", "Recovery key password" => "Atkūrimo rakto slaptažodis", diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php index b13d2c28ce5..08a88ff1bbf 100644 --- a/apps/files_encryption/l10n/mk.php +++ b/apps/files_encryption/l10n/mk.php @@ -3,8 +3,6 @@ $TRANSLATIONS = array( "Password successfully changed." => "Лозинката е успешно променета.", "Could not change the password. Maybe the old password was not correct." => "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.", "Missing requirements." => "Барања кои недостасуваат.", -"Go directly to your " => "Одете директно на вашиот", -"personal settings" => "лични подесувања", "Encryption" => "Енкрипција", "Repeat Recovery key password" => "Повтори ја лозинката за клучот на обновување", "Enabled" => "Овозможен", diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php index 47f60a227f7..db9f36efac3 100644 --- a/apps/files_encryption/l10n/nb_NO.php +++ b/apps/files_encryption/l10n/nb_NO.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Følgende brukere er ikke satt opp for kryptering:", "Initial encryption started... This can take some time. Please wait." => "Første gangs kryptering startet... Dette kan ta litt tid. Vennligst vent.", "Initial encryption running... Please try again later." => "Førstegangs kryptering kjører... Prøv igjen senere.", -"Go directly to your " => "Gå direkte til din", -"personal settings" => "personlige innstillinger", "Encryption" => "Kryptering", "Enable recovery key (allow to recover users files in case of password loss):" => "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):", "Recovery key password" => "Passord for gjenopprettingsnøkkel", diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php index 598806a8dbb..69bd3e96f3d 100644 --- a/apps/files_encryption/l10n/nl.php +++ b/apps/files_encryption/l10n/nl.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:", "Initial encryption started... This can take some time. Please wait." => "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.", "Initial encryption running... Please try again later." => "Initiële versleuteling bezig... Probeer het later opnieuw.", -"Go directly to your " => "Ga meteen naar uw", -"personal settings" => "persoonlijke instellingen", "Encryption" => "Versleuteling", "Enable recovery key (allow to recover users files in case of password loss):" => "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):", "Recovery key password" => "Wachtwoord herstelsleulel", diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php index c8542cd8d78..7063161b20a 100644 --- a/apps/files_encryption/l10n/pl.php +++ b/apps/files_encryption/l10n/pl.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:", "Initial encryption started... This can take some time. Please wait." => "Rozpoczęto szyfrowanie... To może chwilę potrwać. Proszę czekać.", "Initial encryption running... Please try again later." => "Trwa szyfrowanie początkowe...Spróbuj ponownie.", -"Go directly to your " => "Przejdź bezpośrednio do", -"personal settings" => "Ustawienia osobiste", "Encryption" => "Szyfrowanie", "Enable recovery key (allow to recover users files in case of password loss):" => "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):", "Recovery key password" => "Hasło klucza odzyskiwania", diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php index b034996a523..1a829352daf 100644 --- a/apps/files_encryption/l10n/pt_BR.php +++ b/apps/files_encryption/l10n/pt_BR.php @@ -17,8 +17,7 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:", "Initial encryption started... This can take some time. Please wait." => "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere.", "Initial encryption running... Please try again later." => "Criptografia inicial em execução ... Por favor, tente novamente mais tarde.", -"Go directly to your " => "Ir diretamente para o seu", -"personal settings" => "configurações pessoais.", +"Go directly to your %spersonal settings%s." => "Ir direto para suas %spersonal settings%s.", "Encryption" => "Criptografia", "Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):", "Recovery key password" => "Senha da chave de recuperação", diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php index a9b97292b35..433c15e193a 100644 --- a/apps/files_encryption/l10n/pt_PT.php +++ b/apps/files_encryption/l10n/pt_PT.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Os utilizadores seguintes não estão marcados para cifragem:", "Initial encryption started... This can take some time. Please wait." => "A encriptação inicial começou... Pode demorar algum tempo. Aguarde, por favor.", "Initial encryption running... Please try again later." => "Criptografia inicial em execução ... Por favor, tente novamente mais tarde. ", -"Go directly to your " => "Ir directamente para o seu", -"personal settings" => "configurações personalizadas ", "Encryption" => "Encriptação", "Enable recovery key (allow to recover users files in case of password loss):" => "Active a chave de recuperação (permite recuperar os ficheiros no caso de perda da password):", "Recovery key password" => "Chave de recuperação da conta", diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php index 5aabc498642..c424bdb6ea8 100644 --- a/apps/files_encryption/l10n/ro.php +++ b/apps/files_encryption/l10n/ro.php @@ -8,7 +8,6 @@ $TRANSLATIONS = array( "Could not change the password. Maybe the old password was not correct." => "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.", "Private key password successfully updated." => "Cheia privata a fost actualizata cu succes", "Could not update the private key password. Maybe the old password was not correct." => "Nu am putut actualiza parola pentru cheia privata. Poate ca parola veche este incorecta.", -"personal settings" => "setari personale", "Encryption" => "Încriptare", "Enabled" => "Activat", "Disabled" => "Dezactivat", diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php index bc031dda517..367565dfffc 100644 --- a/apps/files_encryption/l10n/ru.php +++ b/apps/files_encryption/l10n/ru.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Для следующих пользователей шифрование не настроено:", "Initial encryption started... This can take some time. Please wait." => "Начато начальное шифрование... Это может занять какое-то время. Пожалуйста, подождите.", "Initial encryption running... Please try again later." => "Работает первоначальное шифрование... Пожалуйста, повторите попытку позже.", -"Go directly to your " => "Перейти прямо в", -"personal settings" => "персональные настройки", "Encryption" => "Шифрование", "Enable recovery key (allow to recover users files in case of password loss):" => "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):", "Recovery key password" => "Пароль для ключа восстановления", diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php index 9fe1f5c9602..804b17f9155 100644 --- a/apps/files_encryption/l10n/sk_SK.php +++ b/apps/files_encryption/l10n/sk_SK.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Nasledujúci používatelia nie sú nastavení pre šifrovanie:", "Initial encryption started... This can take some time. Please wait." => "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím.", "Initial encryption running... Please try again later." => "Počiatočné šifrovanie beží... Skúste to neskôr znovu.", -"Go directly to your " => "Choďte priamo do vášho", -"personal settings" => "osobné nastavenia", "Encryption" => "Šifrovanie", "Enable recovery key (allow to recover users files in case of password loss):" => "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):", "Recovery key password" => "Heslo obnovovacieho kľúča", diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php index 5f72b54fee9..3bad92076f4 100644 --- a/apps/files_encryption/l10n/sl.php +++ b/apps/files_encryption/l10n/sl.php @@ -16,8 +16,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Navedeni uporabniki še nimajo nastavljenega šifriranja:", "Initial encryption started... This can take some time. Please wait." => "Začetno šifriranje je začeto ... Opravilo je lahko dolgotrajno.", "Initial encryption running... Please try again later." => "Začetno šifriranje je v teku ... Poskusite kasneje.", -"Go directly to your " => "Skočite neposredno na", -"personal settings" => "osebne nastavitve", "Encryption" => "Šifriranje", "Enable recovery key (allow to recover users files in case of password loss):" => "Omogoči ključ za obnovitev datotek (v primeru izgube gesla):", "Recovery key password" => "Ključ za obnovitev gesla", diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php index 02efa85dfbe..76ed616ca5c 100644 --- a/apps/files_encryption/l10n/sv.php +++ b/apps/files_encryption/l10n/sv.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:", "Initial encryption started... This can take some time. Please wait." => "Initiala krypteringen har påbörjats... Detta kan ta lite tid. Var god vänta.", "Initial encryption running... Please try again later." => "Initiala krypteringen körs... Var god försök igen senare.", -"Go directly to your " => "Gå direkt till din", -"personal settings" => "personliga inställningar", "Encryption" => "Kryptering", "Enable recovery key (allow to recover users files in case of password loss):" => "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):", "Recovery key password" => "Lösenord för återställningsnyckel", diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php index d0ab2061db2..9964a44e742 100644 --- a/apps/files_encryption/l10n/tr.php +++ b/apps/files_encryption/l10n/tr.php @@ -17,8 +17,7 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:", "Initial encryption started... This can take some time. Please wait." => "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.", "Initial encryption running... Please try again later." => "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.", -"Go directly to your " => "Doğrudan ", -"personal settings" => "kişisel ayarlarınıza gidin", +"Go directly to your %spersonal settings%s." => "Doğrudan %skişisel ayarlarınıza%s gidin.", "Encryption" => "Şifreleme", "Enable recovery key (allow to recover users files in case of password loss):" => "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):", "Recovery key password" => "Kurtarma anahtarı parolası", diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php index e406c092280..b69d59fa043 100644 --- a/apps/files_encryption/l10n/uk.php +++ b/apps/files_encryption/l10n/uk.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"personal settings" => "особисті налаштування", "Encryption" => "Шифрування", "Change Password" => "Змінити Пароль" ); diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php index c752f0af224..616395a0f5c 100644 --- a/apps/files_encryption/l10n/vi.php +++ b/apps/files_encryption/l10n/vi.php @@ -8,7 +8,6 @@ $TRANSLATIONS = array( "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.", "Private key password successfully updated." => "Cập nhật thành công mật khẩu khóa cá nhân", "Could not update the private key password. Maybe the old password was not correct." => "Không thể cập nhật mật khẩu khóa cá nhân. Có thể mật khẩu cũ không đúng", -"personal settings" => "Thiết lập cá nhân", "Encryption" => "Mã hóa", "Enabled" => "Bật", "Disabled" => "Tắt", diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php index 0647ff6b769..0ab0665413b 100644 --- a/apps/files_encryption/l10n/zh_CN.php +++ b/apps/files_encryption/l10n/zh_CN.php @@ -12,8 +12,6 @@ $TRANSLATIONS = array( "Missing requirements." => "必填项未填写。", "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "请确认安装了 PHP 5.3.3 或更新版本，且 OpenSSL 及其 PHP 扩展已经启用并正确配置。加密应用现在已被禁用。", "Following users are not set up for encryption:" => "以下用户还没有设置加密：", -"Go directly to your " => "直接进入你的", -"personal settings" => "个人设置", "Encryption" => "加密", "Enable recovery key (allow to recover users files in case of password loss):" => "启用恢复密钥（允许你在密码丢失后恢复文件）：", "Recovery key password" => "恢复密钥密码", diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php index f4562867666..f353df082d7 100644 --- a/apps/files_encryption/l10n/zh_TW.php +++ b/apps/files_encryption/l10n/zh_TW.php @@ -17,8 +17,6 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "以下的使用者無法設定加密:", "Initial encryption started... This can take some time. Please wait." => "加密初始已啟用...這個需要一些時間。請稍等。", "Initial encryption running... Please try again later." => "加密初始執行中...請晚點再試。", -"Go directly to your " => "直接到您的", -"personal settings" => "個人設定", "Encryption" => "加密", "Enable recovery key (allow to recover users files in case of password loss):" => "啟用還原金鑰 (因忘記密碼仍允許還原使用者檔案):", "Recovery key password" => "還原金鑰密碼", diff --git a/apps/files_encryption/templates/invalid_private_key.php b/apps/files_encryption/templates/invalid_private_key.php index a3cae60b1da..b275b9c428c 100644 --- a/apps/files_encryption/templates/invalid_private_key.php +++ b/apps/files_encryption/templates/invalid_private_key.php @@ -5,7 +5,7 @@ <?php p($_['message']); ?> <br/> <?php if($_['errorCode'] === \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR): ?> - <?php>p($l->t('Go directly to your ')); ?> <a href="<?php echo $location?>"><?php p($l->t('personal settings')); ?>.</a> + <?php p($l->t('Go directly to your %spersonal settings%s.', array('<a href="'.$location.'">', '</a>'))); ?> <?php endif; ?> <br/> </li> diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php index cf676c445ce..d4e6abf004a 100644 --- a/apps/files_encryption/templates/settings-admin.php +++ b/apps/files_encryption/templates/settings-admin.php @@ -34,20 +34,20 @@ <input type="password" name="changeRecoveryPassword" - id="oldEncryptionRecoveryPassword" + id="oldEncryptionRecoveryPassword" /> <label for="oldEncryptionRecoveryPassword"><?php p($l->t("Old Recovery key password")); ?></label> <br/> <br/> <input type="password" name="changeRecoveryPassword" - id="newEncryptionRecoveryPassword" + id="newEncryptionRecoveryPassword" /> <label for="newEncryptionRecoveryPassword"><?php p($l->t("New Recovery key password")); ?></label> <br/> <input type="password" name="changeRecoveryPassword" - id="repeatedNewEncryptionRecoveryPassword" + id="repeatedNewEncryptionRecoveryPassword" /> <label for="repeatEncryptionRecoveryPassword"><?php p($l->t("Repeat New Recovery key password")); ?></label> <br/> <button diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php index 6e8ba8fec2a..8d93596ba6c 100644 --- a/apps/files_external/l10n/cs_CZ.php +++ b/apps/files_external/l10n/cs_CZ.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "You don't have any external storages" => "Nemáte žádná externí úložiště", "Name" => "Název", "Storage type" => "Typ úložiště", +"Scope" => "Záběr", "External Storage" => "Externí úložiště", "Folder name" => "Název složky", "Configuration" => "Nastavení", diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php index 196f4c9f54b..c94cc93d4eb 100644 --- a/apps/files_external/l10n/da.php +++ b/apps/files_external/l10n/da.php @@ -49,6 +49,7 @@ $TRANSLATIONS = array( "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Bemærk:</b> cURL understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Bemærk:</b> FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Bemærk:</b> \"%s\" er ikke installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.", +"You don't have any external storages" => "Du har ingen eksterne lagre", "Name" => "Navn", "Storage type" => "Lagertype", "External Storage" => "Ekstern opbevaring", diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php index c716d135dea..eccfd70a5d3 100644 --- a/apps/files_external/l10n/de.php +++ b/apps/files_external/l10n/de.php @@ -7,7 +7,7 @@ $TRANSLATIONS = array( "Key" => "Schlüssel", "Secret" => "Geheime Zeichenkette", "Bucket" => "Bucket", -"Amazon S3 and compliant" => "Amazon S3 und Kompatible", +"Amazon S3 and compliant" => "Amazon S3 und kompatible", "Access Key" => "Zugriffsschlüssel", "Secret Key" => "Sicherheitssschlüssel", "Hostname (optional)" => "Host-Name (Optional)", diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php index f42124e8db3..9a64c0454a3 100644 --- a/apps/files_external/l10n/hu_HU.php +++ b/apps/files_external/l10n/hu_HU.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "External storage" => "Külső tárolók", +"Local" => "Helyi", "Location" => "Hely", "Host" => "Kiszolgáló", "Username" => "Felhasználónév", diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php index 5daad51681e..a27f3c028bb 100644 --- a/apps/files_external/l10n/nl.php +++ b/apps/files_external/l10n/nl.php @@ -46,13 +46,17 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "Geef een geldige Dropbox key en secret.", "Error configuring Google Drive storage" => "Fout tijdens het configureren van Google Drive opslag", "Personal" => "Persoonlijk", +"System" => "Systeem", "Saved" => "Bewaard", "<b>Note:</b> " => "<b>Let op:</b> ", " and " => "en", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.", "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Let op:</b> \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren.", +"You don't have any external storages" => "U hebt geen externe opslag", "Name" => "Naam", +"Storage type" => "Opslagtype", +"Scope" => "Scope", "External Storage" => "Externe opslag", "Folder name" => "Mapnaam", "Configuration" => "Configuratie", diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php index 1caac7446c0..dcc382347c9 100644 --- a/apps/files_external/l10n/tr.php +++ b/apps/files_external/l10n/tr.php @@ -22,7 +22,7 @@ $TRANSLATIONS = array( "Password" => "Parola", "Root" => "Kök", "Secure ftps://" => "Güvenli ftps://", -"Client ID" => "İstemci Kimliğ", +"Client ID" => "İstemci kimliği", "Client secret" => "İstemci parolası", "OpenStack Object Storage" => "OpenStack Nesne Depolama", "Username (required)" => "Kullanıcı adı (gerekli)", @@ -42,7 +42,7 @@ $TRANSLATIONS = array( "Remote subfolder" => "Uzak alt klasör", "Access granted" => "Giriş kabul edildi", "Error configuring Dropbox storage" => "Dropbox depo yapılandırma hatası", -"Grant access" => "Erişim sağlandı", +"Grant access" => "Erişimi sağla", "Please provide a valid Dropbox app key and secret." => "Lütfen Dropbox app key ve secret temin ediniz", "Error configuring Google Drive storage" => "Google Drive depo yapılandırma hatası", "Personal" => "Kişisel", diff --git a/apps/files_sharing/app/sharing.php b/apps/files_sharing/app/sharing.php deleted file mode 100644 index 427269755b9..00000000000 --- a/apps/files_sharing/app/sharing.php +++ /dev/null @@ -1,25 +0,0 @@ -<?php - -namespace OCA\Files_Sharing\App; - -use \OCP\AppFramework\App; -use \OCA\Files_Sharing\Controller\AdminSettingsController; - -class Sharing extends App { - - public function __construct(array $urlParams=array()){ - parent::__construct('files_sharing', $urlParams); - - $container = $this->getContainer(); - - /** - * Controllers - */ - $container->registerService('AdminSettingsController', function($c) { - return new AdminSettingsController( - $c->query('AppName'), - $c->query('Request') - ); - }); - } -} diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index d44c652dd98..6b40ba921cc 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -21,9 +21,6 @@ OCP\Util::addScript('files_sharing', 'share'); \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook'); \OC_Hook::connect('OC_Appconfig', 'post_set_value', '\OCA\Files\Share\Maintainer', 'configChangeHook'); -// Register settings scripts for mail template editing -OCP\App::registerAdmin('files_sharing', 'settings-admin'); - OC_FileProxy::register(new OCA\Files\Share\Proxy()); \OCA\Files\App::getNavigationManager()->add( diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php index 78d4276f98a..7c2834dc9c2 100644 --- a/apps/files_sharing/appinfo/routes.php +++ b/apps/files_sharing/appinfo/routes.php @@ -5,21 +5,6 @@ $this->create('core_ajax_public_preview', '/publicpreview')->action( require_once __DIR__ . '/../ajax/publicpreview.php'; }); -use \OCA\Files_Sharing\App\Sharing; - -$app = new Sharing(); - -$app->registerRoutes($this, array('routes' => array( - - // mailTemplate settings - array('name' => 'admin_settings#render_raw', 'url' => '/settings/mailtemplate', 'verb' => 'GET'), - - array('name' => 'admin_settings#update', 'url' => '/settings/mailtemplate', 'verb' => 'POST'), - - array('name' => 'admin_settings#reset', 'url' => '/settings/mailtemplate', 'verb' => 'DELETE') - -))); - // OCS API //TODO: SET: mail notification, waiting for PR #4689 to be accepted diff --git a/apps/files_sharing/controller/adminsettingscontroller.php b/apps/files_sharing/controller/adminsettingscontroller.php deleted file mode 100644 index 5192b6239e4..00000000000 --- a/apps/files_sharing/controller/adminsettingscontroller.php +++ /dev/null @@ -1,60 +0,0 @@ -<?php - -namespace OCA\Files_Sharing\Controller; - -use \OCP\AppFramework\ApiController; -use \OCP\IRequest; -use \OCP\AppFramework\Http\JSONResponse; - -class AdminSettingsController extends ApiController { - - public function __construct($appName, IRequest $request) { - parent::__construct($appName, $request); - } - - /** - * @param string $theme - * @param string $template - * @return \OCA\Files_Sharing\Http\MailTemplateResponse - */ - public function renderRaw( $theme, $template ) { - try { - $template = new \OCA\Files_Sharing\MailTemplate( $theme, $template ); - return $template->getResponse(); - } catch (\Exception $ex) { - return new JSONResponse(array('message' => $ex->getMessage()), $ex->getCode()); - } - } - - /** - * @param string $theme - * @param string $template - * @param string $content - * @return JSONResponse - */ - public function update( $theme, $template, $content ) { - try { - $template = new \OCA\Files_Sharing\MailTemplate( $theme, $template ); - $template->setContent( $content ); - return new JSONResponse(); - } catch (\Exception $ex) { - return new JSONResponse(array('message' => $ex->getMessage()), $ex->getCode()); - } - } - - /** - * @param string $theme - * @param string $template - * @return JSONResponse - */ - public function reset( $theme, $template ) { - try { - $template = new \OCA\Files_Sharing\MailTemplate( $theme, $template ); - $template->reset(); - return new JSONResponse(); - } catch (\Exception $ex) { - return new JSONResponse(array('message' => $ex->getMessage()), $ex->getCode()); - } - } - -} diff --git a/apps/files_sharing/css/settings-admin.css b/apps/files_sharing/css/settings-admin.css deleted file mode 100644 index 7ee71963436..00000000000 --- a/apps/files_sharing/css/settings-admin.css +++ /dev/null @@ -1,33 +0,0 @@ -#mailTemplateSettings .actions div { - display: inline-block; -} - -#mailTemplateSettings div label { - display: block -} - -#mailTemplateSettings textarea { - box-sizing: border-box; - width: 100%; - height: 150px; -} - -#mailTemplateSettings .templateEditor + .actions { - height:28px; -} - - -#mailTemplateSettings .actions .reset { - margin: 0; -} - -#mailTemplateSettings .actions .save { - float: right; - margin: 0; -} - -#mailTemplateSettings #mts-msg { - float: right; - margin: 1px 5px; - padding:3px; -} diff --git a/apps/files_sharing/http/mailtemplateresponse.php b/apps/files_sharing/http/mailtemplateresponse.php deleted file mode 100644 index 98a2dfcc94e..00000000000 --- a/apps/files_sharing/http/mailtemplateresponse.php +++ /dev/null @@ -1,55 +0,0 @@ -<?php - -/** - * ownCloud - App Framework - * - * @author Jörn Dreyer - * @copyright 2014 Jörn Dreyer <jfd@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/>. - * - */ - -namespace OCA\Files_Sharing\Http; - -/** - * Prompts the user to download the a file - */ -class MailTemplateResponse extends \OCP\AppFramework\Http\Response { - - private $filename; - private $contentType; - - /** - * Creates a response that prompts the user to download the file - * @param string $filename the name that the downloaded file should have - * @param string $contentType the mimetype that the downloaded file should have - */ - public function __construct($filename, $contentType = 'text/php') { - $this->filename = $filename; - $this->contentType = $contentType; - - $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"'); - $this->addHeader('Content-Type', $contentType); - } - - /** - * Returns the raw template content - * @return string the file - */ - public function render(){ - return file_get_contents($this->filename); - } - -} diff --git a/apps/files_sharing/js/settings-admin.js b/apps/files_sharing/js/settings-admin.js deleted file mode 100644 index fa9b236ea98..00000000000 --- a/apps/files_sharing/js/settings-admin.js +++ /dev/null @@ -1,78 +0,0 @@ -$(document).ready(function() { - - var loadTemplate = function (theme, template) { - $.get( - OC.generateUrl('apps/files_sharing/settings/mailtemplate'), - { theme: theme, template: template } - ).done(function( result ) { - $( '#mailTemplateSettings textarea' ).val(result); - }).fail(function( result ) { - OC.dialogs.alert(result.message, t('files_sharing', 'Could not load template')); - }); - }; - - // load default template - var theme = $( '#mts-theme' ).val(); - var template = $( '#mts-template' ).val(); - loadTemplate(theme, template); - - $( '#mts-template' ).change( - function() { - var theme = $( '#mts-theme' ).val(); - var template = $( this ).val(); - loadTemplate(theme, template); - } - ); - - $( '#mts-theme' ).change( - function() { - var theme = $( this ).val(); - var template = $( '#mts-template' ).val(); - loadTemplate(theme, template); - } - ); - - $( '#mailTemplateSettings .actions' ).on('click', '.save', - function() { - var theme = $( '#mts-theme' ).val(); - var template = $( '#mts-template' ).val(); - var content = $( '#mailTemplateSettings textarea' ).val(); - OC.msg.startSaving('#mts-msg'); - $.post( - OC.generateUrl('apps/files_sharing/settings/mailtemplate'), - { theme: theme, template: template, content: content } - ).done(function() { - var data = { status:'success', data:{message:t('files_sharing', 'Saved')} }; - OC.msg.finishedSaving('#mts-msg', data); - }).fail(function(result) { - var data = { status: 'error', data:{message:result.responseJSON.message} }; - OC.msg.finishedSaving('#mts-msg', data); - }); - } - ); - - $( '#mailTemplateSettings .actions' ).on('click', '.reset', - function() { - var theme = $( '#mts-theme' ).val(); - var template = $( '#mts-template' ).val(); - OC.msg.startSaving('#mts-msg'); - $.ajax({ - type: "DELETE", - url: OC.generateUrl('apps/files_sharing/settings/mailtemplate'), - data: { theme: theme, template: template } - }).done(function() { - var data = { status:'success', data:{message:t('files_sharing', 'Reset')} }; - OC.msg.finishedSaving('#mts-msg', data); - - // load default template - var theme = $( '#mts-theme' ).val(); - var template = $( '#mts-template' ).val(); - loadTemplate(theme, template); - }).fail(function(result) { - var data = { status: 'error', data:{message:result.responseJSON.message} }; - OC.msg.finishedSaving('#mts-msg', data); - }); - } - ); - -}); diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php index b10012dbc1f..efb51a22fc0 100644 --- a/apps/files_sharing/l10n/ar.php +++ b/apps/files_sharing/l10n/ar.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "حفظ", "Shared by {owner}" => "مشاركة من طرف {owner}", "Shared by" => "تم مشاركتها بواسطة", "This share is password-protected" => "هذه المشاركة محمية بكلمة مرور", @@ -15,7 +14,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "لمزيد من المعلومات، يرجى سؤال الشخص الذي أرسل هذا الرابط", "Download" => "تحميل", "Download %s" => "تحميل %s", -"Direct link" => "رابط مباشر", -"Save" => "حفظ" +"Direct link" => "رابط مباشر" ); $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;"; diff --git a/apps/files_sharing/l10n/ast.php b/apps/files_sharing/l10n/ast.php index bfec96f30ac..742245f5374 100644 --- a/apps/files_sharing/l10n/ast.php +++ b/apps/files_sharing/l10n/ast.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Entá nun se compartieron ficheros contigo.", "You haven't shared any files yet." => "Entá nun compartiesti dengún ficheru.", "You haven't shared any files by link yet." => "Entá nun compartiesti nengún ficheru por enllaz.", -"Could not load template" => "Nun pudo cargase la plantía", -"Saved" => "Guardáu", -"Reset" => "Reaniciar", "Shared by {owner}" => "Compartíu por {owner}", "Shared by" => "Compartíu por", "This share is password-protected" => "Esta compartición tien contraseña protexida", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Pa más información, entrúga-y a la persona qu'unvió esti enllaz", "Download" => "Baxar", "Download %s" => "Descargar %s", -"Direct link" => "Enllaz direutu", -"Mail templates" => "Plantíes de corréu", -"Theme" => "Tema", -"Template" => "Plantía", -"Save" => "Guardar" +"Direct link" => "Enllaz direutu" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/bg_BG.php b/apps/files_sharing/l10n/bg_BG.php index dd5e92b1733..0683c192977 100644 --- a/apps/files_sharing/l10n/bg_BG.php +++ b/apps/files_sharing/l10n/bg_BG.php @@ -3,7 +3,6 @@ $TRANSLATIONS = array( "Shared by" => "Споделено от", "Password" => "Парола", "Name" => "Име", -"Download" => "Изтегляне", -"Save" => "Запис" +"Download" => "Изтегляне" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php index a6638fedbf3..9bfd1acba5c 100644 --- a/apps/files_sharing/l10n/bn_BD.php +++ b/apps/files_sharing/l10n/bn_BD.php @@ -2,7 +2,6 @@ $TRANSLATIONS = array( "Password" => "কূটশব্দ", "Name" => "রাম", -"Download" => "ডাউনলোড", -"Save" => "সংরক্ষণ" +"Download" => "ডাউনলোড" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/bs.php b/apps/files_sharing/l10n/bs.php index 440d8140d9d..bf5b758a33d 100644 --- a/apps/files_sharing/l10n/bs.php +++ b/apps/files_sharing/l10n/bs.php @@ -1,7 +1,6 @@ <?php $TRANSLATIONS = array( "Shared by" => "Dijeli", -"Name" => "Ime", -"Save" => "Spasi" +"Name" => "Ime" ); $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);"; diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php index da7e920a993..43b9549e407 100644 --- a/apps/files_sharing/l10n/ca.php +++ b/apps/files_sharing/l10n/ca.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "Desat", -"Reset" => "Estableix de nou", "Shared by {owner}" => "Compartits per {owner}", "Shared by" => "Compartit per", "This share is password-protected" => "Aquest compartit està protegit amb contrasenya", @@ -16,7 +14,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Per més informació contacteu amb qui us ha enviat l'enllaç.", "Download" => "Baixa", "Download %s" => "Baixa %s", -"Direct link" => "Enllaç directe", -"Save" => "Desa" +"Direct link" => "Enllaç directe" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php index ff18d9fcc6b..e35cf6702d6 100644 --- a/apps/files_sharing/l10n/cs_CZ.php +++ b/apps/files_sharing/l10n/cs_CZ.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Zatím s vámi nikdo žádné soubory nesdílel.", "You haven't shared any files yet." => "Zatím jste nesdíleli žádné soubory.", "You haven't shared any files by link yet." => "Zatím jste nesdíleli pomocí odkazu žádný soubor.", -"Could not load template" => "Šablonu nelze nahrát", -"Saved" => "Uloženo", -"Reset" => "Restartovat složku", "Shared by {owner}" => "Sdílí {owner}", "Shared by" => "Sdílí", "This share is password-protected" => "Toto sdílení je chráněno heslem", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.", "Download" => "Stáhnout", "Download %s" => "Stáhnout %s", -"Direct link" => "Přímý odkaz", -"Mail templates" => "E-mailové šablony", -"Theme" => "Vzhled", -"Template" => "Šablona", -"Save" => "Uložit" +"Direct link" => "Přímý odkaz" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php index 2876a483948..67b8ed88fc9 100644 --- a/apps/files_sharing/l10n/cy_GB.php +++ b/apps/files_sharing/l10n/cy_GB.php @@ -3,7 +3,6 @@ $TRANSLATIONS = array( "Shared by" => "Rhannwyd gan", "Password" => "Cyfrinair", "Name" => "Enw", -"Download" => "Llwytho i lawr", -"Save" => "Cadw" +"Download" => "Llwytho i lawr" ); $PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"; diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php index b4b7b9410ed..9dcc386ae95 100644 --- a/apps/files_sharing/l10n/da.php +++ b/apps/files_sharing/l10n/da.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Endnu er ingen filer delt med dig.", "You haven't shared any files yet." => "Du har ikke delt nogen filer endnu.", "You haven't shared any files by link yet." => "Du har ikke delt nogen filer endnu.", -"Could not load template" => "Kunne ikke indlæse skabelon", -"Saved" => "Gemt", -"Reset" => "Nulstil", "Shared by {owner}" => "Delt af {owner}", "Shared by" => "Delt af", "This share is password-protected" => "Delingen er beskyttet af kodeord", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "For yderligere information, kontakt venligst personen der sendte linket. ", "Download" => "Download", "Download %s" => "Download %s", -"Direct link" => "Direkte link", -"Mail templates" => "E-mail skabelon", -"Theme" => "Tema", -"Template" => "Skabelon", -"Save" => "Gem" +"Direct link" => "Direkte link" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php index 68348c7a009..87b9c25175b 100644 --- a/apps/files_sharing/l10n/de.php +++ b/apps/files_sharing/l10n/de.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Es wurden bis jetzt keine Dateien mit Dir geteilt.", "You haven't shared any files yet." => "Du hast bis jetzt keine Dateien mit anderen geteilt.", "You haven't shared any files by link yet." => "Du hast bis jetzt keine Dateien über einen Link mit anderen geteilt.", -"Could not load template" => "Vorlage kann nicht geladen werden", -"Saved" => "Gespeichert", -"Reset" => "Zurücksetzen", "Shared by {owner}" => "Geteilt von {owner}", "Shared by" => "Geteilt von ", "This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Für mehr Informationen, frage bitte die Person, die Dir diesen Link geschickt hat.", "Download" => "Herunterladen", "Download %s" => "Download %s", -"Direct link" => "Direkter Link", -"Mail templates" => "Mail-Vorlagen", -"Theme" => "Theme", -"Template" => "Vorlage", -"Save" => "Speichern" +"Direct link" => "Direkter Link" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/de_AT.php b/apps/files_sharing/l10n/de_AT.php index 763d47983a1..08ef4d9245e 100644 --- a/apps/files_sharing/l10n/de_AT.php +++ b/apps/files_sharing/l10n/de_AT.php @@ -1,7 +1,6 @@ <?php $TRANSLATIONS = array( "Password" => "Passwort", -"Download" => "Herunterladen", -"Save" => "Speichern" +"Download" => "Herunterladen" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/de_CH.php b/apps/files_sharing/l10n/de_CH.php index 7fc2cc5922f..87ca31880d1 100644 --- a/apps/files_sharing/l10n/de_CH.php +++ b/apps/files_sharing/l10n/de_CH.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"Reset" => "Zurücksetzen", "Shared by {owner}" => "Geteilt von {owner}", "Shared by" => "Geteilt von", "The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.", @@ -12,7 +11,6 @@ $TRANSLATIONS = array( "the link expired" => "Der Link ist abgelaufen", "sharing is disabled" => "Teilen ist deaktiviert", "For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.", -"Download" => "Herunterladen", -"Save" => "Speichern" +"Download" => "Herunterladen" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php index 9796f57d85b..9d8390874cd 100644 --- a/apps/files_sharing/l10n/de_DE.php +++ b/apps/files_sharing/l10n/de_DE.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Es wurden bis jetzt keine Dateien mit Ihnen geteilt.", "You haven't shared any files yet." => "Sie haben bis jetzt keine Dateien mit anderen geteilt.", "You haven't shared any files by link yet." => "Sie haben bis jetzt keine Dateien über einen Link mit anderen geteilt.", -"Could not load template" => "Vorlage kann nicht geladen werden", -"Saved" => "Gespeichert", -"Reset" => "Zurücksetzen", "Shared by {owner}" => "Geteilt von {owner}", "Shared by" => "Geteilt von", "This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.", "Download" => "Herunterladen", "Download %s" => "Download %s", -"Direct link" => "Direkte Verlinkung", -"Mail templates" => "Mail-Vorlagen", -"Theme" => "Theme", -"Template" => "Vorlage", -"Save" => "Speichern" +"Direct link" => "Direkte Verlinkung" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php index 86dd579e5b6..3057312e477 100644 --- a/apps/files_sharing/l10n/el.php +++ b/apps/files_sharing/l10n/el.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Κανένα αρχείο δνε έχει διαμοιραστεί ακόμα με εσάς.", "You haven't shared any files yet." => "Δεν έχετε διαμοιραστεί κανένα αρχείο ακόμα.", "You haven't shared any files by link yet." => "Δεν έχετε διαμοιραστεί κανένα αρχείο μέσω συνδέσμου ακόμα.", -"Could not load template" => "Αδυναμία φόρτωσης προτύπου", -"Saved" => "Αποθηκεύτηκαν", -"Reset" => "Επαναφορά", "Shared by {owner}" => "Διαμοιράστηκε από τον {owner}", "Shared by" => "Διαμοιράστηκε από", "This share is password-protected" => "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο.", "Download" => "Λήψη", "Download %s" => "Λήψη %s", -"Direct link" => "Άμεσος σύνδεσμος", -"Mail templates" => "Πρότυπα αλληλογραφίας", -"Theme" => "Θέμα", -"Template" => "Πρότυπο", -"Save" => "Αποθήκευση" +"Direct link" => "Άμεσος σύνδεσμος" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/en_GB.php b/apps/files_sharing/l10n/en_GB.php index 7ae043c4098..492516863d4 100644 --- a/apps/files_sharing/l10n/en_GB.php +++ b/apps/files_sharing/l10n/en_GB.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "No files have been shared with you yet.", "You haven't shared any files yet." => "You haven't shared any files yet.", "You haven't shared any files by link yet." => "You haven't shared any files by link yet.", -"Could not load template" => "Could not load template", -"Saved" => "Saved", -"Reset" => "Reset", "Shared by {owner}" => "Shared by {owner}", "Shared by" => "Shared by", "This share is password-protected" => "This share is password-protected", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "For more info, please ask the person who sent this link.", "Download" => "Download", "Download %s" => "Download %s", -"Direct link" => "Direct link", -"Mail templates" => "Mail templates", -"Theme" => "Theme", -"Template" => "Template", -"Save" => "Save" +"Direct link" => "Direct link" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php index dff1a6d0f05..7cff8ca4a4a 100644 --- a/apps/files_sharing/l10n/eo.php +++ b/apps/files_sharing/l10n/eo.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "Konservita", "Shared by {owner}" => "Kunhavigita de {owner}", "Shared by" => "Kunhavigita de", "This share is password-protected" => "Ĉi tiu kunhavigo estas protektata per pasvorto", @@ -13,7 +12,6 @@ $TRANSLATIONS = array( "sharing is disabled" => "kunhavigo malkapablas", "For more info, please ask the person who sent this link." => "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon.", "Download" => "Elŝuti", -"Direct link" => "Direkta ligilo", -"Save" => "Konservi" +"Direct link" => "Direkta ligilo" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php index 87ff620b4a0..ab6d24c9f65 100644 --- a/apps/files_sharing/l10n/es.php +++ b/apps/files_sharing/l10n/es.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Aún no han compartido contigo ningún archivo.", "You haven't shared any files yet." => "Aún no has compartido ningún archivo.", "You haven't shared any files by link yet." => "Usted todavía no ha compartido ningún archivo por medio de enlaces.", -"Could not load template" => "No se cargó la plantilla", -"Saved" => "Guardado", -"Reset" => "Reiniciar", "Shared by {owner}" => "Compartido por {owner}", "Shared by" => "Compartido por", "This share is password-protected" => "Este elemento compartido esta protegido por contraseña", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.", "Download" => "Descargar", "Download %s" => "Descargar %s", -"Direct link" => "Enlace directo", -"Mail templates" => "Plantillas para correo", -"Theme" => "Tema", -"Template" => "Plantilla", -"Save" => "Guardar" +"Direct link" => "Enlace directo" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php index a5ca4d6a9dc..5fc12ca2af5 100644 --- a/apps/files_sharing/l10n/es_AR.php +++ b/apps/files_sharing/l10n/es_AR.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "Guardado", -"Reset" => "Resetear", "Shared by {owner}" => "Compartido por {owner}", "Shared by" => "Compartido por", "This share is password-protected" => "Esto está protegido por contraseña", @@ -15,7 +13,6 @@ $TRANSLATIONS = array( "sharing is disabled" => "compartir está desactivado", "For more info, please ask the person who sent this link." => "Para mayor información, contactá a la persona que te mandó el enlace.", "Download" => "Descargar", -"Direct link" => "Vínculo directo", -"Save" => "Guardar" +"Direct link" => "Vínculo directo" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/es_MX.php b/apps/files_sharing/l10n/es_MX.php index 2d3844f6485..a7a7302def3 100644 --- a/apps/files_sharing/l10n/es_MX.php +++ b/apps/files_sharing/l10n/es_MX.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"Reset" => "Reiniciar", "Shared by {owner}" => "Compartido por {owner}", "Shared by" => "Compartido por", "This share is password-protected" => "Este elemento compartido esta protegido por contraseña", @@ -14,7 +13,6 @@ $TRANSLATIONS = array( "sharing is disabled" => "compartir está desactivado", "For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.", "Download" => "Descargar", -"Direct link" => "Enlace directo", -"Save" => "Guardar" +"Direct link" => "Enlace directo" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php index da7e2fec4e0..9122c6e2360 100644 --- a/apps/files_sharing/l10n/et_EE.php +++ b/apps/files_sharing/l10n/et_EE.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "Salvestatud", -"Reset" => "Algseaded", "Shared by {owner}" => "Jagas {owner}", "Shared by" => "Jagas", "This share is password-protected" => "See jagamine on parooliga kaitstud", @@ -16,7 +14,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole.", "Download" => "Lae alla", "Download %s" => "Laadi alla %s", -"Direct link" => "Otsene link", -"Save" => "Salvesta" +"Direct link" => "Otsene link" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php index eb346f03acf..1e18ab76593 100644 --- a/apps/files_sharing/l10n/eu.php +++ b/apps/files_sharing/l10n/eu.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "Gordeta", -"Reset" => "Berrezarri", "Shared by {owner}" => "{owner}-k partekatuta", "Shared by" => "Honek elkarbanatuta", "This share is password-protected" => "Elkarbanatutako hau pasahitzarekin babestuta dago", @@ -16,7 +14,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari", "Download" => "Deskargatu", "Download %s" => "Deskargatu %s", -"Direct link" => "Lotura zuzena", -"Save" => "Gorde" +"Direct link" => "Lotura zuzena" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/eu_ES.php b/apps/files_sharing/l10n/eu_ES.php index 77afa3bb6ed..e6e5bc7cbf9 100644 --- a/apps/files_sharing/l10n/eu_ES.php +++ b/apps/files_sharing/l10n/eu_ES.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"Download" => "Deskargatu", -"Save" => "Gorde" +"Download" => "Deskargatu" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php index b29b9a09556..ce036184d38 100644 --- a/apps/files_sharing/l10n/fa.php +++ b/apps/files_sharing/l10n/fa.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"Reset" => "تنظیم مجدد", "Shared by {owner}" => "اشتراک گذارنده {owner}", "Shared by" => "اشتراک گذاشته شده به وسیله", "This share is password-protected" => "این اشتراک توسط رمز عبور محافظت می شود", @@ -15,7 +14,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "برای اطلاعات بیشتر، لطفا از شخصی که این پیوند را ارسال کرده سوال بفرمایید.", "Download" => "دانلود", "Download %s" => "دانلود %s", -"Direct link" => "پیوند مستقیم", -"Save" => "ذخیره" +"Direct link" => "پیوند مستقیم" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php index 2c586ab48c9..bec00b6ec13 100644 --- a/apps/files_sharing/l10n/fi_FI.php +++ b/apps/files_sharing/l10n/fi_FI.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Kukaan ei ole jakanut tiedostoja kanssasi vielä.", "You haven't shared any files yet." => "Et ole jakanut yhtäkään tiedostoa vielä.", "You haven't shared any files by link yet." => "Et ole vielä jakanut yhtäkään tiedostoa linkin kautta.", -"Could not load template" => "Mallipohjan lataaminen epäonnistui", -"Saved" => "Tallennettu", -"Reset" => "Nollaa salasana", "Shared by {owner}" => "Jakanut {owner}", "Shared by" => "Jakanut", "This share is password-protected" => "Tämä jako on suojattu salasanalla", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Kysy lisätietoja henkilöltä, jolta sait linkin.", "Download" => "Lataa", "Download %s" => "Lataa %s", -"Direct link" => "Suora linkki", -"Mail templates" => "Sähköpostimallit", -"Theme" => "Teema", -"Template" => "Mallit", -"Save" => "Tallenna" +"Direct link" => "Suora linkki" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php index 66369f83cbb..e00664fe09e 100644 --- a/apps/files_sharing/l10n/fr.php +++ b/apps/files_sharing/l10n/fr.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Aucun fichier n'est partagé avec vous pour l'instant", "You haven't shared any files yet." => "Vous ne partagez pas de fichier pour l'instant", "You haven't shared any files by link yet." => "Vous ne partagez aucun de fichier par lien pour l'instant.", -"Could not load template" => "Impossible de charger le modèle", -"Saved" => "Sauvegarder", -"Reset" => "Réinitialiser", "Shared by {owner}" => "Partagé par {owner}", "Shared by" => "Partagé par", "This share is password-protected" => "Ce partage est protégé par un mot de passe", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.", "Download" => "Télécharger", "Download %s" => "Télécharger %s", -"Direct link" => "Lien direct", -"Mail templates" => "Modèles de courriels", -"Theme" => "Thème", -"Template" => "Modèles", -"Save" => "Sauvegarder" +"Direct link" => "Lien direct" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php index 4594264698c..7a1acb5a788 100644 --- a/apps/files_sharing/l10n/gl.php +++ b/apps/files_sharing/l10n/gl.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Aínda non hai ficheiros compartidos con vostede.", "You haven't shared any files yet." => "Aínda non compartiu ningún ficheiro.", "You haven't shared any files by link yet." => "Aínda non compartiu ningún ficheiro por ligazón.", -"Could not load template" => "Non foi posíbel cargar o modelo", -"Saved" => "Gardado", -"Reset" => "Restabelecer", "Shared by {owner}" => "Compartido por {owner}", "Shared by" => "Compartido por", "This share is password-protected" => "Esta compartición está protexida con contrasinal", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón.", "Download" => "Descargar", "Download %s" => "Descargar %s", -"Direct link" => "Ligazón directa", -"Mail templates" => "Modelos de correo", -"Theme" => "Tema", -"Template" => "Modelo", -"Save" => "Gardar" +"Direct link" => "Ligazón directa" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php index 173facab0e8..923234c7cb2 100644 --- a/apps/files_sharing/l10n/he.php +++ b/apps/files_sharing/l10n/he.php @@ -4,7 +4,6 @@ $TRANSLATIONS = array( "Shared by" => "שותף על־ידי", "Password" => "סיסמא", "Name" => "שם", -"Download" => "הורדה", -"Save" => "שמירה" +"Download" => "הורדה" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php index 9e3c15af39e..47625e00207 100644 --- a/apps/files_sharing/l10n/hi.php +++ b/apps/files_sharing/l10n/hi.php @@ -1,7 +1,6 @@ <?php $TRANSLATIONS = array( "Shared by" => "द्वारा साझा", -"Password" => "पासवर्ड", -"Save" => "सहेजें" +"Password" => "पासवर्ड" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php index 5e148d603fc..45a29df4448 100644 --- a/apps/files_sharing/l10n/hr.php +++ b/apps/files_sharing/l10n/hr.php @@ -2,7 +2,6 @@ $TRANSLATIONS = array( "Password" => "Lozinka", "Name" => "Ime", -"Download" => "Preuzimanje", -"Save" => "Snimi" +"Download" => "Preuzimanje" ); $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;"; diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php index a95322f093f..82683852d25 100644 --- a/apps/files_sharing/l10n/hu_HU.php +++ b/apps/files_sharing/l10n/hu_HU.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "Elmentve", -"Reset" => "Visszaállítás", "Shared by {owner}" => "Megosztotta: {owner}", "Shared by" => "Megosztotta Önnel", "This share is password-protected" => "Ez egy jelszóval védett megosztás", @@ -15,7 +13,6 @@ $TRANSLATIONS = array( "sharing is disabled" => "letiltásra került a megosztás", "For more info, please ask the person who sent this link." => "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!", "Download" => "Letöltés", -"Direct link" => "Közvetlen link", -"Save" => "Mentés" +"Direct link" => "Közvetlen link" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/hy.php b/apps/files_sharing/l10n/hy.php index cca63deddc1..da200623e03 100644 --- a/apps/files_sharing/l10n/hy.php +++ b/apps/files_sharing/l10n/hy.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"Download" => "Բեռնել", -"Save" => "Պահպանել" +"Download" => "Բեռնել" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php index 4322387d48c..a872a83797c 100644 --- a/apps/files_sharing/l10n/ia.php +++ b/apps/files_sharing/l10n/ia.php @@ -1,9 +1,7 @@ <?php $TRANSLATIONS = array( -"Reset" => "Re-fixar", "Password" => "Contrasigno", "Name" => "Nomine", -"Download" => "Discargar", -"Save" => "Salveguardar" +"Download" => "Discargar" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php index 47814045a7b..6411d18462f 100644 --- a/apps/files_sharing/l10n/id.php +++ b/apps/files_sharing/l10n/id.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "Disimpan", -"Reset" => "Atur Ulang", "Shared by {owner}" => "Dibagikan oleh {owner}", "Shared by" => "Dibagikan oleh", "This share is password-protected" => "Berbagi ini dilindungi sandi", @@ -15,7 +13,6 @@ $TRANSLATIONS = array( "sharing is disabled" => "berbagi dinonaktifkan", "For more info, please ask the person who sent this link." => "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini.", "Download" => "Unduh", -"Direct link" => "Tautan langsung", -"Save" => "Simpan" +"Direct link" => "Tautan langsung" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php index 5c584ca8979..c8e1e146c50 100644 --- a/apps/files_sharing/l10n/is.php +++ b/apps/files_sharing/l10n/is.php @@ -3,7 +3,6 @@ $TRANSLATIONS = array( "Shared by" => "Deilt af", "Password" => "Lykilorð", "Name" => "Nafn", -"Download" => "Niðurhal", -"Save" => "Vista" +"Download" => "Niðurhal" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php index 382cd47adca..4c1736b2b9f 100644 --- a/apps/files_sharing/l10n/it.php +++ b/apps/files_sharing/l10n/it.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Non è stato ancora condiviso alcun file con te.", "You haven't shared any files yet." => "Non hai ancora condiviso alcun file.", "You haven't shared any files by link yet." => "Non hai ancora condiviso alcun file tramite collegamento.", -"Could not load template" => "Impossibile caricare il modello", -"Saved" => "Salvato", -"Reset" => "Ripristina", "Shared by {owner}" => "Condiviso da {owner}", "Shared by" => "Condiviso da", "This share is password-protected" => "Questa condivione è protetta da password", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.", "Download" => "Scarica", "Download %s" => "Scarica %s", -"Direct link" => "Collegamento diretto", -"Mail templates" => "Modelli di messaggio", -"Theme" => "Tema", -"Template" => "Modello", -"Save" => "Salva" +"Direct link" => "Collegamento diretto" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/ja.php b/apps/files_sharing/l10n/ja.php index a93989b29d8..7281be87df5 100644 --- a/apps/files_sharing/l10n/ja.php +++ b/apps/files_sharing/l10n/ja.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "まだ共有を行なっているファイルはありません。", "You haven't shared any files yet." => "まだ共有を行なっているファイルはありません。", "You haven't shared any files by link yet." => "まだURLリンクで共有を行なっているファイルはありません。", -"Could not load template" => "テンプレートを読み出せませんでした", -"Saved" => "保存されました", -"Reset" => "リセット", "Shared by {owner}" => "{owner} と共有中", "Shared by" => "共有者：", "This share is password-protected" => "この共有はパスワードで保護されています", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "不明な点は、こちらのリンクの提供者に確認をお願いします。", "Download" => "ダウンロード", "Download %s" => "%s をダウンロード", -"Direct link" => "リンク", -"Mail templates" => "メールテンプレート", -"Theme" => "テーマ", -"Template" => "テンプレート", -"Save" => "保存" +"Direct link" => "リンク" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php index 390b634eb59..57927466c2c 100644 --- a/apps/files_sharing/l10n/ka_GE.php +++ b/apps/files_sharing/l10n/ka_GE.php @@ -4,7 +4,6 @@ $TRANSLATIONS = array( "Shared by" => "აზიარებს", "Password" => "პაროლი", "Name" => "სახელი", -"Download" => "ჩამოტვირთვა", -"Save" => "შენახვა" +"Download" => "ჩამოტვირთვა" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/km.php b/apps/files_sharing/l10n/km.php index 17a7056d3bc..d609345f454 100644 --- a/apps/files_sharing/l10n/km.php +++ b/apps/files_sharing/l10n/km.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "បានរក្សាទុក", "Shared by {owner}" => "{owner} បានចែករំលែក", "Shared by" => "បានចែករំលែកដោយ", "This share is password-protected" => "ការចែករំលែកនេះត្រូវបានការពារដោយពាក្យសម្ងាត់", @@ -15,7 +14,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "សម្រាប់ព័ត៌មានបន្ថែម សូមសួរអ្នកដែលផ្ញើតំណនេះ។", "Download" => "ទាញយក", "Download %s" => "ទាញយក %s", -"Direct link" => "តំណផ្ទាល់", -"Save" => "រក្សាទុក" +"Direct link" => "តំណផ្ទាល់" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php index e797feb64e8..22b76509a6b 100644 --- a/apps/files_sharing/l10n/ko.php +++ b/apps/files_sharing/l10n/ko.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "저장됨", -"Reset" => "재설정", "Shared by {owner}" => "{owner} 님이 공유함", "Shared by" => "공유한 사용자:", "This share is password-protected" => "이 공유는 암호로 보호되어 있습니다", @@ -15,7 +13,6 @@ $TRANSLATIONS = array( "sharing is disabled" => "공유가 비활성화됨", "For more info, please ask the person who sent this link." => "자세한 정보는 링크를 보낸 사람에게 문의하십시오.", "Download" => "다운로드", -"Direct link" => "직접 링크", -"Save" => "저장" +"Direct link" => "직접 링크" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php index 4e534ef4c56..f7765a95398 100644 --- a/apps/files_sharing/l10n/ku_IQ.php +++ b/apps/files_sharing/l10n/ku_IQ.php @@ -2,7 +2,6 @@ $TRANSLATIONS = array( "Password" => "وشەی تێپەربو", "Name" => "ناو", -"Download" => "داگرتن", -"Save" => "پاشکهوتکردن" +"Download" => "داگرتن" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php index f7b6a92e551..f0e5b762440 100644 --- a/apps/files_sharing/l10n/lb.php +++ b/apps/files_sharing/l10n/lb.php @@ -1,11 +1,9 @@ <?php $TRANSLATIONS = array( -"Reset" => "Zeréck setzen", "Shared by" => "Gedeelt vun", "The password is wrong. Try again." => "Den Passwuert ass incorrect. Probeier ed nach eng keier.", "Password" => "Passwuert", "Name" => "Numm", -"Download" => "Download", -"Save" => "Späicheren" +"Download" => "Download" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php index 1c6d736eb26..770a56d465b 100644 --- a/apps/files_sharing/l10n/lt_LT.php +++ b/apps/files_sharing/l10n/lt_LT.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"Reset" => "Atstatyti", "Shared by {owner}" => "Bendrina {owner}", "Shared by" => "Dalinasi", "This share is password-protected" => "Turinys apsaugotas slaptažodžiu", @@ -14,7 +13,6 @@ $TRANSLATIONS = array( "sharing is disabled" => "dalinimasis yra išjungtas", "For more info, please ask the person who sent this link." => "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą.", "Download" => "Atsisiųsti", -"Direct link" => "Tiesioginė nuoroda", -"Save" => "Išsaugoti" +"Direct link" => "Tiesioginė nuoroda" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php index 6774936b4f5..286dd431bae 100644 --- a/apps/files_sharing/l10n/lv.php +++ b/apps/files_sharing/l10n/lv.php @@ -4,7 +4,6 @@ $TRANSLATIONS = array( "Shared by" => "Dalījās", "Password" => "Parole", "Name" => "Nosaukums", -"Download" => "Lejupielādēt", -"Save" => "Saglabāt" +"Download" => "Lejupielādēt" ); $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"; diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php index f0950f51f90..6f5a4418e7b 100644 --- a/apps/files_sharing/l10n/mk.php +++ b/apps/files_sharing/l10n/mk.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Ниту една датотека сеуште не била споделена со вас.", "You haven't shared any files yet." => "Вие досега немате споделено ниту една датотека.", "You haven't shared any files by link yet." => "Сеуште немате споделено датотека со врска.", -"Could not load template" => "Не можам да го вчитам шаблонот", -"Saved" => "Снимено", -"Reset" => "Поништи", "Shared by {owner}" => "Споделени од {owner}", "Shared by" => "Споделено од", "This share is password-protected" => "Ова споделување е заштитено со лозинка", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "За повеќе информации, прашајте го лицето кое ви ја испратила врската.", "Download" => "Преземи", "Download %s" => "Преземи %s", -"Direct link" => "Директна врска", -"Mail templates" => "Шаблони за електронска пошта", -"Theme" => "Теми", -"Template" => "Шаблон", -"Save" => "Сними" +"Direct link" => "Директна врска" ); $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"; diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php index b966f5ab0f9..63e48b38729 100644 --- a/apps/files_sharing/l10n/ms_MY.php +++ b/apps/files_sharing/l10n/ms_MY.php @@ -3,7 +3,6 @@ $TRANSLATIONS = array( "Shared by" => "Dikongsi dengan", "Password" => "Kata laluan", "Name" => "Nama", -"Download" => "Muat turun", -"Save" => "Simpan" +"Download" => "Muat turun" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php index de10d89b50c..f7b71683929 100644 --- a/apps/files_sharing/l10n/nb_NO.php +++ b/apps/files_sharing/l10n/nb_NO.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Ingen filer er delt med deg ennå.", "You haven't shared any files yet." => "Du har ikke delt noen filer ennå.", "You haven't shared any files by link yet." => "Du har ikke delt noen filer med lenke ennå.", -"Could not load template" => "Klarte ikke å laste mal", -"Saved" => "Lagret", -"Reset" => "Nullstill", "Shared by {owner}" => "Delt av {owner}", "Shared by" => "Delt av", "This share is password-protected" => "Denne delingen er passordbeskyttet", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "For mer informasjon, spør personen som sendte lenken.", "Download" => "Last ned", "Download %s" => "Last ned %s", -"Direct link" => "Direkte lenke", -"Mail templates" => "Epost-maler", -"Theme" => "Tema", -"Template" => "Mal", -"Save" => "Lagre" +"Direct link" => "Direkte lenke" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php index 9fcedd3ac3d..e027b990a20 100644 --- a/apps/files_sharing/l10n/nl.php +++ b/apps/files_sharing/l10n/nl.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Er zijn nog geen bestanden met u gedeeld.", "You haven't shared any files yet." => "U hebt nog geen bestanden gedeeld.", "You haven't shared any files by link yet." => "U hebt nog geen bestanden via een link gedeeld.", -"Could not load template" => "Kon sjabloon niet laden", -"Saved" => "Bewaard", -"Reset" => "Reset", "Shared by {owner}" => "Gedeeld door {owner}", "Shared by" => "Gedeeld door", "This share is password-protected" => "Deze share is met een wachtwoord beveiligd", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd.", "Download" => "Downloaden", "Download %s" => "Download %s", -"Direct link" => "Directe link", -"Mail templates" => "E-mailsjablonen", -"Theme" => "Thema", -"Template" => "Sjabloon", -"Save" => "Bewaren" +"Direct link" => "Directe link" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php index b95f41a5176..34c70a554d3 100644 --- a/apps/files_sharing/l10n/nn_NO.php +++ b/apps/files_sharing/l10n/nn_NO.php @@ -11,7 +11,6 @@ $TRANSLATIONS = array( "the link expired" => "lenkja har gått ut på dato", "sharing is disabled" => "deling er slått av", "For more info, please ask the person who sent this link." => "Spør den som sende deg lenkje om du vil ha meir informasjon.", -"Download" => "Last ned", -"Save" => "Lagra" +"Download" => "Last ned" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php index 32a2b808ec0..2127e9dcfac 100644 --- a/apps/files_sharing/l10n/oc.php +++ b/apps/files_sharing/l10n/oc.php @@ -2,7 +2,6 @@ $TRANSLATIONS = array( "Password" => "Senhal", "Name" => "Nom", -"Download" => "Avalcarga", -"Save" => "Enregistra" +"Download" => "Avalcarga" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php index b6e33b1cf5d..18740679e6a 100644 --- a/apps/files_sharing/l10n/pl.php +++ b/apps/files_sharing/l10n/pl.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Nie ma jeszcze żadnych plików współdzielonych z Tobą", "You haven't shared any files yet." => "Nie współdzielisz jeszcze żadnych plików.", "You haven't shared any files by link yet." => "Nie współdzielisz jeszcze żadnych plików linkiem", -"Could not load template" => "Nie można załadować szablonu", -"Saved" => "Zapisano", -"Reset" => "Resetuj", "Shared by {owner}" => "Udostępnione przez {owner}", "Shared by" => "Udostępniane przez", "This share is password-protected" => "Udział ten jest chroniony hasłem", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link.", "Download" => "Pobierz", "Download %s" => "Pobierz %s", -"Direct link" => "Bezpośredni link", -"Mail templates" => "Szablony maili", -"Theme" => "Motyw", -"Template" => "Szablon", -"Save" => "Zapisz" +"Direct link" => "Bezpośredni link" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php index fc54a8dc917..15a0b87f032 100644 --- a/apps/files_sharing/l10n/pt_BR.php +++ b/apps/files_sharing/l10n/pt_BR.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Nenhum arquivo ainda foi compartilhado com você.", "You haven't shared any files yet." => "Você ainda não compartilhou nenhum arquivo.", "You haven't shared any files by link yet." => "Você ainda não compartilhou nenhum arquivo por link.", -"Could not load template" => "Não foi possível carregar modelo", -"Saved" => "Salvo", -"Reset" => "Resetar", "Shared by {owner}" => "Compartilhado por {owner}", "Shared by" => "Compartilhada por", "This share is password-protected" => "Este compartilhamento esta protegido por senha", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Para mais informações, por favor, pergunte a pessoa que enviou este link.", "Download" => "Baixar", "Download %s" => "Baixar %s", -"Direct link" => "Link direto", -"Mail templates" => "Modelo de email", -"Theme" => "Tema", -"Template" => "Modelo", -"Save" => "Guardar" +"Direct link" => "Link direto" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php index cdacb5dc28f..03c57847d85 100644 --- a/apps/files_sharing/l10n/pt_PT.php +++ b/apps/files_sharing/l10n/pt_PT.php @@ -2,8 +2,6 @@ $TRANSLATIONS = array( "Shared with you" => "Partilhado consigo ", "Shared with others" => "Partilhado com outros", -"Saved" => "Guardado", -"Reset" => "Repor", "Shared by {owner}" => "Partilhado por {owner}", "Shared by" => "Partilhado por", "This share is password-protected" => "Esta partilha está protegida por palavra-chave", @@ -19,7 +17,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Para mais informações, por favor questione a pessoa que lhe enviou este link", "Download" => "Transferir", "Download %s" => "Download %s", -"Direct link" => "Link direto", -"Save" => "Guardar" +"Direct link" => "Link direto" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php index 7425fd6f0b3..49ef06b5fd7 100644 --- a/apps/files_sharing/l10n/ro.php +++ b/apps/files_sharing/l10n/ro.php @@ -1,11 +1,9 @@ <?php $TRANSLATIONS = array( -"Saved" => "Salvat", "Shared by" => "impartite in ", "The password is wrong. Try again." => "Parola este incorectă. Încercaţi din nou.", "Password" => "Parolă", "Name" => "Nume", -"Download" => "Descarcă", -"Save" => "Salvează" +"Download" => "Descarcă" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"; diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php index ae016092ea4..635508ac75e 100644 --- a/apps/files_sharing/l10n/ru.php +++ b/apps/files_sharing/l10n/ru.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "Сохранено", -"Reset" => "Сброс", "Shared by {owner}" => "Доступ открыл {owner}", "Shared by" => "Опубликовано", "This share is password-protected" => "Для доступа к информации необходимо ввести пароль", @@ -16,9 +14,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Для получения дополнительной информации, пожалуйста, свяжитесь с тем, кто отправил Вам эту ссылку.", "Download" => "Скачать", "Download %s" => "Скачать %s", -"Direct link" => "Прямая ссылка", -"Theme" => "Тема", -"Template" => "Шаблон", -"Save" => "Сохранить" +"Direct link" => "Прямая ссылка" ); $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);"; diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php index bfceab6c04b..bd71de99b34 100644 --- a/apps/files_sharing/l10n/si_LK.php +++ b/apps/files_sharing/l10n/si_LK.php @@ -2,7 +2,6 @@ $TRANSLATIONS = array( "Password" => "මුර පදය", "Name" => "නම", -"Download" => "බාන්න", -"Save" => "සුරකින්න" +"Download" => "බාන්න" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/sk.php b/apps/files_sharing/l10n/sk.php index 6eea6a80bb8..72c9039571e 100644 --- a/apps/files_sharing/l10n/sk.php +++ b/apps/files_sharing/l10n/sk.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"Download" => "Stiahnuť", -"Save" => "Uložiť" +"Download" => "Stiahnuť" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php index 7e3a7cef678..379fb03c491 100644 --- a/apps/files_sharing/l10n/sk_SK.php +++ b/apps/files_sharing/l10n/sk_SK.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Zatiaľ s vami nikto žiadne súbory nezdieľal.", "You haven't shared any files yet." => "Zatiaľ ste nezdieľali žiadne súbory.", "You haven't shared any files by link yet." => "Zatiaľ ste pomocou odkazu nezdieľali žiaden súbor.", -"Could not load template" => "Šablónu nemožno nahrať", -"Saved" => "Uložené", -"Reset" => "Resetovať", "Shared by {owner}" => "Zdieľa {owner}", "Shared by" => "Zdieľa", "This share is password-protected" => "Toto zdieľanie je chránené heslom", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.", "Download" => "Sťahovanie", "Download %s" => "Stiahnuť %s", -"Direct link" => "Priama linka", -"Mail templates" => "Emailové šablóny", -"Theme" => "Téma", -"Template" => "Šablóna", -"Save" => "Uložiť" +"Direct link" => "Priama linka" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php index 8cb0d07a3b5..972432abec6 100644 --- a/apps/files_sharing/l10n/sl.php +++ b/apps/files_sharing/l10n/sl.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Nobene datoteka še niste dali v souporabo", "You haven't shared any files yet." => "Niste še delili datotek", "You haven't shared any files by link yet." => "Niste še delili datotek preko povezave", -"Could not load template" => "Predloge ni bilo mogoče naložiti", -"Saved" => "Shranjeno", -"Reset" => "Ponastavi", "Shared by {owner}" => "Souporabo omogoča {owner}", "Shared by" => "V souporabi z", "This share is password-protected" => "To mesto je zaščiteno z geslom.", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Za več podrobnosti stopite v stik s pošiljateljem te povezave.", "Download" => "Prejmi", "Download %s" => "Prejmi %s", -"Direct link" => "Neposredna povezava", -"Mail templates" => "Predloga elektronske pošte", -"Theme" => "Tema", -"Template" => "Predloga", -"Save" => "Shrani" +"Direct link" => "Neposredna povezava" ); $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"; diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php index 5daba77fad0..ee8207e6d91 100644 --- a/apps/files_sharing/l10n/sq.php +++ b/apps/files_sharing/l10n/sq.php @@ -12,7 +12,6 @@ $TRANSLATIONS = array( "sharing is disabled" => "ndarja është çaktivizuar", "For more info, please ask the person who sent this link." => "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje.", "Download" => "Shkarko", -"Direct link" => "Lidhje direkte", -"Save" => "Ruaj" +"Direct link" => "Lidhje direkte" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php index b8daeb8cf18..e5b72d3a501 100644 --- a/apps/files_sharing/l10n/sr.php +++ b/apps/files_sharing/l10n/sr.php @@ -3,7 +3,6 @@ $TRANSLATIONS = array( "Shared by" => "Делио", "Password" => "Лозинка", "Name" => "Име", -"Download" => "Преузми", -"Save" => "Сачувај" +"Download" => "Преузми" ); $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);"; diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php index f76e2ad587f..a0cf64c0f1d 100644 --- a/apps/files_sharing/l10n/sr@latin.php +++ b/apps/files_sharing/l10n/sr@latin.php @@ -2,7 +2,6 @@ $TRANSLATIONS = array( "Password" => "Lozinka", "Name" => "Ime", -"Download" => "Preuzmi", -"Save" => "Snimi" +"Download" => "Preuzmi" ); $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);"; diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php index 922e964ef77..e5fbd7a90af 100644 --- a/apps/files_sharing/l10n/sv.php +++ b/apps/files_sharing/l10n/sv.php @@ -4,9 +4,6 @@ $TRANSLATIONS = array( "Shared with others" => "Delat med andra", "No files have been shared with you yet." => "Inga filer har ännu delats med dig.", "You haven't shared any files yet." => "Du har inte delat några filer ännu.", -"Could not load template" => "Kunde inte ladda mall", -"Saved" => "Sparad", -"Reset" => "Återställ", "Shared by {owner}" => "Delad av {owner}", "Shared by" => "Delad av", "This share is password-protected" => "Den här delningen är lösenordsskyddad", @@ -22,10 +19,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "För mer information, kontakta den person som skickade den här länken.", "Download" => "Ladda ner", "Download %s" => "Ladda ner %s", -"Direct link" => "Direkt länk", -"Mail templates" => "e-postmallar", -"Theme" => "Teman", -"Template" => "Mallar", -"Save" => "Spara" +"Direct link" => "Direkt länk" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/ta_LK.php b/apps/files_sharing/l10n/ta_LK.php index f3d6dfe4b4a..c1b451ae7f8 100644 --- a/apps/files_sharing/l10n/ta_LK.php +++ b/apps/files_sharing/l10n/ta_LK.php @@ -3,7 +3,6 @@ $TRANSLATIONS = array( "Shared by {owner}" => "பகிரப்பட்டது {சொந்தகாரர்}", "Password" => "கடவுச்சொல்", "Name" => "பெயர்", -"Download" => "பதிவிறக்குக", -"Save" => "சேமிக்க " +"Download" => "பதிவிறக்குக" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/te.php b/apps/files_sharing/l10n/te.php index c2e3956d753..e9da4e6963d 100644 --- a/apps/files_sharing/l10n/te.php +++ b/apps/files_sharing/l10n/te.php @@ -1,7 +1,6 @@ <?php $TRANSLATIONS = array( "Password" => "సంకేతపదం", -"Name" => "పేరు", -"Save" => "భద్రపరచు" +"Name" => "పేరు" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php index add89712900..fdb9555babe 100644 --- a/apps/files_sharing/l10n/th_TH.php +++ b/apps/files_sharing/l10n/th_TH.php @@ -4,7 +4,6 @@ $TRANSLATIONS = array( "Shared by" => "ถูกแชร์โดย", "Password" => "รหัสผ่าน", "Name" => "ชื่อ", -"Download" => "ดาวน์โหลด", -"Save" => "บันทึก" +"Download" => "ดาวน์โหลด" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php index bdbe5c6bb44..90970dc762e 100644 --- a/apps/files_sharing/l10n/tr.php +++ b/apps/files_sharing/l10n/tr.php @@ -6,9 +6,6 @@ $TRANSLATIONS = array( "No files have been shared with you yet." => "Henüz sizinle paylaşılan bir dosya yok.", "You haven't shared any files yet." => "Henüz hiçbir dosya paylaşmadınız.", "You haven't shared any files by link yet." => "Bağlantı ile henüz hiçbir dosya paylaşmadınız.", -"Could not load template" => "Şablon yüklenemedi", -"Saved" => "Kaydedildi", -"Reset" => "Sıfırla", "Shared by {owner}" => "{owner} tarafından paylaşılmış", "Shared by" => "Paylaşan", "This share is password-protected" => "Bu paylaşım parola korumalı", @@ -24,10 +21,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "Daha fazla bilgi için bu bağlantıyı aldığınız kişi ile iletişime geçin.", "Download" => "İndir", "Download %s" => "İndir: %s", -"Direct link" => "Doğrudan bağlantı", -"Mail templates" => "Posta şablonları", -"Theme" => "Tema", -"Template" => "Şablon", -"Save" => "Kaydet" +"Direct link" => "Doğrudan bağlantı" ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php index 6e2a8c27298..544f2f3f76c 100644 --- a/apps/files_sharing/l10n/ug.php +++ b/apps/files_sharing/l10n/ug.php @@ -3,7 +3,6 @@ $TRANSLATIONS = array( "Shared by" => "ھەمبەھىرلىگۈچى", "Password" => "ئىم", "Name" => "ئاتى", -"Download" => "چۈشۈر", -"Save" => "ساقلا" +"Download" => "چۈشۈر" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php index 146842d26c8..0033c5036e3 100644 --- a/apps/files_sharing/l10n/uk.php +++ b/apps/files_sharing/l10n/uk.php @@ -1,6 +1,5 @@ <?php $TRANSLATIONS = array( -"Reset" => "Перевстановити", "Shared by {owner}" => "Опублікував {owner}", "Shared by" => "Опубліковано", "This share is password-protected" => "Цей ресурс обміну захищений паролем", @@ -14,7 +13,6 @@ $TRANSLATIONS = array( "sharing is disabled" => "обмін заборонений", "For more info, please ask the person who sent this link." => "Для отримання додаткової інформації, будь ласка, зверніться до особи, яка надіслала це посилання.", "Download" => "Завантажити", -"Direct link" => "Пряме посилання", -"Save" => "Зберегти" +"Direct link" => "Пряме посилання" ); $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);"; diff --git a/apps/files_sharing/l10n/ur_PK.php b/apps/files_sharing/l10n/ur_PK.php index 01b11101093..f96b0c0cba0 100644 --- a/apps/files_sharing/l10n/ur_PK.php +++ b/apps/files_sharing/l10n/ur_PK.php @@ -1,10 +1,8 @@ <?php $TRANSLATIONS = array( -"Reset" => "ری سیٹ", "Shared by" => "سے اشتراک شدہ", "Password" => "پاسورڈ", "Name" => "اسم", -"Download" => "ڈاؤن لوڈ،", -"Save" => "حفظ" +"Download" => "ڈاؤن لوڈ،" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php index 2f2a2387beb..33c0d2188d8 100644 --- a/apps/files_sharing/l10n/vi.php +++ b/apps/files_sharing/l10n/vi.php @@ -1,11 +1,9 @@ <?php $TRANSLATIONS = array( -"Reset" => "Khởi động lại", "Shared by {owner}" => "Được chia sẽ bởi {owner}", "Shared by" => "Chia sẻ bởi", "Password" => "Mật khẩu", "Name" => "Tên", -"Download" => "Tải về", -"Save" => "Lưu" +"Download" => "Tải về" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php index 2399f5116a6..0a8c0950497 100644 --- a/apps/files_sharing/l10n/zh_CN.php +++ b/apps/files_sharing/l10n/zh_CN.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "已保存", -"Reset" => "重置", "Shared by {owner}" => "由{owner}共享", "Shared by" => "共享人", "This share is password-protected" => "这是一个密码保护的共享", @@ -16,7 +14,6 @@ $TRANSLATIONS = array( "For more info, please ask the person who sent this link." => "欲知详情，请联系发给你链接的人。", "Download" => "下载", "Download %s" => "下载 %s", -"Direct link" => "直接链接", -"Save" => "保存" +"Direct link" => "直接链接" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/zh_HK.php b/apps/files_sharing/l10n/zh_HK.php index 21b919d822b..9856b504cfa 100644 --- a/apps/files_sharing/l10n/zh_HK.php +++ b/apps/files_sharing/l10n/zh_HK.php @@ -2,7 +2,6 @@ $TRANSLATIONS = array( "Password" => "密碼", "Name" => "名稱", -"Download" => "下載", -"Save" => "儲存" +"Download" => "下載" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php index 5b1c4d45dd1..d603059ec9e 100644 --- a/apps/files_sharing/l10n/zh_TW.php +++ b/apps/files_sharing/l10n/zh_TW.php @@ -1,7 +1,5 @@ <?php $TRANSLATIONS = array( -"Saved" => "已儲存", -"Reset" => "重設", "Shared by {owner}" => "由 {owner} 分享", "Shared by" => "由...分享", "This share is password-protected" => "這個分享有密碼保護", @@ -14,7 +12,6 @@ $TRANSLATIONS = array( "the link expired" => "連結過期", "sharing is disabled" => "分享功能已停用", "For more info, please ask the person who sent this link." => "請詢問告訴您此連結的人以瞭解更多", -"Download" => "下載", -"Save" => "儲存" +"Download" => "下載" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/lib/mailtemplate.php b/apps/files_sharing/lib/mailtemplate.php deleted file mode 100644 index ca1b0234ccf..00000000000 --- a/apps/files_sharing/lib/mailtemplate.php +++ /dev/null @@ -1,126 +0,0 @@ -<?php - -namespace OCA\Files_Sharing; - -use \OCP\Files\NotPermittedException; -use \OC\AppFramework\Middleware\Security\SecurityException; -use OCA\Files_Sharing\Http\MailTemplateResponse; - -class MailTemplate extends \OC_Template { - - private $path; - private $theme; - private $editableThemes; - private $editableTemplates; - - public function __construct($theme, $path) { - $this->theme = $theme; - $this->path = $path; - - //determine valid theme names - $this->editableThemes = self::getEditableThemes(); - //for now hard code the valid mail template paths - $this->editableTemplates = self::getEditableTemplates(); - } - - /** - * - * @return \OCA\Files_Sharing\Http\MailTemplateResponse - */ - public function getResponse() { - if($this->isEditable()) { - list($app, $filename) = explode('/templates/', $this->path, 2); - $name = substr($filename, 0, -4); - list($path, $template) = $this->findTemplate($this->theme, $app, $name, ''); - return new MailTemplateResponse($template); - } - throw new SecurityException('Template not editable.', 403); - } - - public function renderContent() { - if($this->isEditable()) { - list($app, $filename) = explode('/templates/', $this->path, 2); - $name = substr($filename, 0, -4); - list($path, $template) = $this->findTemplate($this->theme, $app, $name, ''); - \OC_Response::sendFile($template); - } else { - throw new SecurityException('Template not editable.', 403); - } - } - - public function isEditable() { - if ($this->editableThemes[$this->theme] - && $this->editableTemplates[$this->path] - ) { - return true; - } - return false; - } - - public function setContent($data) { - if($this->isEditable()) { - //save default templates in default folder to overwrite core template - $absolutePath = \OC::$SERVERROOT.'/themes/'.$this->theme.'/'.$this->path; - $parent = dirname($absolutePath); - if ( ! is_dir($parent) ) { - if ( ! mkdir(dirname($absolutePath), 0777, true) ){ - throw new \Exception('Could not create directory.', 500); - } - } - if ( $this->theme !== 'default' && is_file($absolutePath) ) { - if ( ! copy($absolutePath, $absolutePath.'.bak') ){ - throw new \Exception('Could not overwrite template.', 500); - } - } - //overwrite theme templates? versioning? - return file_put_contents($absolutePath, $data); - } - throw new SecurityException('Template not editable.', 403); - } - - public function reset(){ - if($this->isEditable()) { - $absolutePath = \OC::$SERVERROOT.'/themes/'.$this->theme.'/'.$this->path; - if ($this->theme === 'default') { - //templates can simply be deleted in the themes folder - if (unlink($absolutePath)) { - return true; - } - } else { - //if a bak file exists overwrite the template with it - if (is_file($absolutePath.'.bak')) { - if (rename($absolutePath.'.bak', $absolutePath)) { - return true; - } - } - } - return false; - } - throw new NotPermittedException('Template not editable.', 403); - } - - public static function getEditableThemes() { - $themes = array( - 'default' => true - ); - if ($handle = opendir(\OC::$SERVERROOT.'/themes')) { - while (false !== ($entry = readdir($handle))) { - if ($entry != '.' && $entry != '..' && $entry != 'default') { - if (is_dir(\OC::$SERVERROOT.'/themes/'.$entry)) { - $themes[$entry] = true; - } - } - } - closedir($handle); - } - return $themes; - } - - public static function getEditableTemplates() { - return array( - 'core/templates/mail.php' => true, - 'core/templates/altmail.php' => true, - 'core/lostpassword/templates/email.php' => true, - ); - } -} diff --git a/apps/files_sharing/settings-admin.php b/apps/files_sharing/settings-admin.php deleted file mode 100644 index 8f15e272312..00000000000 --- a/apps/files_sharing/settings-admin.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php -/** - * Copyright (c) 2011 Robin Appelman <icewind@owncloud.com> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -\OC_Util::checkAdminUser(); - -\OCP\Util::addStyle('files_sharing', 'settings-admin'); -\OCP\Util::addScript('files_sharing', 'settings-admin'); - -$themes = \OCA\Files_Sharing\MailTemplate::getEditableThemes(); -$editableTemplates = \OCA\Files_Sharing\MailTemplate::getEditableTemplates(); - -$tmpl = new OCP\Template('files_sharing', 'settings-admin'); -$tmpl->assign('themes', $themes); -$tmpl->assign('editableTemplates', $editableTemplates); - -return $tmpl->fetchPage(); diff --git a/apps/files_sharing/templates/settings-admin.php b/apps/files_sharing/templates/settings-admin.php deleted file mode 100644 index 4021be871cd..00000000000 --- a/apps/files_sharing/templates/settings-admin.php +++ /dev/null @@ -1,41 +0,0 @@ -<div class="section" id="mailTemplateSettings" > - - <h2><?php p($l->t('Mail templates'));?></h2> - - <div class="actions"> - - <div> - <label for="mts-theme"><?php p($l->t('Theme'));?></label> - <select id="mts-theme"> - <?php foreach($_['themes'] as $theme => $editable): ?> - <option><?php p($theme); ?></option> - <?php endforeach; ?> - </select> - </div> - - <div> - <label for="mts-template"><?php p($l->t('Template'));?></label> - <select id="mts-template"> - <?php foreach($_['editableTemplates'] as $template => $editable): ?> - <option><?php p($template); ?></option> - <?php endforeach; ?> - </select> - </div> - - </div> - - <div class="templateEditor"> - <textarea></textarea> - </div> - - <div class="actions"> - - <button class="reset"><?php p($l->t('Reset'));?></button> - - <button class="save"><?php p($l->t('Save'));?></button> - - <span id="mts-msg" class="msg"></span> - - </div> - -</div> diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php index e7d634ccc1e..254386aea7f 100644 --- a/apps/user_ldap/l10n/cs_CZ.php +++ b/apps/user_ldap/l10n/cs_CZ.php @@ -33,6 +33,8 @@ $TRANSLATIONS = array( "Invalid Host" => "Neplatný hostitel", "Could not find the desired feature" => "Nelze nalézt požadovanou vlastnost", "Server" => "Server", +"User Filter" => "Uživatelský Filtr", +"Login Filter" => "Přihlašovací Filtr", "Group Filter" => "Filtr skupin", "Save" => "Uložit", "Test Configuration" => "Vyzkoušet nastavení", @@ -67,6 +69,7 @@ $TRANSLATIONS = array( "users found" => "nalezení uživatelé", "Back" => "Zpět", "Continue" => "Pokračovat", +"Expert" => "Expertní", "Advanced" => "Pokročilé", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému, aby jej nainstaloval.", diff --git a/apps/user_webdavauth/l10n/da.php b/apps/user_webdavauth/l10n/da.php index 219cac8b699..da23d6ddd66 100644 --- a/apps/user_webdavauth/l10n/da.php +++ b/apps/user_webdavauth/l10n/da.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "WebDAV Authentication" => "WebDAV-godkendelse", +"Address:" => "Adresse:", "Save" => "Gem", "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Bruger oplysningerne vil blive sendt til denne adresse. Plugin'et registrerer responsen og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger." ); diff --git a/config/config.sample.php b/config/config.sample.php index 4b1ab2fce5f..6da00fc12a5 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -26,7 +26,7 @@ $CONFIG = array( /* Password to access the ownCloud database */ "dbpassword" => "", -/* Host running the ownCloud database */ +/* Host running the ownCloud database. To specify a port use "HOSTNAME:####"; to specify a unix sockets use "localhost:/path/to/socket". */ "dbhost" => "", /* Prefix for the ownCloud tables in the database */ diff --git a/core/js/js.js b/core/js/js.js index 1d5219eff12..a8dd9ca889d 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -968,6 +968,8 @@ function initCore() { * time out */ function initSessionHeartBeat(){ + // max interval in seconds set to 24 hours + var maxInterval = 24 * 3600; // interval in seconds var interval = 900; if (oc_config.session_lifetime) { @@ -977,6 +979,9 @@ function initCore() { if (interval < 60) { interval = 60; } + if (interval > maxInterval) { + interval = maxInterval; + } var url = OC.generateUrl('/heartbeat'); setInterval(function(){ $.post(url); diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js new file mode 100644 index 00000000000..ad221cb30fc --- /dev/null +++ b/core/js/lostpassword.js @@ -0,0 +1,138 @@ + +OC.Lostpassword = { + sendErrorMsg : t('core', 'Couldn\'t send reset email. Please contact your administrator.'), + + sendSuccessMsg : t('core', 'The link to reset your password has been sent to your email. 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.'), + + encryptedMsg : t('core', "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?") + + ('<br /><input type="checkbox" id="encrypted-continue" value="Yes" />') + + '<label for="encrypted-continue">' + + t('core', 'I know what I\'m doing') + + '</label><br />' + + '<a id="lost-password-encryption" href>' + + t('core', 'Reset password') + + '</a>', + + resetErrorMsg : t('core', 'Password can not be changed. Please contact your administrator.'), + + init : function() { + if ($('#lost-password-encryption').length){ + $('#lost-password-encryption').click(OC.Lostpassword.sendLink); + } else { + $('#lost-password').click(OC.Lostpassword.sendLink); + } + $('#reset-password #submit').click(OC.Lostpassword.resetPassword); + }, + + sendLink : function(event){ + event.preventDefault(); + if (!$('#user').val().length){ + $('#submit').trigger('click'); + } else { + $.post( + OC.generateUrl('/lostpassword/email'), + { + user : $('#user').val(), + proceed: $('#encrypted-continue').attr('checked') ? 'Yes' : 'No' + }, + OC.Lostpassword.sendLinkDone + ); + } + }, + + sendLinkDone : function(result){ + var sendErrorMsg; + + if (result && result.status === 'success'){ + OC.Lostpassword.sendLinkSuccess(); + } else { + if (result && result.msg){ + sendErrorMsg = result.msg; + } else { + sendErrorMsg = OC.Lostpassword.sendErrorMsg; + } + OC.Lostpassword.sendLinkError(sendErrorMsg); + } + }, + + sendLinkSuccess : function(msg){ + var node = OC.Lostpassword.getSendStatusNode(); + // update is the better success message styling + node.addClass('update').css({width:'auto'}); + node.html(OC.Lostpassword.sendSuccessMsg); + }, + + sendLinkError : function(msg){ + var node = OC.Lostpassword.getSendStatusNode(); + node.addClass('warning'); + node.html(msg); + OC.Lostpassword.init(); + }, + + getSendStatusNode : function(){ + if (!$('#lost-password').length){ + $('<p id="lost-password"></p>').insertBefore($('#remember_login')); + } else { + $('#lost-password').replaceWith($('<p id="lost-password"></p>')); + } + return $('#lost-password'); + }, + + resetPassword : function(event){ + event.preventDefault(); + if ($('#password').val()){ + $.post( + $('#password').parents('form').attr('action'), + { + password : $('#password').val() + }, + OC.Lostpassword.resetDone + ); + } + }, + + resetDone : function(result){ + var resetErrorMsg; + if (result && result.status === 'success'){ + $.post( + OC.webroot + '/', + { + user : window.location.href.split('/').pop(), + password : $('#password').val() + }, + OC.Lostpassword.redirect + ); + } else { + if (result && result.msg){ + resetErrorMsg = result.msg; + } else if (result && result.encryption) { + resetErrorMsg = OC.Lostpassword.encryptedMsg; + } else { + resetErrorMsg = OC.Lostpassword.resetErrorMsg; + } + OC.Lostpassword.resetError(resetErrorMsg); + } + }, + + redirect : function(msg){ + window.location = OC.webroot; + }, + + resetError : function(msg){ + var node = OC.Lostpassword.getResetStatusNode(); + node.addClass('warning'); + node.html(msg); + }, + + getResetStatusNode : function (){ + if (!$('#lost-password').length){ + $('<p id="lost-password"></p>').insertAfter($('#submit')); + } else { + $('#lost-password').replaceWith($('<p id="lost-password"></p>')); + } + return $('#lost-password'); + } + +}; + +$(document).ready(OC.Lostpassword.init); diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index 3c62b976779..dd9d4a79277 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -19,7 +19,6 @@ * */ -/* global OC */ describe('Core base tests', function() { describe('Base values', function() { it('Sets webroots', function() { @@ -235,10 +234,12 @@ describe('Core base tests', function() { }); afterEach(function() { clock.restore(); + /* jshint camelcase: false */ window.oc_config = oldConfig; routeStub.restore(); }); it('sends heartbeat half the session lifetime when heartbeat enabled', function() { + /* jshint camelcase: false */ window.oc_config = { session_keepalive: true, session_lifetime: 300 @@ -265,6 +266,7 @@ describe('Core base tests', function() { expect(counter).toEqual(2); }); it('does no send heartbeat when heartbeat disabled', function() { + /* jshint camelcase: false */ window.oc_config = { session_keepalive: false, session_lifetime: 300 @@ -279,6 +281,26 @@ describe('Core base tests', function() { // still nothing expect(counter).toEqual(0); }); + it('limits the heartbeat between one minute and one day', function() { + /* jshint camelcase: false */ + var setIntervalStub = sinon.stub(window, 'setInterval'); + window.oc_config = { + session_keepalive: true, + session_lifetime: 5 + }; + window.initCore(); + expect(setIntervalStub.getCall(0).args[1]).toEqual(60 * 1000); + setIntervalStub.reset(); + + window.oc_config = { + session_keepalive: true, + session_lifetime: 48 * 3600 + }; + window.initCore(); + expect(setIntervalStub.getCall(0).args[1]).toEqual(24 * 3600 * 1000); + + setIntervalStub.restore(); + }); }); describe('Parse query string', function() { it('Parses query string from full URL', function() { diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php index 978bbb0fc01..b3ebc2c06bc 100644 --- a/core/l10n/af_ZA.php +++ b/core/l10n/af_ZA.php @@ -37,6 +37,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n maande gelede","%n maande gelede"), "last year" => "verlede jaar", "years ago" => "jare gelede", +"Reset password" => "Herstel wagwoord", "Yes" => "Ja", "No" => "Nee", "Choose" => "Kies", @@ -88,14 +89,10 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.", "%s password reset" => "%s wagwoord herstel", "Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}", -"Request failed!<br>Did you make sure your email/username was right?" => "Versoek het gefaal!<br>Het jy seker gemaak jou e-pos/gebruiker naam is korrek?", "You will receive a link to reset your password via Email." => "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.", "Username" => "Gebruikersnaam", "Yes, I really want to reset my password now" => "Ja, Ek wil regtig my wagwoord herstel", -"Your password was reset" => "Jou wagwoord is herstel", -"To login page" => "Na aanteken-bladsy", "New password" => "Nuwe wagwoord", -"Reset password" => "Herstel wagwoord", "For the best results, please consider using a GNU/Linux server instead." => "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.", "Personal" => "Persoonlik", "Users" => "Gebruikers", @@ -126,7 +123,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "Automatiese aantekening afgekeur!", "If you did not change your password recently, your account may be compromised!" => "Jou rekening kan gekompromitteer wees, as jy jou wagwoord nie onlangs verander het nie.", "Please change your password to secure your account again." => "Verander asseblief jou wagwoord om jou rekening te beveilig", -"Lost your password?" => "Wagwoord verloor?", "remember" => "onthou", "Log in" => "Teken aan", "Alternative Logins" => "Alternatiewe aantekeninge", diff --git a/core/l10n/ar.php b/core/l10n/ar.php index cf209fc309e..ceb4b4e757e 100644 --- a/core/l10n/ar.php +++ b/core/l10n/ar.php @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","","","","",""), "last year" => "السنةالماضية", "years ago" => "سنة مضت", +"Reset password" => "تعديل كلمة السر", "Yes" => "نعم", "No" => "لا", "Choose" => "اختيار", @@ -86,15 +87,10 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud", "%s password reset" => "تمت إعادة ضبط كلمة مرور %s", "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> اذا لم تستقبل البريد خلال فترة زمنية قصيره, ابحث في سلة مهملات بريدك.", -"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" => "إسم المستخدم", "Yes, I really want to reset my password now" => "نعم، أريد إعادة ضبظ كلمة مروري", -"Your password was reset" => "لقد تم تعديل كلمة السر", -"To login page" => "الى صفحة الدخول", "New password" => "كلمات سر جديدة", -"Reset password" => "تعديل كلمة السر", "Personal" => "شخصي", "Users" => "المستخدمين", "Apps" => "التطبيقات", @@ -123,7 +119,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "تم رفض تسجيل الدخول التلقائي!", "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" => "تذكر", "Log in" => "أدخل", "Alternative Logins" => "اسماء دخول بديلة" diff --git a/core/l10n/ast.php b/core/l10n/ast.php index 2f8be74aa74..193d1d0d25d 100644 --- a/core/l10n/ast.php +++ b/core/l10n/ast.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("fai %n mes","fai %n meses"), "last year" => "añu caberu", "years ago" => "fai años", +"Reset password" => "Restablecer contraseña", "Yes" => "Sí", "No" => "Non", "Choose" => "Esbillar", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "L'anovamientu nun foi esitosu.", "The update was successful. Redirecting you to ownCloud now." => "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.", "%s password reset" => "%s restablecer contraseña", -"A problem has occurred whilst sending the email, please contact your administrator." => "Hebo un fallu al unviar el corréu-e. Contauta col alministrador.", "Use the following link to reset your password: {link}" => "Usa'l siguiente enllaz pa restablecer la to contraseña: {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 ." => "Unviósete al to corréu l'enllaz pa reaniciar la to contraseña.<br>Si nun lu recibes dientro de dellos minutos, comprueba les tos carpetes de corréu puxarra.<br>Sinón, pues entrugar al to alministrador llocal.", -"Request failed!<br>Did you make sure your email/username was right?" => "¡Petición fallida!<br>¿Asegurástite qué'l to nome d'usuariu/corréu tean bien?", "You will receive a link to reset your password via Email." => "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña", "Username" => "Nome d'usuariu", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?", "Yes, I really want to reset my password now" => "Sí, quiero reaniciar daveres la mio contraseña agora", "Reset" => "Reaniciar", -"Your password was reset" => "Restablecióse la contraseña", -"To login page" => "Aniciar sesión na páxina", "New password" => "Contraseña nueva", -"Reset password" => "Restablecer contraseña", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!", "For the best results, please consider using a GNU/Linux server instead." => "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.", "Personal" => "Personal", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Por favor, camuda la contraseña p'asegurar la cuenta de nueves", "Server side authentication failed!" => "Falló l'autenticación nel sirvidor!", "Please contact your administrator." => "Por favor, contauta col to alministrador", -"Lost your password?" => "¿Escaeciesti la to contraseña?", "remember" => "recordar", "Log in" => "Aniciar sesión", "Alternative Logins" => "Anicios de sesión alternativos", diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php index 78f4b37dbb6..1374d391985 100644 --- a/core/l10n/bg_BG.php +++ b/core/l10n/bg_BG.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "последната година", "years ago" => "последните години", +"Reset password" => "Нулиране на парола", "Yes" => "Да", "No" => "Не", "Choose" => "Избери", @@ -74,9 +75,7 @@ $TRANSLATIONS = array( "Add" => "Добавяне", "You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.", "Username" => "Потребител", -"Your password was reset" => "Вашата парола е нулирана", "New password" => "Нова парола", -"Reset password" => "Нулиране на парола", "Personal" => "Лични", "Users" => "Потребители", "Apps" => "Приложения", @@ -94,7 +93,6 @@ $TRANSLATIONS = array( "Database host" => "Хост за базата", "Finish setup" => "Завършване на настройките", "Log out" => "Изход", -"Lost your password?" => "Забравена парола?", "remember" => "запомни", "Log in" => "Вход" ); diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php index fc8033ead78..905e60cd671 100644 --- a/core/l10n/bn_BD.php +++ b/core/l10n/bn_BD.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "গত বছর", "years ago" => "বছর পূর্বে", +"Reset password" => "কূটশব্দ পূনঃনির্ধারণ কর", "Yes" => "হ্যাঁ", "No" => "না", "Choose" => "বেছে নিন", @@ -74,10 +75,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "আপনার কূটশব্দটি পূনঃনির্ধারণ করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}", "You will receive a link to reset your password via Email." => "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।", "Username" => "ব্যবহারকারী", -"Your password was reset" => "আপনার কূটশব্দটি পূনঃনির্ধারণ করা হয়েছে", -"To login page" => "প্রবেশ পৃষ্ঠায়", "New password" => "নতুন কূটশব্দ", -"Reset password" => "কূটশব্দ পূনঃনির্ধারণ কর", "Personal" => "ব্যক্তিগত", "Users" => "ব্যবহারকারী", "Apps" => "অ্যাপ", @@ -97,7 +95,6 @@ $TRANSLATIONS = array( "Database host" => "ডাটাবেজ হোস্ট", "Finish setup" => "সেটআপ সুসম্পন্ন কর", "Log out" => "প্রস্থান", -"Lost your password?" => "কূটশব্দ হারিয়েছেন?", "remember" => "মনে রাখ", "Log in" => "প্রবেশ" ); diff --git a/core/l10n/ca.php b/core/l10n/ca.php index 76f12853085..ce6c106be90 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("fa %n mes","fa %n mesos"), "last year" => "l'any passat", "years ago" => "anys enrere", +"Reset password" => "Reinicialitza la contrasenya", "Yes" => "Sí", "No" => "No", "Choose" => "Escull", @@ -112,19 +113,13 @@ $TRANSLATIONS = array( "Please reload the page." => "Carregueu la pàgina de nou.", "The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.", "%s password reset" => "restableix la contrasenya %s", -"A problem has occurred whilst sending the email, please contact your administrator." => "Hi ha hagut un problema enviant el correu, parleu amb el vostre administrador.", "Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {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'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu.<br>Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.", -"Request failed!<br>Did you make sure your email/username was right?" => "La petició ha fallat!<br>Esteu segur que el correu/nom d'usuari és correcte?", "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.", "Username" => "Nom d'usuari", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?", "Yes, I really want to reset my password now" => "Sí, vull restablir ara la contrasenya", "Reset" => "Estableix de nou", -"Your password was reset" => "La vostra contrasenya s'ha reinicialitzat", -"To login page" => "A la pàgina d'inici de sessió", "New password" => "Contrasenya nova", -"Reset password" => "Reinicialitza la contrasenya", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!", "For the best results, please consider using a GNU/Linux server instead." => "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.", "Personal" => "Personal", @@ -171,7 +166,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Canvieu la contrasenya de nou per assegurar el vostre compte.", "Server side authentication failed!" => "L'autenticació del servidor ha fallat!", "Please contact your administrator." => "Contacteu amb l'administrador.", -"Lost your password?" => "Heu perdut la contrasenya?", "remember" => "recorda'm", "Log in" => "Inici de sessió", "Alternative Logins" => "Acreditacions alternatives", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index 2fdea44cddc..f28c6d5bcf6 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"), "last year" => "minulý rok", "years ago" => "před lety", +"Reset password" => "Obnovit heslo", "Yes" => "Ano", "No" => "Ne", "Choose" => "Vybrat", @@ -120,19 +121,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Aktualizace selhala.", "The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.", "%s password reset" => "reset hesla %s", -"A problem has occurred whilst sending the email, please contact your administrator." => "Při odesílání e-mailu nastala chyba, kontaktujte prosím svého administrátora.", "Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {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 ." => "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu.<br>Pokud jej v krátké době neobdržíte, zkontrolujte váš koš a složku spam.<br>Pokud jej nenaleznete, kontaktujte svého správce.", -"Request failed!<br>Did you make sure your email/username was right?" => "Požadavek selhal!<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?", "You will receive a link to reset your password via Email." => "E-mailem Vám bude zaslán odkaz pro obnovu hesla.", "Username" => "Uživatelské jméno", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?", "Yes, I really want to reset my password now" => "Ano, opravdu si nyní přeji obnovit mé heslo", "Reset" => "Restartovat složku", -"Your password was reset" => "Vaše heslo bylo obnoveno", -"To login page" => "Na stránku přihlášení", "New password" => "Nové heslo", -"Reset password" => "Obnovit heslo", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!", "For the best results, please consider using a GNU/Linux server instead." => "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.", "Personal" => "Osobní", @@ -180,7 +175,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.", "Server side authentication failed!" => "Autentizace na serveru selhala!", "Please contact your administrator." => "Kontaktujte prosím vašeho správce.", -"Lost your password?" => "Ztratili jste své heslo?", "remember" => "zapamatovat", "Log in" => "Přihlásit", "Alternative Logins" => "Alternativní přihlášení", diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php index a8db00a4e9b..892a5717491 100644 --- a/core/l10n/cy_GB.php +++ b/core/l10n/cy_GB.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","","",""), "last year" => "y llynedd", "years ago" => "blwyddyn yn ôl", +"Reset password" => "Ailosod cyfrinair", "Yes" => "Ie", "No" => "Na", "Choose" => "Dewisiwch", @@ -74,14 +75,9 @@ $TRANSLATIONS = array( "Add" => "Ychwanegu", "The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.", "Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {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 ." => "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost.<br>Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach.<br>Os nad yw yno, cysylltwch â'ch gweinyddwr lleol.", -"Request failed!<br>Did you make sure your email/username was right?" => "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost.", "You will receive a link to reset your password via Email." => "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.", "Username" => "Enw defnyddiwr", -"Your password was reset" => "Ailosodwyd eich cyfrinair", -"To login page" => "I'r dudalen mewngofnodi", "New password" => "Cyfrinair newydd", -"Reset password" => "Ailosod cyfrinair", "Personal" => "Personol", "Users" => "Defnyddwyr", "Apps" => "Pecynnau", @@ -109,7 +105,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "Gwrthodwyd mewngofnodi awtomatig!", "If you did not change your password recently, your account may be compromised!" => "Os na wnaethoch chi newid eich cyfrinair yn ddiweddar, gall eich cyfrif fod yn anniogel!", "Please change your password to secure your account again." => "Newidiwch eich cyfrinair i ddiogleu eich cyfrif eto.", -"Lost your password?" => "Wedi colli'ch cyfrinair?", "remember" => "cofio", "Log in" => "Mewngofnodi", "Alternative Logins" => "Mewngofnodiadau Amgen" diff --git a/core/l10n/da.php b/core/l10n/da.php index 9af611093f6..34f89dae1b6 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"), "last year" => "sidste år", "years ago" => "år siden", +"Reset password" => "Nulstil kodeord", "Yes" => "Ja", "No" => "Nej", "Choose" => "Vælg", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Opdateringen mislykkedes.", "The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.", "%s password reset" => "%s adgangskode nulstillet", -"A problem has occurred whilst sending the email, please contact your administrator." => "Der opstod et problem under afsending af emailen. Kontakt venligst systemadministratoren.", "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", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?", "Yes, I really want to reset my password now" => "Ja, Jeg ønsker virkelig at nulstille mit kodeord", "Reset" => "Nulstil", -"Your password was reset" => "Dit kodeord blev nulstillet", -"To login page" => "Til login-side", "New password" => "Nyt kodeord", -"Reset password" => "Nulstil kodeord", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!", "For the best results, please consider using a GNU/Linux server instead." => "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.", "Personal" => "Personligt", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Skift adgangskode for at sikre din konto igen.", "Server side authentication failed!" => "Server side godkendelse mislykkedes!", "Please contact your administrator." => "Kontakt venligst din administrator", -"Lost your password?" => "Mistet dit kodeord?", "remember" => "husk", "Log in" => "Log ind", "Alternative Logins" => "Alternative logins", diff --git a/core/l10n/de.php b/core/l10n/de.php index 43c1a3ba731..bc32c8f105a 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"), "last year" => "Letztes Jahr", "years ago" => "Vor Jahren", +"Reset password" => "Passwort zurücksetzen", "Yes" => "Ja", "No" => "Nein", "Choose" => "Auswählen", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Die Aktualisierung war erfolgreich.", "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.", "%s password reset" => "%s-Passwort zurücksetzen", -"A problem has occurred whilst sending the email, please contact your administrator." => "Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte kontaktiere deinen Administrator.", "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {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 ." => "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.", -"Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?", "You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.", "Username" => "Benutzername", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?", "Yes, I really want to reset my password now" => "Ja, ich will mein Passwort jetzt zurücksetzen", "Reset" => "Zurücksetzen", -"Your password was reset" => "Dein Passwort wurde zurückgesetzt.", -"To login page" => "Zur Login-Seite", "New password" => "Neues Passwort", -"Reset password" => "Passwort zurücksetzen", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!", "For the best results, please consider using a GNU/Linux server instead." => "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.", "Personal" => "Persönlich", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen.", "Server side authentication failed!" => "Serverseitige Authentifizierung fehlgeschlagen!", "Please contact your administrator." => "Bitte kontaktiere Deinen Administrator.", -"Lost your password?" => "Passwort vergessen?", "remember" => "merken", "Log in" => "Einloggen", "Alternative Logins" => "Alternative Logins", diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php index 7cf45f7d536..18a23e1a2b4 100644 --- a/core/l10n/de_CH.php +++ b/core/l10n/de_CH.php @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"), "last year" => "Letztes Jahr", "years ago" => "Vor Jahren", +"Reset password" => "Passwort zurücksetzen", "Yes" => "Ja", "No" => "Nein", "Choose" => "Auswählen", @@ -82,17 +83,12 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", "%s password reset" => "%s-Passwort zurücksetzen", "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {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 ." => "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator.", -"Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?", "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.", "Username" => "Benutzername", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?", "Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.", "Reset" => "Zurücksetzen", -"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.", -"To login page" => "Zur Login-Seite", "New password" => "Neues Passwort", -"Reset password" => "Passwort zurücksetzen", "Personal" => "Persönlich", "Users" => "Benutzer", "Apps" => "Apps", @@ -122,7 +118,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "Automatische Anmeldung verweigert!", "If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!", "Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.", -"Lost your password?" => "Passwort vergessen?", "remember" => "merken", "Log in" => "Einloggen", "Alternative Logins" => "Alternative Logins" diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index ef5a93ae32f..0227af7b29e 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"), "last year" => "Letztes Jahr", "years ago" => "Vor Jahren", +"Reset password" => "Passwort zurücksetzen", "Yes" => "Ja", "No" => "Nein", "Choose" => "Auswählen", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Die Aktualisierung war erfolgreich.", "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", "%s password reset" => "%s-Passwort zurücksetzen", -"A problem has occurred whilst sending the email, please contact your administrator." => "Beim Senden der E-Mail ist ein Problem aufgetreten, bitte kontaktieren Sie Ihren Administrator.", "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {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 ." => "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator.", -"Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?", "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.", "Username" => "Benutzername", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?", "Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.", "Reset" => "Zurücksetzen", -"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.", -"To login page" => "Zur Login-Seite", "New password" => "Neues Passwort", -"Reset password" => "Passwort zurücksetzen", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!", "For the best results, please consider using a GNU/Linux server instead." => "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.", "Personal" => "Persönlich", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.", "Server side authentication failed!" => "Die Authentifizierung auf dem Server ist fehlgeschlagen!", "Please contact your administrator." => "Bitte kontaktieren Sie Ihren Administrator.", -"Lost your password?" => "Passwort vergessen?", "remember" => "merken", "Log in" => "Einloggen", "Alternative Logins" => "Alternative Logins", diff --git a/core/l10n/el.php b/core/l10n/el.php index 14826b79790..098b3221418 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n μήνας πριν","%n μήνες πριν"), "last year" => "τελευταίο χρόνο", "years ago" => "χρόνια πριν", +"Reset password" => "Επαναφορά συνθηματικού", "Yes" => "Ναι", "No" => "Όχι", "Choose" => "Επιλέξτε", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Η ενημέρωση δεν ήταν επιτυχής.", "The update was successful. Redirecting you to ownCloud now." => "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.", "%s password reset" => "%s επαναφορά κωδικού πρόσβασης", -"A problem has occurred whilst sending the email, please contact your administrator." => "Παρουσιάστηκε σφάλμα κατά την αποστολή email, παρακαλώ επικοινωνήστε με τον διαχειριστή.", "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 ." => "Ο σύνδεσμος για να επανακτήσετε τον κωδικό σας έχει σταλεί στο email <br>αν δεν το λάβετε μέσα σε ορισμένο διάστημα, ελέγξετε τους φακελλους σας spam/junk <br> αν δεν είναι εκεί ρωτήστε τον τοπικό σας διαχειριστή ", -"Request failed!<br>Did you make sure your email/username was right?" => "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? ", "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.", "Username" => "Όνομα χρήστη", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;", "Yes, I really want to reset my password now" => "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.", "Reset" => "Επαναφορά", -"Your password was reset" => "Ο κωδικός πρόσβασής σας επαναφέρθηκε", -"To login page" => "Σελίδα εισόδου", "New password" => "Νέο συνθηματικό", -"Reset password" => "Επαναφορά συνθηματικού", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!", "For the best results, please consider using a GNU/Linux server instead." => "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.", "Personal" => "Προσωπικά", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Παρακαλώ αλλάξτε το συνθηματικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας.", "Server side authentication failed!" => "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!", "Please contact your administrator." => "Παρακαλώ επικοινωνήστε με τον διαχειριστή.", -"Lost your password?" => "Ξεχάσατε το συνθηματικό σας;", "remember" => "απομνημόνευση", "Log in" => "Είσοδος", "Alternative Logins" => "Εναλλακτικές Συνδέσεις", diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php index a38c29dd904..210ee74db26 100644 --- a/core/l10n/en_GB.php +++ b/core/l10n/en_GB.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"), "last year" => "last year", "years ago" => "years ago", +"Reset password" => "Reset password", "Yes" => "Yes", "No" => "No", "Choose" => "Choose", @@ -119,19 +120,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "The update was unsuccessful.", "The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.", "%s password reset" => "%s password reset", -"A problem has occurred whilst sending the email, please contact your administrator." => "A problem has occurred whilst sending the email, please contact your administrator.", "Use the following link to reset your password: {link}" => "Use the following link to reset your password: {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 ." => "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 .", -"Request failed!<br>Did you make sure your email/username was right?" => "Request failed!<br>Did you make sure your email/username was correct?", "You will receive a link to reset your password via Email." => "You will receive a link to reset your password via email.", "Username" => "Username", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?", "Yes, I really want to reset my password now" => "Yes, I really want to reset my password now", "Reset" => "Reset", -"Your password was reset" => "Your password was reset", -"To login page" => "To login page", "New password" => "New password", -"Reset password" => "Reset password", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ", "For the best results, please consider using a GNU/Linux server instead." => "For the best results, please consider using a GNU/Linux server instead.", "Personal" => "Personal", @@ -180,7 +175,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Please change your password to secure your account again.", "Server side authentication failed!" => "Server side authentication failed!", "Please contact your administrator." => "Please contact your administrator.", -"Lost your password?" => "Lost your password?", "remember" => "remember", "Log in" => "Log in", "Alternative Logins" => "Alternative Logins", diff --git a/core/l10n/eo.php b/core/l10n/eo.php index 0a0ab13db0d..d789fa42c33 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -37,6 +37,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("antaŭ %n monato","antaŭ %n monatoj"), "last year" => "lastajare", "years ago" => "jaroj antaŭe", +"Reset password" => "Rekomenci la pasvorton", "Yes" => "Jes", "No" => "Ne", "Choose" => "Elekti", @@ -98,14 +99,10 @@ $TRANSLATIONS = array( "Please reload the page." => "Bonvolu reŝargi la paĝon.", "The update was successful. Redirecting you to ownCloud now." => "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.", "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}", -"Request failed!<br>Did you make sure your email/username was right?" => "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo ĝustas?", "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.", "Username" => "Uzantonomo", "Yes, I really want to reset my password now" => "Jes, mi vere volas restarigi mian pasvorton nun", -"Your password was reset" => "Via pasvorto rekomencis", -"To login page" => "Al la ensaluta paĝo", "New password" => "Nova pasvorto", -"Reset password" => "Rekomenci la pasvorton", "Personal" => "Persona", "Users" => "Uzantoj", "Apps" => "Aplikaĵoj", @@ -139,7 +136,6 @@ $TRANSLATIONS = array( "If you did not change your password recently, your account may be compromised!" => "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas!", "Please change your password to secure your account again." => "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree.", "Please contact your administrator." => "Bonvolu kontakti vian administranton.", -"Lost your password?" => "Ĉu vi perdis vian pasvorton?", "remember" => "memori", "Log in" => "Ensaluti", "Alternative Logins" => "Alternativaj ensalutoj", diff --git a/core/l10n/es.php b/core/l10n/es.php index c91f288ed72..a7bf8b76567 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("Hace %n mes","hace %n meses"), "last year" => "el año pasado", "years ago" => "hace años", +"Reset password" => "Restablecer contraseña", "Yes" => "Sí", "No" => "No", "Choose" => "Seleccionar", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Falló la actualización", "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", "%s password reset" => "%s restablecer contraseña", -"A problem has occurred whilst sending the email, please contact your administrator." => "Ocurrió un problema al enviar el mensaje de correo electrónico. Contacte a su administrador.", "Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {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 ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local.", -"Request failed!<br>Did you make sure your email/username was right?" => "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?", "You will receive a link to reset your password via Email." => "Recibirá un enlace por correo electrónico para restablecer su contraseña", "Username" => "Nombre de usuario", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?", "Yes, I really want to reset my password now" => "Sí. Realmente deseo resetear mi contraseña ahora", "Reset" => "Reiniciar", -"Your password was reset" => "Su contraseña fue restablecida", -"To login page" => "A la página de inicio de sesión", "New password" => "Nueva contraseña", -"Reset password" => "Restablecer contraseña", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ", "For the best results, please consider using a GNU/Linux server instead." => "Para óptimos resultados, considere utilizar un servidor GNU/Linux.", "Personal" => "Personal", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.", "Server side authentication failed!" => "La autenticación a fallado en el servidor.", "Please contact your administrator." => "Por favor, contacte con el administrador.", -"Lost your password?" => "¿Ha perdido su contraseña?", "remember" => "recordar", "Log in" => "Entrar", "Alternative Logins" => "Inicios de sesión alternativos", diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index 511585a6275..8f9c2dd78e6 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), "last year" => "el año pasado", "years ago" => "años atrás", +"Reset password" => "Restablecer contraseña", "Yes" => "Sí", "No" => "No", "Choose" => "Elegir", @@ -111,17 +112,12 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.", "%s password reset" => "%s restablecer contraseña", "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {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 ." => "El enlace para restablecer la contraseña fue enviada a tu e-mail. <br> Si no lo recibís en un plazo de tiempo razonable, revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador.", -"Request failed!<br>Did you make sure your email/username was right?" => "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de correo electrónico o nombre de usuario son correcto?", "You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña.", "Username" => "Nombre de usuario", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?", "Yes, I really want to reset my password now" => "Sí, definitivamente quiero restablecer mi contraseña ahora", "Reset" => "Resetear", -"Your password was reset" => "Tu contraseña fue restablecida", -"To login page" => "A la página de inicio de sesión", "New password" => "Nueva contraseña:", -"Reset password" => "Restablecer contraseña", "Personal" => "Personal", "Users" => "Usuarios", "Apps" => "Apps", @@ -165,7 +161,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Por favor, cambiá tu contraseña para incrementar la seguridad de tu cuenta.", "Server side authentication failed!" => "¡Falló la autenticación del servidor!", "Please contact your administrator." => "Por favor, contacte a su administrador.", -"Lost your password?" => "¿Perdiste tu contraseña?", "remember" => "recordame", "Log in" => "Iniciar sesión", "Alternative Logins" => "Nombre alternativos de usuarios", diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php index 38e4984fadf..3131a3762d3 100644 --- a/core/l10n/es_MX.php +++ b/core/l10n/es_MX.php @@ -42,6 +42,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"), "last year" => "el año pasado", "years ago" => "años antes", +"Reset password" => "Restablecer contraseña", "Yes" => "Sí", "No" => "No", "Choose" => "Seleccionar", @@ -104,17 +105,12 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", "%s password reset" => "%s restablecer contraseña", "Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {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 ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local.", -"Request failed!<br>Did you make sure your email/username was right?" => "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?", "You will receive a link to reset your password via Email." => "Recibirá un enlace por correo electrónico para restablecer su contraseña", "Username" => "Nombre de usuario", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?", "Yes, I really want to reset my password now" => "Sí. Realmente deseo resetear mi contraseña ahora", "Reset" => "Reiniciar", -"Your password was reset" => "Su contraseña fue restablecida", -"To login page" => "A la página de inicio de sesión", "New password" => "Nueva contraseña", -"Reset password" => "Restablecer contraseña", "Personal" => "Personal", "Users" => "Usuarios", "Apps" => "Aplicaciones", @@ -158,7 +154,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.", "Server side authentication failed!" => "La autenticación a fallado en el servidor.", "Please contact your administrator." => "Por favor, contacte con el administrador.", -"Lost your password?" => "¿Ha perdido su contraseña?", "remember" => "recordar", "Log in" => "Entrar", "Alternative Logins" => "Accesos Alternativos", diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index c0e4ec084be..e91991966d1 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n kuu tagasi","%n kuud tagasi"), "last year" => "viimasel aastal", "years ago" => "aastat tagasi", +"Reset password" => "Nulli parool", "Yes" => "Jah", "No" => "Ei", "Choose" => "Vali", @@ -115,19 +116,13 @@ $TRANSLATIONS = array( "Please reload the page." => "Palun laadi see uuesti.", "The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.", "%s password reset" => "%s parooli lähtestus", -"A problem has occurred whilst sending the email, please contact your administrator." => "Tekkis tõrge e-posti saatmisel, palun kontakteeru administraatoriga.", "Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {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 ." => "Link parooli vahetuseks on saadetud Sinu e-posti aadressile.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge.<br>Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.", -"Request failed!<br>Did you make sure your email/username was right?" => "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õiged?", "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.", "Username" => "Kasutajanimi", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?", "Yes, I really want to reset my password now" => "Jah, ma tõesti soovin oma parooli praegu taastada", "Reset" => "Algseaded", -"Your password was reset" => "Sinu parool on taastatud", -"To login page" => "Sisselogimise lehele", "New password" => "Uus parool", -"Reset password" => "Nulli parool", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!", "For the best results, please consider using a GNU/Linux server instead." => "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.", "Personal" => "Isiklik", @@ -174,7 +169,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.", "Server side authentication failed!" => "Serveripoolne autentimine ebaõnnestus!", "Please contact your administrator." => "Palun kontakteeru oma süsteemihalduriga.", -"Lost your password?" => "Kaotasid oma parooli?", "remember" => "pea meeles", "Log in" => "Logi sisse", "Alternative Logins" => "Alternatiivsed sisselogimisviisid", diff --git a/core/l10n/eu.php b/core/l10n/eu.php index be6c510a6d2..aff505ae9ca 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("orain dela hilabete %n","orain dela %n hilabete"), "last year" => "joan den urtean", "years ago" => "urte", +"Reset password" => "Berrezarri pasahitza", "Yes" => "Bai", "No" => "Ez", "Choose" => "Aukeratu", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Eguneraketak ez du arrakasta izan.", "The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.", "%s password reset" => "%s pasahitza berrezarri", -"A problem has occurred whilst sending the email, please contact your administrator." => "Arazo bat gertatu da posta elektronikoa bidaltzerakoan, mesedez jarri harremanetan zure administrariarekin.", "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {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 ." => "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini.", -"Request failed!<br>Did you make sure your email/username was right?" => "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?", "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.", "Username" => "Erabiltzaile izena", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?", "Yes, I really want to reset my password now" => "Bai, nire pasahitza orain berrabiarazi nahi dut", "Reset" => "Berrezarri", -"Your password was reset" => "Zure pasahitza berrezarri da", -"To login page" => "Sarrera orrira", "New password" => "Pasahitz berria", -"Reset password" => "Berrezarri pasahitza", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.", "For the best results, please consider using a GNU/Linux server instead." => "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.", "Personal" => "Pertsonala", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko.", "Server side authentication failed!" => "Zerbitzari aldeko autentifikazioak huts egin du!", "Please contact your administrator." => "Mesedez jarri harremetan zure administradorearekin.", -"Lost your password?" => "Galdu duzu pasahitza?", "remember" => "gogoratu", "Log in" => "Hasi saioa", "Alternative Logins" => "Beste erabiltzaile izenak", diff --git a/core/l10n/fa.php b/core/l10n/fa.php index ae9be232060..5d63b2d534b 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -34,6 +34,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n ماه قبل"), "last year" => "سال قبل", "years ago" => "سالهای قبل", +"Reset password" => "دوباره سازی گذرواژه", "Yes" => "بله", "No" => "نه", "Choose" => "انتخاب کردن", @@ -85,17 +86,12 @@ $TRANSLATIONS = array( "Add" => "افزودن", "The update was successful. Redirecting you to ownCloud now." => "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.", "Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{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" => "نام کاربری", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟", "Yes, I really want to reset my password now" => "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.", "Reset" => "تنظیم مجدد", -"Your password was reset" => "گذرواژه شما تغییرکرد", -"To login page" => "به صفحه ورود", "New password" => "گذرواژه جدید", -"Reset password" => "دوباره سازی گذرواژه", "Personal" => "شخصی", "Users" => "کاربران", "Apps" => " برنامه ها", @@ -125,7 +121,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "ورود به سیستم اتوماتیک ردشد!", "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" => "بیاد آوری", "Log in" => "ورود", "Alternative Logins" => "ورود متناوب" diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index 2b268c6428b..d24ca1b70fd 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"), "last year" => "viime vuonna", "years ago" => "vuotta sitten", +"Reset password" => "Palauta salasana", "Yes" => "Kyllä", "No" => "Ei", "Choose" => "Valitse", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Päivitys epäonnistui.", "The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.", "%s password reset" => "%s salasanan nollaus", -"A problem has occurred whilst sending the email, please contact your administrator." => "Sähköpostia lähettäessä tapahtui virhe, ota yhteys järjestelmän ylläpitäjään.", "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {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 ." => "Linkki salasanan nollaamiseen on lähetetty sähköpostiisi.<br>Jos et saa viestiä pian, tarkista roskapostikansiosi.<br>Jos et löydä viestiä roskapostinkaan seasta, ota yhteys ylläpitäjään.", -"Request failed!<br>Did you make sure your email/username was right?" => "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?", "You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.", "Username" => "Käyttäjätunnus", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?", "Yes, I really want to reset my password now" => "Kyllä, haluan nollata salasanani nyt", "Reset" => "Nollaa salasana", -"Your password was reset" => "Salasanasi nollattiin", -"To login page" => "Kirjautumissivulle", "New password" => "Uusi salasana", -"Reset password" => "Palauta salasana", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!", "For the best results, please consider using a GNU/Linux server instead." => "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.", "Personal" => "Henkilökohtainen", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Vaihda salasanasi suojataksesi tilisi uudelleen.", "Server side authentication failed!" => "Palvelimen puoleinen tunnistautuminen epäonnistui!", "Please contact your administrator." => "Ota yhteys ylläpitäjään.", -"Lost your password?" => "Unohditko salasanasi?", "remember" => "muista", "Log in" => "Kirjaudu sisään", "Alternative Logins" => "Vaihtoehtoiset kirjautumiset", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 91d0de8f540..9044b98a2d4 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"), "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", +"Reset password" => "Réinitialiser le mot de passe", "Yes" => "Oui", "No" => "Non", "Choose" => "Choisir", @@ -120,19 +121,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "La mise à jour a échoué.", "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.", "%s password reset" => "Réinitialisation de votre mot de passe %s", -"A problem has occurred whilst sending the email, please contact your administrator." => "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez contacter votre administrateur.", "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {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 ." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local.", -"Request failed!<br>Did you make sure your email/username was right?" => "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?", "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.", "Username" => "Nom d'utilisateur", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?", "Yes, I really want to reset my password now" => "Oui, je veux vraiment réinitialiser mon mot de passe maintenant", "Reset" => "Réinitialiser", -"Your password was reset" => "Votre mot de passe a été réinitialisé", -"To login page" => "Retour à la page d'authentification", "New password" => "Nouveau mot de passe", -"Reset password" => "Réinitialiser le mot de passe", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X n'est pas supporté et %s ne fonctionnera pas correctement sur cette plateforme. Son utilisation est à vos risques et périls !", "For the best results, please consider using a GNU/Linux server instead." => "Pour des résultats meilleurs encore, pensez à utiliser un serveur GNU/Linux à la place.", "Personal" => "Personnel", @@ -181,7 +176,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte.", "Server side authentication failed!" => "L'authentification côté serveur a échoué !", "Please contact your administrator." => "Veuillez contacter votre administrateur.", -"Lost your password?" => "Mot de passe perdu ?", "remember" => "se souvenir de moi", "Log in" => "Connexion", "Alternative Logins" => "Logins alternatifs", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index eb521be1c1b..5a8b96520e2 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("hai %n mes","vai %n meses"), "last year" => "último ano", "years ago" => "anos atrás", +"Reset password" => "Restabelecer o contrasinal", "Yes" => "Si", "No" => "Non", "Choose" => "Escoller", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "A actualización foi satisfactoria.", "The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.", "%s password reset" => "Restabelecer o contrasinal %s", -"A problem has occurred whilst sending the email, please contact your administrator." => "Produciuse un problema ao mesmo tempo que enviaba o correo, póñase en contacto co administrador.", "Use the following link to reset your password: {link}" => "Usa a seguinte ligazón para restabelecer o contrasinal: {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 ." => "Envióuselle ao seu correo unha ligazón para restabelecer o seu contrasinal.<br>Se non o recibe nun prazo razoábel de tempo, revise o seu cartafol de correo lixo ou de non desexados.<br> Se non o atopa aí pregúntelle ao seu administrador local..", -"Request failed!<br>Did you make sure your email/username was right?" => "Non foi posíbel facer a petición!<br>Asegúrese de que o seu enderezo de correo ou nome de usuario é correcto.", "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo para restabelecer o contrasinal", "Username" => "Nome de usuario", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?", "Yes, I really want to reset my password now" => "Si, confirmo que quero restabelecer agora o meu contrasinal", "Reset" => "Restabelecer", -"Your password was reset" => "O contrasinal foi restabelecido", -"To login page" => "A páxina de conexión", "New password" => "Novo contrasinal", -"Reset password" => "Restabelecer o contrasinal", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!", "For the best results, please consider using a GNU/Linux server instead." => "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.", "Personal" => "Persoal", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Cambie de novo o seu contrasinal para asegurar a súa conta.", "Server side authentication failed!" => "A autenticación fracasou do lado do servidor!", "Please contact your administrator." => "Contacte co administrador.", -"Lost your password?" => "Perdeu o contrasinal?", "remember" => "lembrar", "Log in" => "Conectar", "Alternative Logins" => "Accesos alternativos", diff --git a/core/l10n/he.php b/core/l10n/he.php index 8650bff7fb0..e8a4ee9b407 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("לפני %n חודש","לפני %n חודשים"), "last year" => "שנה שעברה", "years ago" => "שנים", +"Reset password" => "איפוס ססמה", "Yes" => "כן", "No" => "לא", "Choose" => "בחירה", @@ -76,15 +77,10 @@ $TRANSLATIONS = array( "Add" => "הוספה", "The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל 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" => "שם משתמש", "Yes, I really want to reset my password now" => "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.", -"Your password was reset" => "הססמה שלך אופסה", -"To login page" => "לדף הכניסה", "New password" => "ססמה חדשה", -"Reset password" => "איפוס ססמה", "Personal" => "אישי", "Users" => "משתמשים", "Apps" => "יישומים", @@ -113,7 +109,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "בקשת הכניסה האוטומטית נדחתה!", "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" => "שמירת הססמה", "Log in" => "כניסה", "Alternative Logins" => "כניסות אלטרנטיביות" diff --git a/core/l10n/hi.php b/core/l10n/hi.php index ada4970a029..bfe4a689120 100644 --- a/core/l10n/hi.php +++ b/core/l10n/hi.php @@ -36,7 +36,6 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}", "You will receive a link to reset your password via Email." => "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|", "Username" => "प्रयोक्ता का नाम", -"Your password was reset" => "आपका पासवर्ड बदला गया है", "New password" => "नया पासवर्ड", "Personal" => "यक्तिगत", "Users" => "उपयोगकर्ता", diff --git a/core/l10n/hr.php b/core/l10n/hr.php index 20b187056f0..365d230fb90 100644 --- a/core/l10n/hr.php +++ b/core/l10n/hr.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","",""), "last year" => "prošlu godinu", "years ago" => "godina", +"Reset password" => "Poništavanje lozinke", "Yes" => "Da", "No" => "Ne", "Choose" => "Izaberi", @@ -64,10 +65,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "Koristite ovaj link da biste poništili lozinku: {link}", "You will receive a link to reset your password via Email." => "Primit ćete link kako biste poništili zaporku putem e-maila.", "Username" => "Korisničko ime", -"Your password was reset" => "Vaša lozinka je resetirana", -"To login page" => "Idi na stranicu za prijavu", "New password" => "Nova lozinka", -"Reset password" => "Poništavanje lozinke", "Personal" => "Osobno", "Users" => "Korisnici", "Apps" => "Aplikacije", @@ -86,7 +84,6 @@ $TRANSLATIONS = array( "Database host" => "Poslužitelj baze podataka", "Finish setup" => "Završi postavljanje", "Log out" => "Odjava", -"Lost your password?" => "Izgubili ste lozinku?", "remember" => "zapamtiti", "Log in" => "Prijava" ); diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index 84e3e7a2217..040d992af5f 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -5,6 +5,8 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "A karbantartási mód bekapcsolva", "Turned off maintenance mode" => "A karbantartási mód kikapcsolva", "Updated database" => "Az adatbázis frissítése megtörtént", +"Checked database schema update" => "Az adatbázis séma frissítését ellenőrztük", +"Disabled incompatible apps: %s" => "Letiltásra került inkompatibilis alkalmazások: %s", "No image or file provided" => "Nincs kép vagy file megadva", "Unknown filetype" => "Ismeretlen fájltípus", "Invalid image" => "Hibás kép", @@ -32,6 +34,8 @@ $TRANSLATIONS = array( "Settings" => "Beállítások", "File" => "Fájl", "Folder" => "Mappa", +"Image" => "Kép", +"Audio" => "Hang", "Saving..." => "Mentés...", "seconds ago" => "pár másodperce", "_%n minute ago_::_%n minutes ago_" => array("%n perccel ezelőtt","%n perccel ezelőtt"), @@ -43,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n hónappal ezelőtt","%n hónappal ezelőtt"), "last year" => "tavaly", "years ago" => "több éve", +"Reset password" => "Jelszó-visszaállítás", "Yes" => "Igen", "No" => "Nem", "Choose" => "Válasszon", @@ -67,6 +72,7 @@ $TRANSLATIONS = array( "Strong password" => "Erős jelszó", "Shared" => "Megosztott", "Shared by {owner}" => "Megosztotta: {owner}", +"Shared with {recipients}" => "Megosztva ővelük: {recipients}", "Share" => "Megosztás", "Error" => "Hiba", "Error while sharing" => "Nem sikerült létrehozni a megosztást", @@ -111,22 +117,18 @@ $TRANSLATIONS = array( "Edit tags" => "Címkék szerkesztése", "Error loading dialog template: {error}" => "Hiba a párbeszédpanel-sablon betöltésekor: {error}", "No tags selected for deletion." => "Nincs törlésre kijelölt címke.", +"Updating {productName} to version {version}, this may take a while." => " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.", "Please reload the page." => "Kérjük frissítse az oldalt!", +"The update was unsuccessful." => "A frissítés nem sikerült.", "The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.", "%s password reset" => "%s jelszó visszaállítás", -"A problem has occurred whilst sending the email, please contact your administrator." => "Hiba történt e-mail küldése közben. Érdemes az adminisztrátort értesíteni.", "Use the following link to reset your password: {link}" => "Használja ezt a linket a jelszó ismételt beállításához: {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 ." => "Emailben fog kapni egy linket, amivel új jelszót tud majd beállítani magának. <br>Ha a levél nem jött meg, holott úgy érzi, hogy már meg kellett volna érkeznie, akkor ellenőrizze a spam/levélszemét mappáját. <br>Ha ott sincsen, akkor érdeklődjön a rendszergazdánál.", -"Request failed!<br>Did you make sure your email/username was right?" => "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?", "You will receive a link to reset your password via Email." => "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról.", "Username" => "Felhasználónév", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?", "Yes, I really want to reset my password now" => "Igen, tényleg meg akarom változtatni a jelszavam", "Reset" => "Visszaállítás", -"Your password was reset" => "A jelszava megváltozott", -"To login page" => "A bejelentkező ablakhoz", "New password" => "Az új jelszó", -"Reset password" => "Jelszó-visszaállítás", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Felhasználás csak saját felelősségre!", "For the best results, please consider using a GNU/Linux server instead." => "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.", "Personal" => "Személyes", @@ -158,11 +160,13 @@ $TRANSLATIONS = array( "Storage & database" => "Tárolás és adatbázis", "Data folder" => "Adatkönyvtár", "Configure the database" => "Adatbázis konfigurálása", +"Only %s is available." => "Csak %s érhető el.", "Database user" => "Adatbázis felhasználónév", "Database password" => "Adatbázis jelszó", "Database name" => "Az adatbázis neve", "Database tablespace" => "Az adatbázis táblázattér (tablespace)", "Database host" => "Adatbázis szerver", +"SQLite will be used as database. For larger installations we recommend to change this." => "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy változtassa meg ezt a beállítást.", "Finish setup" => "A beállítások befejezése", "Finishing …" => "Befejezés ...", "This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Az alkalmazás megfelelő működéséhez szükség van JavaScriptre. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezze a JavaScriptet</a> és frissítse az oldalt!", @@ -173,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "A biztonsága érdekében változtassa meg a jelszavát!", "Server side authentication failed!" => "A szerveroldali hitelesítés sikertelen!", "Please contact your administrator." => "Kérjük, lépjen kapcsolatba a rendszergazdával.", -"Lost your password?" => "Elfelejtette a jelszavát?", "remember" => "emlékezzen", "Log in" => "Bejelentkezés", "Alternative Logins" => "Alternatív bejelentkezés", @@ -182,6 +185,11 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "Ez azt jelenti, hogy csak az adminisztrátor használhatja ezt a példányt", "Contact your system administrator if this message persists or appeared unexpectedly." => "Ha ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segítségét!", "Thank you for your patience." => "Köszönjük a türelmét.", +"%s will be updated to version %s." => "%s frissítődni fog erre a verzióra: %s.", +"The following apps will be disabled:" => "A következő alkalmazások lesznek letiltva:", +"The theme %s has been disabled." => "Ez a smink: %s letiltásra került.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Kérjük gondoskodjon róla, hogy elmentse az adatbázist, a konfigurációs mappa és az adatamappa tartalmát, mielőtt folytatja.", +"Start update" => "A frissítés megkezdése", "This ownCloud instance is currently being updated, which may take a while." => "Az ownCloud frissítés elkezdődött, ez eltarthat egy ideig.", "Please reload this page after a short time to continue using ownCloud." => "Frissitse az oldalt egy kis idő múlva, ha folytatni kívánja az ownCloud használatát." ); diff --git a/core/l10n/ia.php b/core/l10n/ia.php index 816102a9844..bb544fdadfb 100644 --- a/core/l10n/ia.php +++ b/core/l10n/ia.php @@ -39,6 +39,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "ultime anno", "years ago" => "annos passate", +"Reset password" => "Reinitialisar contrasigno", "Yes" => "Si", "No" => "No", "Choose" => "Seliger", @@ -99,14 +100,10 @@ $TRANSLATIONS = array( "Please reload the page." => "Pro favor recarga le pagina.", "The update was successful. Redirecting you to ownCloud now." => "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.", "%s password reset" => "%s contrasigno re-fixate", -"A problem has occurred whilst sending the email, please contact your administrator." => "Un problema ha occurrite quando on inviava le message de e-posta, pro favor continge tu administrator.", "Use the following link to reset your password: {link}" => "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}", "Username" => "Nomine de usator", "Reset" => "Re-fixar", -"Your password was reset" => "Tu contrasigno esseva reinitialisate", -"To login page" => "al pagina de initio de session", "New password" => "Nove contrasigno", -"Reset password" => "Reinitialisar contrasigno", "For the best results, please consider using a GNU/Linux server instead." => "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux.", "Personal" => "Personal", "Users" => "Usatores", @@ -138,7 +135,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Pro favor modifica tu contrasigno pro asssecurar de nove tu conto", "Server side authentication failed!" => "Il falleva authentication de latere servitor!", "Please contact your administrator." => "Pro favor continge tu administrator.", -"Lost your password?" => "Tu perdeva le contrasigno?", "remember" => "memora", "Log in" => "Aperir session", "Alternative Logins" => "Accessos de autorisation alternative", diff --git a/core/l10n/id.php b/core/l10n/id.php index 29a9a36f75a..1d84d27b932 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"), "last year" => "tahun kemarin", "years ago" => "beberapa tahun lalu", +"Reset password" => "Atur ulang sandi", "Yes" => "Ya", "No" => "Tidak", "Choose" => "Pilih", @@ -111,19 +112,13 @@ $TRANSLATIONS = array( "Please reload the page." => "Silakan muat ulang halaman.", "The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.", "%s password reset" => "%s sandi diatur ulang", -"A problem has occurred whilst sending the email, please contact your administrator." => "Terjadi masalah saat mengirim email, silakan hubungi administrator Anda.", "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {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 ." => "Tautan untuk mengatur ulang sandi anda telah dikirimkan ke email Anda.<br>Jika anda tidak menerimanya selama waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada juga, coba tanyakanlah kepada administrator lokal anda.", -"Request failed!<br>Did you make sure your email/username was right?" => "Permintaan gagal!<br>Apakah anda yakin email/nama pengguna anda benar?", "You will receive a link to reset your password via Email." => "Anda akan menerima tautan penyetelan ulang sandi lewat Email.", "Username" => "Nama pengguna", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?", "Yes, I really want to reset my password now" => "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang", "Reset" => "Atur Ulang", -"Your password was reset" => "Sandi Anda telah diatur ulang", -"To login page" => "Ke halaman masuk", "New password" => "Sandi baru", -"Reset password" => "Atur ulang sandi", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!", "For the best results, please consider using a GNU/Linux server instead." => "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ", "Personal" => "Pribadi", @@ -170,7 +165,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Silakan ubah sandi anda untuk mengamankan kembali akun anda.", "Server side authentication failed!" => "Otentikasi dari sisi server gagal!", "Please contact your administrator." => "Silahkan hubungi administrator anda.", -"Lost your password?" => "Lupa sandi?", "remember" => "selalu masuk", "Log in" => "Masuk", "Alternative Logins" => "Cara Alternatif untuk Masuk", diff --git a/core/l10n/is.php b/core/l10n/is.php index c1554eef832..08829bcbcc0 100644 --- a/core/l10n/is.php +++ b/core/l10n/is.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "síðasta ári", "years ago" => "einhverjum árum", +"Reset password" => "Endursetja lykilorð", "Yes" => "Já", "No" => "Nei", "Choose" => "Veldu", @@ -75,10 +76,7 @@ $TRANSLATIONS = array( "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ð.", "Username" => "Notendanafn", -"Your password was reset" => "Lykilorðið þitt hefur verið endursett.", -"To login page" => "Fara á innskráningarsíðu", "New password" => "Nýtt lykilorð", -"Reset password" => "Endursetja lykilorð", "Personal" => "Um mig", "Users" => "Notendur", "Apps" => "Forrit", @@ -104,7 +102,6 @@ $TRANSLATIONS = array( "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.", "Please change your password to secure your account again." => "Vinsamlegast breyttu lykilorðinu þínu til að tryggja öryggi þitt.", -"Lost your password?" => "Týndir þú lykilorðinu?", "remember" => "muna eftir mér", "Log in" => "<strong>Skrá inn</strong>" ); diff --git a/core/l10n/it.php b/core/l10n/it.php index df11ccfda9b..0faa4dbe372 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n mese fa","%n mesi fa"), "last year" => "anno scorso", "years ago" => "anni fa", +"Reset password" => "Ripristina la password", "Yes" => "Sì", "No" => "No", "Choose" => "Scegli", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "L'aggiornamento non è riuscito.", "The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.", "%s password reset" => "Ripristino password di %s", -"A problem has occurred whilst sending the email, please contact your administrator." => "Si è verificato un problema durante l'invio della email, contatta il tuo amministratore.", "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {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 ." => "Il collegamento per ripristinare la password è stato inviato al tuo indirizzo di posta.<br>Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.", -"Request failed!<br>Did you make sure your email/username was right?" => "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?", "You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email", "Username" => "Nome utente", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?", "Yes, I really want to reset my password now" => "Sì, voglio davvero ripristinare la mia password adesso", "Reset" => "Ripristina", -"Your password was reset" => "La password è stata ripristinata", -"To login page" => "Alla pagina di accesso", "New password" => "Nuova password", -"Reset password" => "Ripristina la password", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!", "For the best results, please consider using a GNU/Linux server instead." => "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.", "Personal" => "Personale", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Cambia la password per rendere nuovamente sicuro il tuo account.", "Server side authentication failed!" => "Autenticazione lato server non riuscita!", "Please contact your administrator." => "Contatta il tuo amministratore di sistema.", -"Lost your password?" => "Hai perso la password?", "remember" => "ricorda", "Log in" => "Accedi", "Alternative Logins" => "Accessi alternativi", diff --git a/core/l10n/ja.php b/core/l10n/ja.php index 5d7f9b3d15f..9be91c44ca7 100644 --- a/core/l10n/ja.php +++ b/core/l10n/ja.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%nヶ月前"), "last year" => "1年前", "years ago" => "数年前", +"Reset password" => "パスワードをリセット", "Yes" => "はい", "No" => "いいえ", "Choose" => "選択", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "アップデートに失敗しました。", "The update was successful. Redirecting you to ownCloud now." => "アップデートに成功しました。今すぐownCloudにリダイレクトします。", "%s password reset" => "%s パスワードリセット", -"A problem has occurred whilst sending the email, please contact your administrator." => "メールの送信中に問題が発生しました。管理者に問い合わせください。", "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" => "ユーザー名", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？", "Yes, I really want to reset my password now" => "はい、今すぐパスワードをリセットします。", "Reset" => "リセット", -"Your password was reset" => "あなたのパスワードはリセットされました。", -"To login page" => "ログインページへ戻る", "New password" => "新しいパスワードを入力", -"Reset password" => "パスワードをリセット", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。", "For the best results, please consider using a GNU/Linux server instead." => "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。", "Personal" => "個人", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "アカウント保護のため、パスワードを再度変更してください。", "Server side authentication failed!" => "サーバーサイドの認証に失敗しました！", "Please contact your administrator." => "管理者に問い合わせてください。", -"Lost your password?" => "パスワードを忘れましたか？", "remember" => "パスワードを保存", "Log in" => "ログイン", "Alternative Logins" => "代替ログイン", diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php index 346d052a040..50b60f9b103 100644 --- a/core/l10n/ka_GE.php +++ b/core/l10n/ka_GE.php @@ -33,6 +33,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array(""), "last year" => "ბოლო წელს", "years ago" => "წლის წინ", +"Reset password" => "პაროლის შეცვლა", "Yes" => "კი", "No" => "არა", "Choose" => "არჩევა", @@ -79,10 +80,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}", "You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე", "Username" => "მომხმარებლის სახელი", -"Your password was reset" => "თქვენი პაროლი შეცვლილია", -"To login page" => "შესვლის გვერდზე", "New password" => "ახალი პაროლი", -"Reset password" => "პაროლის შეცვლა", "Personal" => "პირადი", "Users" => "მომხმარებელი", "Apps" => "აპლიკაციები", @@ -109,7 +107,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "ავტომატური შესვლა უარყოფილია!", "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" => "დამახსოვრება", "Log in" => "შესვლა", "Alternative Logins" => "ალტერნატიული Login–ი" diff --git a/core/l10n/km.php b/core/l10n/km.php index 1dbd2e19a2b..24d8ad8bc9a 100644 --- a/core/l10n/km.php +++ b/core/l10n/km.php @@ -34,6 +34,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n ខែមុន"), "last year" => "ឆ្នាំមុន", "years ago" => "ឆ្នាំមុន", +"Reset password" => "កំណត់ពាក្យសម្ងាត់ម្ដងទៀត", "Yes" => "ព្រម", "No" => "ទេ", "Choose" => "ជ្រើស", @@ -84,12 +85,8 @@ $TRANSLATIONS = array( "Delete" => "លុប", "Add" => "បញ្ចូល", "Please reload the page." => "សូមផ្ទុកទំព័រនេះឡើងវិញ។", -"A problem has occurred whilst sending the email, please contact your administrator." => "មានកំហុសបានកើតឡើងនៅពេលលកំពុងផ្ញើអ៊ីមែលចេញ, សូមទាក់ទងអភិបាលរបស់អ្នក។", "Username" => "ឈ្មោះអ្នកប្រើ", -"Your password was reset" => "ពាក្យសម្ងាត់របស់អ្នកត្រូវបានកំណត់ឡើងវិញ", -"To login page" => "ទៅទំព័រចូល", "New password" => "ពាក្យសម្ងាត់ថ្មី", -"Reset password" => "កំណត់ពាក្យសម្ងាត់ម្ដងទៀត", "Personal" => "ផ្ទាល់ខ្លួន", "Users" => "អ្នកប្រើ", "Apps" => "កម្មវិធី", @@ -112,7 +109,6 @@ $TRANSLATIONS = array( "Log out" => "ចាកចេញ", "Automatic logon rejected!" => "បានបដិសេធការចូលដោយស្វ័យប្រវត្តិ!", "Please change your password to secure your account again." => "សូមប្ដូរពាក្យសម្ងាត់របស់អ្នក ដើម្បីការពារគណនីរបស់អ្នក។", -"Lost your password?" => "បាត់ពាក្យសម្ងាត់របស់អ្នក?", "remember" => "ចងចាំ", "Log in" => "ចូល", "Alternative Logins" => "ការចូលជំនួស" diff --git a/core/l10n/ko.php b/core/l10n/ko.php index 1b66509478b..58c9fb43509 100644 --- a/core/l10n/ko.php +++ b/core/l10n/ko.php @@ -42,6 +42,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n달 전 "), "last year" => "작년", "years ago" => "년 전", +"Reset password" => "암호 재설정", "Yes" => "예", "No" => "아니요", "Choose" => "선택", @@ -109,17 +110,12 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.", "%s password reset" => "%s 암호 재설정", "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" => "사용자 이름", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?", "Yes, I really want to reset my password now" => "예, 지금 내 암호를 재설정합니다", "Reset" => "재설정", -"Your password was reset" => "암호가 재설정되었습니다", -"To login page" => "로그인 화면으로", "New password" => "새 암호", -"Reset password" => "암호 재설정", "Personal" => "개인", "Users" => "사용자", "Apps" => "앱", @@ -164,7 +160,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "계정의 안전을 위하여 암호를 변경하십시오.", "Server side authentication failed!" => "서버 인증 실패!", "Please contact your administrator." => "관리자에게 문의하십시오.", -"Lost your password?" => "암호를 잊으셨습니까?", "remember" => "기억하기", "Log in" => "로그인", "Alternative Logins" => "대체 로그인", diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php index 374b6e5058a..923ebdfd7ea 100644 --- a/core/l10n/ku_IQ.php +++ b/core/l10n/ku_IQ.php @@ -7,6 +7,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"Reset password" => "دووباره كردنهوهی وشهی نهێنی", "Yes" => "بەڵێ", "No" => "نەخێر", "_{count} file conflict_::_{count} file conflicts_" => array("",""), @@ -17,7 +18,6 @@ $TRANSLATIONS = array( "Add" => "زیادکردن", "Username" => "ناوی بهکارهێنهر", "New password" => "وشەی نهێنی نوێ", -"Reset password" => "دووباره كردنهوهی وشهی نهێنی", "Users" => "بهكارهێنهر", "Apps" => "بهرنامهكان", "Admin" => "بهڕێوهبهری سهرهكی", diff --git a/core/l10n/lb.php b/core/l10n/lb.php index 732ca519188..471daa0af8e 100644 --- a/core/l10n/lb.php +++ b/core/l10n/lb.php @@ -39,6 +39,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "Lescht Joer", "years ago" => "Joren hir", +"Reset password" => "Passwuert zréck setzen", "Yes" => "Jo", "No" => "Nee", "Choose" => "Auswielen", @@ -91,17 +92,12 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet.", "%s password reset" => "%s Passwuert ass nei gesat", "Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert zréckzesetzen: {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 ." => "De Link fir d'Passwuert zréckzesetzen gouf un deng E-Mail-Adress geschéckt.<br>Falls du d'Mail net an den nächste Minutte kriss, kuck w.e.gl. an dengem Spam-Dossier.<br>Wann do och keng Mail ass, fro w.e.gl. däin Adminstrateur.", -"Request failed!<br>Did you make sure your email/username was right?" => "Ufro feelfeschloen!<br>Hues du séchergestallt dass deng Email respektiv däi Benotzernumm korrekt sinn?", "You will receive a link to reset your password via Email." => "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.", "Username" => "Benotzernumm", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?", "Yes, I really want to reset my password now" => "Jo, ech wëll mäi Passwuert elo zrécksetzen", "Reset" => "Zeréck setzen", -"Your password was reset" => "Däi Passwuert ass zréck gesat ginn", -"To login page" => "Bei d'Login-Säit", "New password" => "Neit Passwuert", -"Reset password" => "Passwuert zréck setzen", "Personal" => "Perséinlech", "Users" => "Benotzer", "Apps" => "Applikatiounen", @@ -134,7 +130,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "Automatesch Umeldung ofgeleent!", "If you did not change your password recently, your account may be compromised!" => "Falls du däi Passwuert net viru kuerzem geännert hues, kéint däin Account kompromittéiert sinn!", "Please change your password to secure your account again." => "Änner w.e.gl däi Passwuert fir däin Account nees ofzesécheren.", -"Lost your password?" => "Passwuert vergiess?", "remember" => "verhalen", "Log in" => "Umellen", "Alternative Logins" => "Alternativ Umeldungen", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index b1ebfed84f0..8a87ab03356 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -42,6 +42,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("prieš %n mėnesį","prieš %n mėnesius","prieš %n mėnesių"), "last year" => "praeitais metais", "years ago" => "prieš metus", +"Reset password" => "Atkurti slaptažodį", "Yes" => "Taip", "No" => "Ne", "Choose" => "Pasirinkite", @@ -104,17 +105,12 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.", "%s password reset" => "%s slaptažodžio atnaujinimas", "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", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?", "Yes, I really want to reset my password now" => "Taip, aš tikrai noriu atnaujinti slaptažodį", "Reset" => "Atstatyti", -"Your password was reset" => "Jūsų slaptažodis buvo nustatytas iš naujo", -"To login page" => "Į prisijungimo puslapį", "New password" => "Naujas slaptažodis", -"Reset password" => "Atkurti slaptažodį", "Personal" => "Asmeniniai", "Users" => "Vartotojai", "Apps" => "Programos", @@ -158,7 +154,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo.", "Server side authentication failed!" => "Autentikacija serveryje nepavyko!", "Please contact your administrator." => "Kreipkitės į savo sistemos administratorių.", -"Lost your password?" => "Pamiršote slaptažodį?", "remember" => "prisiminti", "Log in" => "Prisijungti", "Alternative Logins" => "Alternatyvūs prisijungimai", diff --git a/core/l10n/lv.php b/core/l10n/lv.php index 75fe15195c3..3e0b01d791b 100644 --- a/core/l10n/lv.php +++ b/core/l10n/lv.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("Šomēnes, %n mēneši","Pirms %n mēneša","Pirms %n mēnešiem"), "last year" => "gājušajā gadā", "years ago" => "gadus atpakaļ", +"Reset password" => "Mainīt paroli", "Yes" => "Jā", "No" => "Nē", "Choose" => "Izvēlieties", @@ -78,16 +79,11 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.", "%s password reset" => "%s paroles maiņa", "Use the following link to reset your password: {link}" => "Izmantojiet šo saiti, lai mainītu paroli: {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 ." => "Saite uz paroles atjaunošanas vietu ir nosūtīta uz epastu.<br>Ja vēstu nav atnākusi, pārbaudiet epasta mēstuļu mapi.<br>Jā tās tur nav, jautājiet sistēmas administratoram.", -"Request failed!<br>Did you make sure your email/username was right?" => "Pieprasījums neizdevās!<br>Vai Jūs pārliecinājāties ka epasts/lietotājvārds ir pareizi?", "You will receive a link to reset your password via Email." => "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.", "Username" => "Lietotājvārds", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?", "Yes, I really want to reset my password now" => "Jā, Es tiešām vēlos mainīt savu paroli", -"Your password was reset" => "Jūsu parole tika nomainīta", -"To login page" => "Uz ielogošanās lapu", "New password" => "Jauna parole", -"Reset password" => "Mainīt paroli", "Personal" => "Personīgi", "Users" => "Lietotāji", "Apps" => "Lietotnes", @@ -117,7 +113,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "Automātiskā ierakstīšanās ir noraidīta!", "If you did not change your password recently, your account may be compromised!" => "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts ir kompromitēts.", "Please change your password to secure your account again." => "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu.", -"Lost your password?" => "Aizmirsāt paroli?", "remember" => "atcerēties", "Log in" => "Ierakstīties", "Alternative Logins" => "Alternatīvās pieteikšanās" diff --git a/core/l10n/mk.php b/core/l10n/mk.php index 9ebd51daab8..df335543d15 100644 --- a/core/l10n/mk.php +++ b/core/l10n/mk.php @@ -38,6 +38,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "минатата година", "years ago" => "пред години", +"Reset password" => "Ресетирај лозинка", "Yes" => "Да", "No" => "Не", "Choose" => "Избери", @@ -102,10 +103,7 @@ $TRANSLATIONS = array( "Username" => "Корисничко име", "Yes, I really want to reset my password now" => "Да, јас сега навистина сакам да ја поништам својата лозинка", "Reset" => "Поништи", -"Your password was reset" => "Вашата лозинка беше ресетирана", -"To login page" => "Кон страницата за најава", "New password" => "Нова лозинка", -"Reset password" => "Ресетирај лозинка", "Personal" => "Лично", "Users" => "Корисници", "Apps" => "Аппликации", @@ -143,7 +141,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно.", "Server side authentication failed!" => "Автентификацијата на серверската страна е неуспешна!", "Please contact your administrator." => "Ве молиме контактирајте го вашиот администратор.", -"Lost your password?" => "Ја заборавивте лозинката?", "remember" => "запамти", "Log in" => "Најава", "Alternative Logins" => "Алтернативни најавувања", diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php index ac6386c9845..cd1324b2f61 100644 --- a/core/l10n/ms_MY.php +++ b/core/l10n/ms_MY.php @@ -26,6 +26,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array(""), "_%n day ago_::_%n days ago_" => array(""), "_%n month ago_::_%n months ago_" => array(""), +"Reset password" => "Penetapan semula kata laluan", "Yes" => "Ya", "No" => "Tidak", "Ok" => "Ok", @@ -39,10 +40,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}", "You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel", "Username" => "Nama pengguna", -"Your password was reset" => "Kata laluan anda telah diset semula", -"To login page" => "Ke halaman log masuk", "New password" => "Kata laluan baru", -"Reset password" => "Penetapan semula kata laluan", "Personal" => "Peribadi", "Users" => "Pengguna", "Apps" => "Aplikasi", @@ -61,7 +59,6 @@ $TRANSLATIONS = array( "Database host" => "Hos pangkalan data", "Finish setup" => "Setup selesai", "Log out" => "Log keluar", -"Lost your password?" => "Hilang kata laluan?", "remember" => "ingat", "Log in" => "Log masuk" ); diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php index 4d722a859fc..e9a228bdea9 100644 --- a/core/l10n/my_MM.php +++ b/core/l10n/my_MM.php @@ -40,8 +40,6 @@ $TRANSLATIONS = array( "Add" => "ပေါင်းထည့်", "You will receive a link to reset your password via Email." => "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။", "Username" => "သုံးစွဲသူအမည်", -"Your password was reset" => "သင်၏စကားဝှက်ကိုပြန်ဖော်ပြီးပါပြီ။", -"To login page" => "ဝင်ရောက်သည့်စာမျက်နှာသို့", "New password" => "စကားဝှက်အသစ်", "Users" => "သုံးစွဲသူ", "Apps" => "Apps", @@ -56,7 +54,6 @@ $TRANSLATIONS = array( "Database password" => "Database စကားဝှက်", "Database name" => "Database အမည်", "Finish setup" => "တပ်ဆင်ခြင်းပြီးပါပြီ။", -"Lost your password?" => "သင်၏စကားဝှက်ပျောက်သွားပြီလား။", "remember" => "မှတ်မိစေသည်", "Log in" => "ဝင်ရောက်ရန်" ); diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index 5dfd72fa904..7fe264ebea7 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("for %n måned siden","for %n måneder siden"), "last year" => "i fjor", "years ago" => "årevis siden", +"Reset password" => "Tilbakestill passord", "Yes" => "Ja", "No" => "Nei", "Choose" => "Velg", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Oppdateringen var vellykket.", "The update was successful. Redirecting you to ownCloud now." => "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.", "%s password reset" => "%s nullstilling av passord", -"A problem has occurred whilst sending the email, please contact your administrator." => "Et problem oppstod ved sending av mailen. Kontakt administratoren.", "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {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 ." => "Lenken for nullstilling av passordet ditt er sendt til din email.<br>Hvis du ikke mottar den innen rimelig tid, sjekk spam- og søppelmappene i epost-programmet.<br>Hvis den ikke er der, kontakt din lokale administrator .", -"Request failed!<br>Did you make sure your email/username was right?" => "Anmodning feilet!<br>Forsikret du deg om at din email/brukernavn var korrekt?", "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.", "Username" => "Brukernavn", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er nullstilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?", "Yes, I really want to reset my password now" => "Ja, jeg vil virkelig nullstille passordet mitt nå", "Reset" => "Nullstill", -"Your password was reset" => "Passordet ditt ble tilbakestilt", -"To login page" => "Til innlogginssiden", "New password" => "Nytt passord", -"Reset password" => "Tilbakestill passord", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!", "For the best results, please consider using a GNU/Linux server instead." => "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.", "Personal" => "Personlig", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Vennligst skift passord for å gjøre kontoen din sikker igjen.", "Server side authentication failed!" => "Autentisering feilet på serveren!", "Please contact your administrator." => "Vennligst kontakt administratoren din.", -"Lost your password?" => "Mistet passordet ditt?", "remember" => "husk", "Log in" => "Logg inn", "Alternative Logins" => "Alternative innlogginger", diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 24b1e59ad36..7c977ae71d7 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "File" => "Bestand", "Folder" => "Map", "Image" => "Afbeelding", +"Audio" => "Audio", "Saving..." => "Opslaan", "seconds ago" => "seconden geleden", "_%n minute ago_::_%n minutes ago_" => array("","%n minuten geleden"), @@ -46,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","%n maanden geleden"), "last year" => "vorig jaar", "years ago" => "jaar geleden", +"Reset password" => "Reset wachtwoord", "Yes" => "Ja", "No" => "Nee", "Choose" => "Kies", @@ -120,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "De update is niet geslaagd.", "The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.", "%s password reset" => "%s wachtwoord reset", -"A problem has occurred whilst sending the email, please contact your administrator." => "Er ontstond een probleem bij het versturen van het e-mailbericht, neem contact op met uw beheerder.", "Use the following link to reset your password: {link}" => "Gebruik de volgende link om uw wachtwoord te resetten: {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 ." => "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spammap.<br>Als het daar ook niet is, vraag dan uw beheerder om hulp.", -"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?", "You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.", "Username" => "Gebruikersnaam", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?", "Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten", "Reset" => "Reset", -"Your password was reset" => "Uw wachtwoord is gewijzigd", -"To login page" => "Naar de login-pagina", "New password" => "Nieuw wachtwoord", -"Reset password" => "Reset wachtwoord", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!", "For the best results, please consider using a GNU/Linux server instead." => "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.", "Personal" => "Persoonlijk", @@ -181,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Wijzig uw wachtwoord zodat uw account weer beveiligd is.", "Server side authentication failed!" => "Authenticatie bij de server mislukte!", "Please contact your administrator." => "Neem contact op met uw systeembeheerder.", -"Lost your password?" => "Wachtwoord vergeten?", "remember" => "onthoud gegevens", "Log in" => "Meld u aan", "Alternative Logins" => "Alternatieve inlogs", diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index 167558f90f8..48873b51771 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -41,6 +41,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n månad sidan","%n månadar sidan"), "last year" => "i fjor", "years ago" => "år sidan", +"Reset password" => "Nullstill passord", "Yes" => "Ja", "No" => "Nei", "Choose" => "Vel", @@ -95,16 +96,11 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.", "%s password reset" => "%s passordnullstilling", "Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {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 ." => "Lenkja til å nullstilla passordet med er sendt til e-posten din.<br>Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid.<br>Spør din lokale administrator viss han ikkje er der heller.", -"Request failed!<br>Did you make sure your email/username was right?" => "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/brukarnamn?", "You will receive a link to reset your password via Email." => "Du vil få ein e-post med ei lenkje for å nullstilla passordet.", "Username" => "Brukarnamn", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?", "Yes, I really want to reset my password now" => "Ja, eg vil nullstilla passordet mitt no", -"Your password was reset" => "Passordet ditt er nullstilt", -"To login page" => "Til innloggingssida", "New password" => "Nytt passord", -"Reset password" => "Nullstill passord", "Personal" => "Personleg", "Users" => "Brukarar", "Apps" => "Program", @@ -134,7 +130,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "Automatisk innlogging avvist!", "If you did not change your password recently, your account may be compromised!" => "Viss du ikkje endra passordet ditt nyleg, så kan kontoen din vera kompromittert!", "Please change your password to secure your account again." => "Ver venleg og endra passordet for å gjera kontoen din trygg igjen.", -"Lost your password?" => "Gløymt passordet?", "remember" => "hugs", "Log in" => "Logg inn", "Alternative Logins" => "Alternative innloggingar" diff --git a/core/l10n/oc.php b/core/l10n/oc.php index a38ee0ad7b5..38b04414318 100644 --- a/core/l10n/oc.php +++ b/core/l10n/oc.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "an passat", "years ago" => "ans a", +"Reset password" => "Senhal tornat botar", "Yes" => "Òc", "No" => "Non", "Choose" => "Causís", @@ -65,10 +66,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}", "You will receive a link to reset your password via Email." => "Reçaupràs un ligam per tornar botar ton senhal via corrièl.", "Username" => "Non d'usancièr", -"Your password was reset" => "Ton senhal es estat tornat botar", -"To login page" => "Pagina cap al login", "New password" => "Senhal novèl", -"Reset password" => "Senhal tornat botar", "Personal" => "Personal", "Users" => "Usancièrs", "Apps" => "Apps", @@ -88,7 +86,6 @@ $TRANSLATIONS = array( "Database host" => "Òste de basa de donadas", "Finish setup" => "Configuracion acabada", "Log out" => "Sortida", -"Lost your password?" => "L'as perdut lo senhal ?", "remember" => "bremba-te", "Log in" => "Dintrada" ); diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 460984d2625..f9b7efedfd3 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"), "last year" => "w zeszłym roku", "years ago" => "lat temu", +"Reset password" => "Zresetuj hasło", "Yes" => "Tak", "No" => "Nie", "Choose" => "Wybierz", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Aktualizacja nie powiodła się.", "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.", "%s password reset" => "%s reset hasła", -"A problem has occurred whilst sending the email, please contact your administrator." => "Pojawił się problem podczas wysyłania wiadomości email, skontaktuj się z administratorem", "Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {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 ." => "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.", -"Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?", "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.", "Username" => "Nazwa użytkownika", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?", "Yes, I really want to reset my password now" => "Tak, naprawdę chcę zresetować hasło teraz", "Reset" => "Resetuj", -"Your password was reset" => "Zresetowano hasło", -"To login page" => "Do strony logowania", "New password" => "Nowe hasło", -"Reset password" => "Zresetuj hasło", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!", "For the best results, please consider using a GNU/Linux server instead." => "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.", "Personal" => "Osobiste", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto.", "Server side authentication failed!" => "Uwierzytelnianie po stronie serwera nie powiodło się!", "Please contact your administrator." => "Skontaktuj się z administratorem", -"Lost your password?" => "Nie pamiętasz hasła?", "remember" => "pamiętaj", "Log in" => "Zaloguj", "Alternative Logins" => "Alternatywne loginy", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index 1f7b4ea9ce0..42381b9fe22 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("ha %n mês","ha %n meses"), "last year" => "último ano", "years ago" => "anos atrás", +"Reset password" => "Redefinir senha", "Yes" => "Sim", "No" => "Não", "Choose" => "Escolha", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "A atualização não foi bem sucedida.", "The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.", "%s password reset" => "%s redefinir senha", -"A problem has occurred whilst sending the email, please contact your administrator." => "Um problema ocorreu durante o envio do e-mail, por favor, contate o administrador.", "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {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 ." => "O link para redefinir sua senha foi enviada para o seu e-mail. <br> Se você não recebê-lo dentro de um período razoável de tempo, verifique o spam/lixo. <br> Se ele não estiver lá perguntar ao seu administrador local.", -"Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corretos?", "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha por e-mail.", "Username" => "Nome de usuário", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer, por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?", "Yes, I really want to reset my password now" => "Sim, realmente quero criar uma nova senha.", "Reset" => "Resetar", -"Your password was reset" => "Sua senha foi redefinida", -"To login page" => "Para a página de login", "New password" => "Nova senha", -"Reset password" => "Redefinir senha", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!", "For the best results, please consider using a GNU/Linux server instead." => "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.", "Personal" => "Pessoal", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.", "Server side authentication failed!" => "Autenticação do servidor falhou!", "Please contact your administrator." => "Por favor, contate o administrador.", -"Lost your password?" => "Esqueceu sua senha?", "remember" => "lembrar", "Log in" => "Fazer login", "Alternative Logins" => "Logins alternativos", diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index 5a8081e5cc1..9a6512dddd4 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n mês atrás","%n meses atrás"), "last year" => "ano passado", "years ago" => "anos atrás", +"Reset password" => "Repor password", "Yes" => "Sim", "No" => "Não", "Choose" => "Escolha", @@ -115,19 +116,13 @@ $TRANSLATIONS = array( "Please reload the page." => "Por favor recarregue a página.", "The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.", "%s password reset" => "%s reposição da password", -"A problem has occurred whilst sending the email, please contact your administrator." => "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.", "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {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 ." => "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.", -"Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?", "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password", "Username" => "Nome de utilizador", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?", "Yes, I really want to reset my password now" => "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.", "Reset" => "Repor", -"Your password was reset" => "A sua password foi reposta", -"To login page" => "Para a página de entrada", "New password" => "Nova palavra-chave", -"Reset password" => "Repor password", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.", "For the best results, please consider using a GNU/Linux server instead." => "Para um melhor resultado, utilize antes o servidor GNU/Linux.", "Personal" => "Pessoal", @@ -174,7 +169,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Por favor mude a sua palavra-passe para assegurar a sua conta de novo.", "Server side authentication failed!" => "Autenticação do lado do servidor falhou!", "Please contact your administrator." => "Por favor contacte o administrador.", -"Lost your password?" => "Esqueceu-se da sua password?", "remember" => "lembrar", "Log in" => "Entrar", "Alternative Logins" => "Contas de acesso alternativas", diff --git a/core/l10n/ro.php b/core/l10n/ro.php index b9873a767e8..4cfe6ebc2b7 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","",""), "last year" => "ultimul an", "years ago" => "ani în urmă", +"Reset password" => "Resetează parola", "Yes" => "Da", "No" => "Nu", "Choose" => "Alege", @@ -85,16 +86,11 @@ $TRANSLATIONS = array( "Add" => "Adaugă", "The update was successful. Redirecting you to ownCloud now." => "Actualizare reușită. Ești redirecționat către ownCloud.", "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {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 ." => "Linkul pentru resetarea parolei tale a fost trimis pe email. <br>Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. <br>Daca nu sunt acolo intreaba administratorul local.", -"Request failed!<br>Did you make sure your email/username was right?" => "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corecte?", "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email.", "Username" => "Nume utilizator", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?", "Yes, I really want to reset my password now" => "Da, eu chiar doresc să îmi resetez parola acum", -"Your password was reset" => "Parola a fost resetată", -"To login page" => "Spre pagina de autentificare", "New password" => "Noua parolă", -"Reset password" => "Resetează parola", "Personal" => "Personal", "Users" => "Utilizatori", "Apps" => "Aplicații", @@ -124,7 +120,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "Autentificare automată respinsă!", "If you did not change your password recently, your account may be compromised!" => "Dacă nu ți-ai schimbat parola recent, contul tău ar putea fi compromis!", "Please change your password to secure your account again." => "Te rog schimbă-ți parola pentru a-ți securiza din nou contul.", -"Lost your password?" => "Ai uitat parola?", "remember" => "amintește", "Log in" => "Autentificare", "Alternative Logins" => "Conectări alternative" diff --git a/core/l10n/ru.php b/core/l10n/ru.php index d73cdfa7e24..14e544723f5 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -46,6 +46,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"), "last year" => "в прошлом году", "years ago" => "несколько лет назад", +"Reset password" => "Сбросить пароль", "Yes" => "Да", "No" => "Нет", "Choose" => "Выбрать", @@ -119,19 +120,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Обновление не удалось.", "The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...", "%s password reset" => "%s сброс пароля", -"A problem has occurred whilst sending the email, please contact your administrator." => "Произошла ошибка при отправке сообщения электронной почты, пожалуйста, свяжитесь с Вашим администратором.", "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?" => "Запрос не удался. Вы уверены, что email или имя пользователя указаны верно?", "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.", "Username" => "Имя пользователя", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?", "Yes, I really want to reset my password now" => "Да, я действительно хочу сбросить свой пароль", "Reset" => "Сброс", -"Your password was reset" => "Ваш пароль был сброшен", -"To login page" => "На страницу авторизации", "New password" => "Новый пароль", -"Reset password" => "Сбросить пароль", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!", "For the best results, please consider using a GNU/Linux server instead." => "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.", "Personal" => "Личное", @@ -179,7 +174,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись.", "Server side authentication failed!" => "Неудачная аутентификация с сервером!", "Please contact your administrator." => "Пожалуйста, свяжитесь с вашим администратором.", -"Lost your password?" => "Забыли пароль?", "remember" => "запомнить", "Log in" => "Войти", "Alternative Logins" => "Альтернативные имена пользователя", diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php index f3caa67fecb..8a245fe8bdb 100644 --- a/core/l10n/si_LK.php +++ b/core/l10n/si_LK.php @@ -33,6 +33,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "පෙර අවුරුද්දේ", "years ago" => "අවුරුදු කීපයකට පෙර", +"Reset password" => "මුරපදය ප්රත්යාරම්භ කරන්න", "Yes" => "ඔව්", "No" => "එපා", "Choose" => "තෝරන්න", @@ -61,10 +62,7 @@ $TRANSLATIONS = array( "Add" => "එකතු කරන්න", "You will receive a link to reset your password via Email." => "ඔබගේ මුරපදය ප්රත්යාරම්භ කිරීම සඳහා යොමුව විද්යුත් තැපෑලෙන් ලැබෙනු ඇත", "Username" => "පරිශීලක නම", -"Your password was reset" => "ඔබේ මුරපදය ප්රත්යාරම්භ කරන ලදී", -"To login page" => "පිවිසුම් පිටුවට", "New password" => "නව මුරපදය", -"Reset password" => "මුරපදය ප්රත්යාරම්භ කරන්න", "Personal" => "පෞද්ගලික", "Users" => "පරිශීලකයන්", "Apps" => "යෙදුම්", @@ -83,7 +81,6 @@ $TRANSLATIONS = array( "Database host" => "දත්තගබඩා සේවාදායකයා", "Finish setup" => "ස්ථාපනය කිරීම අවසන් කරන්න", "Log out" => "නික්මීම", -"Lost your password?" => "මුරපදය අමතකද?", "remember" => "මතක තබාගන්න", "Log in" => "ප්රවේශවන්න" ); diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index 61a0ab5cfa4..a8026cae749 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"), "last year" => "minulý rok", "years ago" => "pred rokmi", +"Reset password" => "Obnovenie hesla", "Yes" => "Áno", "No" => "Nie", "Choose" => "Vybrať", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Aktualizácia zlyhala.", "The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.", "%s password reset" => "reset hesla %s", -"A problem has occurred whilst sending the email, please contact your administrator." => "Vyskytol sa problém pri odosielaní emailu, prosím obráťte sa na správcu.", "Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {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 ." => "Odkaz na obnovenie hesla bol odoslaný na vašu emailovú adresu.<br>Ak ho v krátkej dobe neobdržíte, skontrolujte si váš kôš a priečinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora.", -"Request failed!<br>Did you make sure your email/username was right?" => "Požiadavka zlyhala.<br>Uistili ste sa, že vaše používateľské meno a email sú správne?", "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte emailom.", "Username" => "Meno používateľa", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?", "Yes, I really want to reset my password now" => "Áno, želám si teraz obnoviť svoje heslo", "Reset" => "Resetovať", -"Your password was reset" => "Vaše heslo bolo obnovené", -"To login page" => "Na prihlasovaciu stránku", "New password" => "Nové heslo", -"Reset password" => "Obnovenie hesla", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!", "For the best results, please consider using a GNU/Linux server instead." => "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.", "Personal" => "Osobné", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Prosím, zmeňte si svoje heslo pre opätovné zabezpečenie vášho účtu.", "Server side authentication failed!" => "Autentifikácia na serveri zlyhala!", "Please contact your administrator." => "Kontaktujte prosím vášho administrátora.", -"Lost your password?" => "Zabudli ste heslo?", "remember" => "zapamätať", "Log in" => "Prihlásiť sa", "Alternative Logins" => "Alternatívne prihlásenie", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 121e3ca9631..4fe12d76021 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"), "last year" => "lansko leto", "years ago" => "let nazaj", +"Reset password" => "Ponastavi geslo", "Yes" => "Da", "No" => "Ne", "Choose" => "Izbor", @@ -112,19 +113,13 @@ $TRANSLATIONS = array( "Please reload the page." => "Stran je treba ponovno naložiti", "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", "%s password reset" => "Ponastavitev gesla %s", -"A problem has occurred whilst sending the email, please contact your administrator." => "Prišlo je do napake med pošiljanjem elektronskega sporočila. Stopite v stik s skrbnikom sistema.", "Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {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 ." => "Povezava za ponastavitev gesla je bila poslana na elektronski naslov.<br>V kolikor sporočila ne prejmete v doglednem času, preverite tudi mape vsiljene pošte.<br>Če ne bo niti tam, stopite v stik s skrbnikom.", -"Request failed!<br>Did you make sure your email/username was right?" => "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?", "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.", "Username" => "Uporabniško ime", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?", "Yes, I really want to reset my password now" => "Da, potrjujem ponastavitev gesla", "Reset" => "Ponastavi", -"Your password was reset" => "Geslo je ponovno nastavljeno", -"To login page" => "Na prijavno stran", "New password" => "Novo geslo", -"Reset password" => "Ponastavi geslo", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ", "For the best results, please consider using a GNU/Linux server instead." => "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.", "Personal" => "Osebno", @@ -171,7 +166,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Spremenite geslo za izboljšanje zaščite računa.", "Server side authentication failed!" => "Overitev s strežnika je spodletela!", "Please contact your administrator." => "Stopite v stik s skrbnikom sistema.", -"Lost your password?" => "Ali ste pozabili geslo?", "remember" => "zapomni si", "Log in" => "Prijava", "Alternative Logins" => "Druge prijavne možnosti", diff --git a/core/l10n/sq.php b/core/l10n/sq.php index 7672f869ccf..2465ca92be2 100644 --- a/core/l10n/sq.php +++ b/core/l10n/sq.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n muaj më parë","%n muaj më parë"), "last year" => "vitin e shkuar", "years ago" => "vite më parë", +"Reset password" => "Rivendos kodin", "Yes" => "Po", "No" => "Jo", "Choose" => "Zgjidh", @@ -78,16 +79,11 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.", "%s password reset" => "Kodi i %s -it u rivendos", "Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {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 ." => "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj.<br>Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam).<br>Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal.", -"Request failed!<br>Did you make sure your email/username was right?" => "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?", "You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.", "Username" => "Përdoruesi", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?", "Yes, I really want to reset my password now" => "Po, dua ta rivendos kodin tani", -"Your password was reset" => "Kodi yt u rivendos", -"To login page" => "Tek faqja e hyrjes", "New password" => "Kodi i ri", -"Reset password" => "Rivendos kodin", "Personal" => "Personale", "Users" => "Përdoruesit", "Apps" => "App", @@ -117,7 +113,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "Hyrja automatike u refuzua!", "If you did not change your password recently, your account may be compromised!" => "Nqse nuk keni ndryshuar kodin kohët e fundit, llogaria juaj mund të jetë komprometuar.", "Please change your password to secure your account again." => "Ju lutemi, ndryshoni kodin për ta siguruar përsëri llogarinë tuaj.", -"Lost your password?" => "Ke humbur kodin?", "remember" => "kujto", "Log in" => "Hyrje", "Alternative Logins" => "Hyrje alternative" diff --git a/core/l10n/sr.php b/core/l10n/sr.php index f7c0972d03a..09ffd425242 100644 --- a/core/l10n/sr.php +++ b/core/l10n/sr.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","",""), "last year" => "прошле године", "years ago" => "година раније", +"Reset password" => "Ресетуј лозинку", "Yes" => "Да", "No" => "Не", "Choose" => "Одабери", @@ -73,10 +74,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}", "You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.", "Username" => "Корисничко име", -"Your password was reset" => "Ваша лозинка је ресетована", -"To login page" => "На страницу за пријаву", "New password" => "Нова лозинка", -"Reset password" => "Ресетуј лозинку", "Personal" => "Лично", "Users" => "Корисници", "Apps" => "Апликације", @@ -101,7 +99,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "Аутоматска пријава је одбијена!", "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" => "упамти", "Log in" => "Пријава" ); diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php index 40c37b5b079..e46d4dd94d5 100644 --- a/core/l10n/sr@latin.php +++ b/core/l10n/sr@latin.php @@ -30,6 +30,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","",""), "last year" => "prošle godine", "years ago" => "pre nekoliko godina", +"Reset password" => "Resetuj lozinku", "Yes" => "Da", "No" => "Ne", "Choose" => "Izaberi", @@ -72,10 +73,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "Koristite sledeći link za reset lozinke: {link}", "You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.", "Username" => "Korisničko ime", -"Your password was reset" => "Vaša lozinka je resetovana", -"To login page" => "Na login stranicu", "New password" => "Nova lozinka", -"Reset password" => "Resetuj lozinku", "Personal" => "Lično", "Users" => "Korisnici", "Apps" => "Programi", @@ -100,7 +98,6 @@ $TRANSLATIONS = array( "Finish setup" => "Završi podešavanje", "Log out" => "Odjava", "Automatic logon rejected!" => "Automatsko logovanje odbijeno!", -"Lost your password?" => "Izgubili ste lozinku?", "remember" => "upamti", "Log in" => "Prijavi se" ); diff --git a/core/l10n/sv.php b/core/l10n/sv.php index a5b61448b0e..81c6e735a4c 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"), "last year" => "förra året", "years ago" => "år sedan", +"Reset password" => "Återställ lösenordet", "Yes" => "Ja", "No" => "Nej", "Choose" => "Välj", @@ -119,19 +120,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Uppdateringen misslyckades.", "The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.", "%s password reset" => "%s återställ lösenord", -"A problem has occurred whilst sending the email, please contact your administrator." => "Ett problem har uppstått under tiden e-post sändes, vänligen kontakta din administratör.", "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", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?", "Yes, I really want to reset my password now" => "Ja, jag vill verkligen återställa mitt lösenord nu", "Reset" => "Återställ", -"Your password was reset" => "Ditt lösenord har återställts", -"To login page" => "Till logginsidan", "New password" => "Nytt lösenord", -"Reset password" => "Återställ lösenordet", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!", "For the best results, please consider using a GNU/Linux server instead." => "För bästa resultat, överväg att använda en GNU/Linux server istället.", "Personal" => "Personligt", @@ -180,7 +175,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Ändra genast lösenord för att säkra ditt konto.", "Server side authentication failed!" => "Servern misslyckades med autentisering!", "Please contact your administrator." => "Kontakta din administratör.", -"Lost your password?" => "Glömt ditt lösenord?", "remember" => "kom ihåg", "Log in" => "Logga in", "Alternative Logins" => "Alternativa inloggningar", diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php index ab6fcf16964..77dcf0468cf 100644 --- a/core/l10n/ta_LK.php +++ b/core/l10n/ta_LK.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "கடந்த வருடம்", "years ago" => "வருடங்களுக்கு முன்", +"Reset password" => "மீளமைத்த கடவுச்சொல்", "Yes" => "ஆம்", "No" => "இல்லை", "Choose" => "தெரிவுசெய்க ", @@ -71,10 +72,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}", "You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ", "Username" => "பயனாளர் பெயர்", -"Your password was reset" => "உங்களுடைய கடவுச்சொல் மீளமைக்கப்பட்டது", -"To login page" => "புகுபதிகைக்கான பக்கம்", "New password" => "புதிய கடவுச்சொல்", -"Reset password" => "மீளமைத்த கடவுச்சொல்", "Personal" => "தனிப்பட்ட", "Users" => "பயனாளர்", "Apps" => "செயலிகள்", @@ -99,7 +97,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "தன்னிச்சையான புகுபதிகை நிராகரிப்பட்டது!", "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" => "ஞாபகப்படுத்துக", "Log in" => "புகுபதிகை" ); diff --git a/core/l10n/te.php b/core/l10n/te.php index 0cff8c5c926..1e34faec3dc 100644 --- a/core/l10n/te.php +++ b/core/l10n/te.php @@ -50,7 +50,6 @@ $TRANSLATIONS = array( "Users" => "వాడుకరులు", "Help" => "సహాయం", "Password" => "సంకేతపదం", -"Log out" => "నిష్క్రమించు", -"Lost your password?" => "మీ సంకేతపదం పోయిందా?" +"Log out" => "నిష్క్రమించు" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php index 744c43d7154..2f54c4d92f8 100644 --- a/core/l10n/th_TH.php +++ b/core/l10n/th_TH.php @@ -33,6 +33,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array(""), "last year" => "ปีที่แล้ว", "years ago" => "ปี ที่ผ่านมา", +"Reset password" => "เปลี่ยนรหัสผ่าน", "Yes" => "ตกลง", "No" => "ไม่ตกลง", "Choose" => "เลือก", @@ -79,10 +80,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}", "You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์", "Username" => "ชื่อผู้ใช้งาน", -"Your password was reset" => "รหัสผ่านของคุณถูกเปลี่ยนเรียบร้อยแล้ว", -"To login page" => "ไปที่หน้าเข้าสู่ระบบ", "New password" => "รหัสผ่านใหม่", -"Reset password" => "เปลี่ยนรหัสผ่าน", "Personal" => "ส่วนตัว", "Users" => "ผู้ใช้งาน", "Apps" => "แอปฯ", @@ -107,7 +105,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "การเข้าสู่ระบบอัตโนมัติถูกปฏิเสธแล้ว", "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" => "จำรหัสผ่าน", "Log in" => "เข้าสู่ระบบ" ); diff --git a/core/l10n/tr.php b/core/l10n/tr.php index b73f860e947..1c1cbf07857 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n ay önce","%n ay önce"), "last year" => "geçen yıl", "years ago" => "yıllar önce", +"Reset password" => "Parolayı sıfırla", "Yes" => "Evet", "No" => "Hayır", "Choose" => "Seç", @@ -121,19 +122,13 @@ $TRANSLATIONS = array( "The update was unsuccessful." => "Güncelleme başarısız oldu.", "The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.", "%s password reset" => "%s parola sıfırlama", -"A problem has occurred whilst sending the email, please contact your administrator." => "E-posta gönderilirken bir hata oluştu. Lütfen yöneticinizle iletişime geçin.", "Use the following link to reset your password: {link}" => "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {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 ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk/gereksiz dizinini kontrol ediniz.<br>Eğer yine bulamazsanız sistem yöneticinize danışın.", -"Request failed!<br>Did you make sure your email/username was right?" => "İstek başarısız!<br>E-posta ve/veya kullanıcı adınızın doğru olduğundan emin misiniz?", "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.", "Username" => "Kullanıcı Adı", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?", "Yes, I really want to reset my password now" => "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum", "Reset" => "Sıfırla", -"Your password was reset" => "Parolanız sıfırlandı", -"To login page" => "Giriş sayfasına git", "New password" => "Yeni parola", -"Reset password" => "Parolayı sıfırla", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!", "For the best results, please consider using a GNU/Linux server instead." => "En iyi sonuçlar için GNU/Linux sunucusu kullanın.", "Personal" => "Kişisel", @@ -182,7 +177,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Hesabınızı tekrar güvene almak için lütfen parolanızı değiştirin.", "Server side authentication failed!" => "Sunucu taraflı yetkilendirme başarısız!", "Please contact your administrator." => "Lütfen sistem yöneticiniz ile iletişime geçin.", -"Lost your password?" => "Parolanızı mı unuttunuz?", "remember" => "hatırla", "Log in" => "Giriş yap", "Alternative Logins" => "Alternatif Girişler", diff --git a/core/l10n/uk.php b/core/l10n/uk.php index cca3b3ff226..b65f613c51c 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -42,6 +42,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n місяць тому","%n місяці тому","%n місяців тому"), "last year" => "минулого року", "years ago" => "роки тому", +"Reset password" => "Скинути пароль", "Yes" => "Так", "No" => "Ні", "Choose" => "Обрати", @@ -109,17 +110,12 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "Оновлення виконалось успішно. Перенаправляємо вас на ownCloud.", "%s password reset" => "%s пароль скинуто", "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 ." => "Посилання для того, щоб скинути ваш пароль було надіслано на ваший Email.<br>Якщо ви не отримали його найближчим часом, перевірте ваший спам каталог.<br>Якщо і там немає, спитайте вашого місцевого Адміністратора.", -"Request failed!<br>Did you make sure your email/username was right?" => "Запит завершився невдало !<br>Ви переконані, що ваша адреса Email/ім'я користувача вірні ?", "You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.", "Username" => "Ім'я користувача", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?", "Yes, I really want to reset my password now" => "Так, я справді бажаю скинути мій пароль зараз", "Reset" => "Перевстановити", -"Your password was reset" => "Ваш пароль був скинутий", -"To login page" => "До сторінки входу", "New password" => "Новий пароль", -"Reset password" => "Скинути пароль", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!", "Personal" => "Особисте", "Users" => "Користувачі", @@ -163,7 +159,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Будь ласка, змініть свій пароль, щоб знову захистити Ваш обліковий запис.", "Server side authentication failed!" => "Помилка аутентифікації на боці Сервера !", "Please contact your administrator." => "Будь ласка, зверніться до вашого Адміністратора.", -"Lost your password?" => "Забули пароль?", "remember" => "запам'ятати", "Log in" => "Вхід", "Alternative Logins" => "Альтернативні Логіни", diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php index 25b80daf777..9b5774c5b29 100644 --- a/core/l10n/ur_PK.php +++ b/core/l10n/ur_PK.php @@ -39,6 +39,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("",""), "last year" => "پچھلے سال", "years ago" => "سالوں پہلے", +"Reset password" => "ری سیٹ پاسورڈ", "Yes" => "ہاں", "No" => "نہیں", "Choose" => "منتخب کریں", @@ -101,18 +102,12 @@ $TRANSLATIONS = array( "Edit tags" => "ترمیم ٹیگز", "Please reload the page." => "براہ مہربانی صفحہ دوبارہ لوڈ کریں.", "The update was successful. Redirecting you to ownCloud now." => "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے", -"A problem has occurred whilst sending the email, please contact your administrator." => "ای میل بھیجنے کے دوران ایک مسئلہ پیش آیا ہے , براہ مہربانی اپنےایڈمنسٹریٹر سے رابطہ کریں.", "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" => "یوزر نیم", "Yes, I really want to reset my password now" => "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں", "Reset" => "ری سیٹ", -"Your password was reset" => "آپ کا پاسورڈ ری سیٹ کر دیا گیا ہے", -"To login page" => "لاگ ان صفحے کی طرف", "New password" => "نیا پاسورڈ", -"Reset password" => "ری سیٹ پاسورڈ", "Personal" => "شخصی", "Users" => "صارفین", "Apps" => "ایپز", @@ -144,7 +139,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "آٹومیٹک لاگ ان مسترد", "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" => "یاد رکھیں", "Log in" => "لاگ ان", "Alternative Logins" => "متبادل لاگ ان ", diff --git a/core/l10n/vi.php b/core/l10n/vi.php index db6ea33b326..47e7f5e4a07 100644 --- a/core/l10n/vi.php +++ b/core/l10n/vi.php @@ -41,6 +41,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n tháng trước"), "last year" => "năm trước", "years ago" => "năm trước", +"Reset password" => "Khôi phục mật khẩu", "Yes" => "Có", "No" => "Không", "Choose" => "Chọn", @@ -104,17 +105,12 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.", "%s password reset" => "%s thiết lập lại mật khẩu", "Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {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 ." => "Liên kết tạo lại mật khẩu đã được gửi tới hộp thư của bạn.<br>Nếu bạn không thấy nó sau một khoảng thời gian, vui lòng kiểm tra trong thư mục Spam/Rác.<br>Nếu vẫn không thấy, vui lòng hỏi người quản trị hệ thống.", -"Request failed!<br>Did you make sure your email/username was right?" => "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhập của bạn chính xác?", "You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.", "Username" => "Tên đăng nhập", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?", "Yes, I really want to reset my password now" => "Vâng, tôi muốn thiết lập lại mật khẩu ngay.", "Reset" => "Khởi động lại", -"Your password was reset" => "Mật khẩu của bạn đã được khôi phục", -"To login page" => "Trang đăng nhập", "New password" => "Mật khẩu mới", -"Reset password" => "Khôi phục mật khẩu", "Personal" => "Cá nhân", "Users" => "Người dùng", "Apps" => "Ứng dụng", @@ -156,7 +152,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Vui lòng thay đổi mật khẩu của bạn để đảm bảo tài khoản của bạn một lần nữa.", "Server side authentication failed!" => "Xác thực phía máy chủ không thành công!", "Please contact your administrator." => "Vui lòng liên hệ với quản trị viên.", -"Lost your password?" => "Bạn quên mật khẩu ?", "remember" => "ghi nhớ", "Log in" => "Đăng nhập", "Alternative Logins" => "Đăng nhập khác", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index acc0b136f20..2b4107808c1 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n 月前"), "last year" => "去年", "years ago" => "年前", +"Reset password" => "重置密码", "Yes" => "是", "No" => "否", "Choose" => "选择(&C)...", @@ -115,19 +116,13 @@ $TRANSLATIONS = array( "Please reload the page." => "请重新加载页面。", "The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。", "%s password reset" => "重置 %s 的密码", -"A problem has occurred whilst sending the email, please contact your administrator." => "发送电子邮件时发生问题，请和管理员联系。", "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>如果您觉得在合理的时间内还未收到邮件，请查看 spam/junk 目录。<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" => "用户名", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？", "Yes, I really want to reset my password now" => "使得，我真的要现在重设密码", "Reset" => "重置", -"Your password was reset" => "您的密码已重置", -"To login page" => "到登录页面", "New password" => "新密码", -"Reset password" => "重置密码", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！", "For the best results, please consider using a GNU/Linux server instead." => "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。", "Personal" => "个人", @@ -174,7 +169,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "请修改您的密码，以保护您的账户安全。", "Server side authentication failed!" => "服务端验证失败！", "Please contact your administrator." => "请联系你的管理员。", -"Lost your password?" => "忘记密码？", "remember" => "记住", "Log in" => "登录", "Alternative Logins" => "其他登录方式", diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php index 8b210e68851..4920b88ee3c 100644 --- a/core/l10n/zh_HK.php +++ b/core/l10n/zh_HK.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "_%n day ago_::_%n days ago_" => array(""), "last month" => "前一月", "_%n month ago_::_%n months ago_" => array(""), +"Reset password" => "重設密碼", "Yes" => "Yes", "No" => "No", "Ok" => "OK", @@ -60,10 +61,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "請用以下連結重設你的密碼: {link}", "You will receive a link to reset your password via Email." => "你將收到一封電郵", "Username" => "用戶名稱", -"Your password was reset" => "你的密碼已被重設", -"To login page" => "前往登入版面", "New password" => "新密碼", -"Reset password" => "重設密碼", "Personal" => "個人", "Users" => "用戶", "Apps" => "軟件", @@ -80,7 +78,6 @@ $TRANSLATIONS = array( "Automatic logon rejected!" => "自動登入被拒", "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" => "記住", "Log in" => "登入" ); diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index 75a830d6be5..a74558d908c 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -41,6 +41,7 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("%n 個月前"), "last year" => "去年", "years ago" => "幾年前", +"Reset password" => "重設密碼", "Yes" => "是", "No" => "否", "Choose" => "選擇", @@ -108,17 +109,12 @@ $TRANSLATIONS = array( "The update was successful. Redirecting you to ownCloud now." => "升級成功，正將您重新導向至 ownCloud 。", "%s password reset" => "%s 密碼重設", "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 ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被歸為垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。", -"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" => "使用者名稱", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？", "Yes, I really want to reset my password now" => "對，我現在想要重設我的密碼。", "Reset" => "重設", -"Your password was reset" => "您的密碼已重設", -"To login page" => "至登入頁面", "New password" => "新密碼", -"Reset password" => "重設密碼", "Personal" => "個人", "Users" => "使用者", "Apps" => "應用程式", @@ -159,7 +155,6 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "請更改您的密碼以再次取得您帳戶的控制權。", "Server side authentication failed!" => "伺服器端認證失敗！", "Please contact your administrator." => "請聯絡系統管理員。", -"Lost your password?" => "忘記密碼？", "remember" => "記住", "Log in" => "登入", "Alternative Logins" => "其他登入方法", diff --git a/core/lostpassword/application.php b/core/lostpassword/application.php new file mode 100644 index 00000000000..ba2f3fc633b --- /dev/null +++ b/core/lostpassword/application.php @@ -0,0 +1,44 @@ +<?php +/** + * @author Victor Dubiniuk + * @copyright 2014 Victor Dubiniuk victor.dubiniuk@gmail.com + * + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Core\LostPassword; + +use \OCP\AppFramework\App; +use OC\Core\LostPassword\Controller\LostController; + +class Application extends App { + + + public function __construct(array $urlParams=array()){ + parent::__construct('core', $urlParams); + + $container = $this->getContainer(); + + /** + * Controllers + */ + $container->registerService('LostController', function($c) { + return new LostController( + $c->query('AppName'), + $c->query('Request'), + $c->query('ServerContainer')->getURLGenerator(), + $c->query('ServerContainer')->getUserManager(), + new \OC_Defaults(), + $c->query('ServerContainer')->getL10N('core'), + $c->query('ServerContainer')->getConfig(), + $c->query('ServerContainer')->getUserSession(), + \OCP\Util::getDefaultEmailAddress('lostpassword-noreply'), + \OC_App::isEnabled('files_encryption') + ); + }); + } + + +} diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php deleted file mode 100644 index c858696885b..00000000000 --- a/core/lostpassword/controller.php +++ /dev/null @@ -1,111 +0,0 @@ -<?php -/** - * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ -namespace OC\Core\LostPassword; - -class Controller { - - /** - * @param boolean $error - * @param boolean $requested - */ - protected static function displayLostPasswordPage($error, $requested) { - $isEncrypted = \OC_App::isEnabled('files_encryption'); - \OC_Template::printGuestPage('core/lostpassword', 'lostpassword', - array('error' => $error, - 'requested' => $requested, - 'isEncrypted' => $isEncrypted)); - } - - /** - * @param boolean $success - */ - protected static function displayResetPasswordPage($success, $args) { - $route_args = array(); - $route_args['token'] = $args['token']; - $route_args['user'] = $args['user']; - \OC_Template::printGuestPage('core/lostpassword', 'resetpassword', - array('success' => $success, 'args' => $route_args)); - } - - protected static function checkToken($user, $token) { - return \OC_Preferences::getValue($user, 'owncloud', 'lostpassword') === hash('sha256', $token); - } - - public static function index($args) { - self::displayLostPasswordPage(false, false); - } - - public static function sendEmail($args) { - - $isEncrypted = \OC_App::isEnabled('files_encryption'); - - if(!$isEncrypted || isset($_POST['continue'])) { - $continue = true; - } else { - $continue = false; - } - - if (\OC_User::userExists($_POST['user']) && $continue) { - $token = hash('sha256', \OC_Util::generateRandomBytes(30).\OC_Config::getValue('passwordsalt', '')); - \OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', - hash('sha256', $token)); // Hash the token again to prevent timing attacks - $email = \OC_Preferences::getValue($_POST['user'], 'settings', 'email', ''); - if (!empty($email)) { - $link = \OC_Helper::linkToRoute('core_lostpassword_reset', - array('user' => $_POST['user'], 'token' => $token)); - $link = \OC_Helper::makeURLAbsolute($link); - - $tmpl = new \OC_Template('core/lostpassword', 'email'); - $tmpl->assign('link', $link, false); - $msg = $tmpl->fetchPage(); - $l = \OC_L10N::get('core'); - $from = \OCP\Util::getDefaultEmailAddress('lostpassword-noreply'); - try { - $defaults = new \OC_Defaults(); - \OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName()); - } catch (Exception $e) { - \OC_Template::printErrorPage( $l->t('A problem has occurred whilst sending the email, please contact your administrator.') ); - } - self::displayLostPasswordPage(false, true); - } else { - self::displayLostPasswordPage(true, false); - } - } else { - self::displayLostPasswordPage(true, false); - } - } - - public static function reset($args) { - // Someone wants to reset their password: - if(self::checkToken($args['user'], $args['token'])) { - self::displayResetPasswordPage(false, $args); - } else { - // Someone lost their password - self::displayLostPasswordPage(false, false); - } - } - - public static function resetPassword($args) { - if (self::checkToken($args['user'], $args['token'])) { - if (isset($_POST['password'])) { - if (\OC_User::setPassword($args['user'], $_POST['password'])) { - \OC_Preferences::deleteKey($args['user'], 'owncloud', 'lostpassword'); - \OC_User::unsetMagicInCookie(); - self::displayResetPasswordPage(true, $args); - } else { - self::displayResetPasswordPage(false, $args); - } - } else { - self::reset($args); - } - } else { - // Someone lost their password - self::displayLostPasswordPage(false, false); - } - } -} diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php new file mode 100644 index 00000000000..b1be65b4f01 --- /dev/null +++ b/core/lostpassword/controller/lostcontroller.php @@ -0,0 +1,199 @@ +<?php +/** + * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Core\LostPassword\Controller; + +use \OCP\AppFramework\Controller; +use \OCP\AppFramework\Http\JSONResponse; +use \OCP\AppFramework\Http\TemplateResponse; +use \OCP\IURLGenerator; +use \OCP\IRequest; +use \OCP\IL10N; +use \OCP\IConfig; +use \OCP\IUserSession; +use \OC\Core\LostPassword\EncryptedDataException; + +class LostController extends Controller { + + protected $urlGenerator; + protected $userManager; + protected $defaults; + protected $l10n; + protected $from; + protected $isDataEncrypted; + protected $config; + protected $userSession; + + public function __construct($appName, + IRequest $request, + IURLGenerator $urlGenerator, + $userManager, + $defaults, + IL10N $l10n, + IConfig $config, + IUserSession $userSession, + $from, + $isDataEncrypted) { + parent::__construct($appName, $request); + $this->urlGenerator = $urlGenerator; + $this->userManager = $userManager; + $this->defaults = $defaults; + $this->l10n = $l10n; + $this->from = $from; + $this->isDataEncrypted = $isDataEncrypted; + $this->config = $config; + $this->userSession = $userSession; + } + + /** + * Someone wants to reset their password: + * + * @PublicPage + * @NoCSRFRequired + * + * @param string $token + * @param string $userId + */ + public function resetform($token, $userId) { + return new TemplateResponse( + 'core/lostpassword', + 'resetpassword', + array( + 'isEncrypted' => $this->isDataEncrypted, + 'link' => $this->getLink('core.lost.setPassword', $userId, $token), + ), + 'guest' + ); + } + + private function error($message, array $additional=array()) { + return array_merge(array('status' => 'error', 'msg' => $message), $additional); + } + + private function success() { + return array('status'=>'success'); + } + + /** + * @PublicPage + * + * @param string $user + * @param bool $proceed + */ + public function email($user, $proceed){ + // FIXME: use HTTP error codes + try { + $this->sendEmail($user, $proceed); + } catch (EncryptedDataException $e){ + return $this->error('', array('encryption' => '1')); + } catch (\Exception $e){ + return $this->error($e->getMessage()); + } + + return $this->success(); + } + + + /** + * @PublicPage + */ + public function setPassword($token, $userId, $password) { + try { + $user = $this->userManager->get($userId); + + if (!$this->checkToken($userId, $token)) { + throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid')); + } + + if (!$user->setPassword($userId, $password)) { + throw new \Exception(); + } + + // FIXME: should be added to the all config at some point + \OC_Preferences::deleteKey($userId, 'owncloud', 'lostpassword'); + $this->userSession->unsetMagicInCookie(); + + } catch (\Exception $e){ + return $this->error($e->getMessage()); + } + + return $this->success(); + } + + + protected function sendEmail($user, $proceed) { + if ($this->isDataEncrypted && !$proceed){ + throw new EncryptedDataException(); + } + + if (!$this->userManager->userExists($user)) { + throw new \Exception( + $this->l10n->t('Couldn\'t send reset email. Please make sure '. + 'your username is correct.')); + } + + $token = hash('sha256', \OC_Util::generateRandomBytes(30)); + + // Hash the token again to prevent timing attacks + $this->config->setUserValue( + $user, 'owncloud', 'lostpassword', hash('sha256', $token) + ); + + $email = $this->config->getUserValue($user, 'settings', 'email'); + + if (empty($email)) { + throw new \Exception( + $this->l10n->t('Couldn\'t send reset email because there is no '. + 'email address for this username. Please ' . + 'contact your administrator.') + ); + } + + $link = $this->getLink('core.lost.resetform', $user, $token); + + $tmpl = new \OC_Template('core/lostpassword', 'email'); + $tmpl->assign('link', $link, false); + $msg = $tmpl->fetchPage(); + + try { + // FIXME: should be added to the container and injected in here + \OC_Mail::send( + $email, + $user, + $this->l10n->t('%s password reset', array($this->defaults->getName())), + $msg, + $this->from, + $this->defaults->getName() + ); + } catch (\Exception $e) { + throw new \Exception($this->l10n->t( + 'Couldn\'t send reset email. Please contact your administrator.' + )); + } + } + + + protected function getLink($route, $user, $token){ + $parameters = array( + 'token' => $token, + 'userId' => $user + ); + $link = $this->urlGenerator->linkToRoute($route, $parameters); + + return $this->urlGenerator->getAbsoluteUrl($link); + } + + + protected function checkToken($user, $token) { + return $this->config->getUserValue( + $user, 'owncloud', 'lostpassword' + ) === hash('sha256', $token); + } + + +} diff --git a/core/lostpassword/css/resetpassword.css b/core/lostpassword/css/resetpassword.css new file mode 100644 index 00000000000..012af672d97 --- /dev/null +++ b/core/lostpassword/css/resetpassword.css @@ -0,0 +1,7 @@ +#reset-password p { + position: relative; +} + +#password-icon { + top: 20px; +} diff --git a/core/lostpassword/encrypteddataexception.php b/core/lostpassword/encrypteddataexception.php new file mode 100644 index 00000000000..99d19445b6c --- /dev/null +++ b/core/lostpassword/encrypteddataexception.php @@ -0,0 +1,14 @@ +<?php +/** + * @author Victor Dubiniuk + * @copyright 2013 Victor Dubiniuk victor.dubiniuk@gmail.com + * + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Core\LostPassword; + +class EncryptedDataException extends \Exception{ +} diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php index fdfa32344ec..00dd139e71f 100644 --- a/core/lostpassword/templates/lostpassword.php +++ b/core/lostpassword/templates/lostpassword.php @@ -1,35 +1,20 @@ <?php //load the file we need -OCP\Util::addStyle('lostpassword', 'lostpassword'); - if ($_['requested']): ?> - <div class="update"><p> - <?php - print_unescaped($l->t('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 .')); - ?> - </p></div> -<?php else: ?> - <form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_send_email')) ?>" method="post"> - <fieldset> - <?php if ($_['error']): ?> - <div class="error"><p> - <?php print_unescaped($l->t('Request failed!<br>Did you make sure your email/username was right?')); ?> - </p></div> - <?php endif; ?> - <div class="update"><?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?></div> - <p> - <input type="text" name="user" id="user" - placeholder="<?php print_unescaped($l->t( 'Username' )); ?>" - value="" autocomplete="off" required autofocus /> - <label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label> - <img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/> - <?php if ($_['isEncrypted']): ?> +OCP\Util::addStyle('lostpassword', 'lostpassword'); ?> +<form action="<?php print_unescaped($_['link']) ?>" method="post"> + <fieldset> + <div class="update"><?php p($l->t('You will receive a link to reset your password via Email.')); ?></div> + <p> + <input type="text" name="user" id="user" placeholder="<?php p($l->t( 'Username' )); ?>" value="" autocomplete="off" required autofocus /> + <label for="user" class="infield"><?php p($l->t( 'Username' )); ?></label> + <img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/> + <?php if ($_['isEncrypted']): ?> <br /> - <p class="warning"><?php print_unescaped($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br /> + <p class="warning"><?php p($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br /> <input type="checkbox" name="continue" value="Yes" /> - <?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?></p> - <?php endif; ?> - </p> - <input type="submit" id="submit" value="<?php print_unescaped($l->t('Reset')); ?>" /> - </fieldset> - </form> -<?php endif; ?> + <?php p($l->t('Yes, I really want to reset my password now')); ?></p> + <?php endif; ?> + </p> + <input type="submit" id="submit" value="<?php p($l->t('Reset')); ?>" /> + </fieldset> +</form> diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php index 11dce9f112b..118fe787116 100644 --- a/core/lostpassword/templates/resetpassword.php +++ b/core/lostpassword/templates/resetpassword.php @@ -1,16 +1,12 @@ -<form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_reset', $_['args'])) ?>" method="post"> +<?php OCP\Util::addStyle('lostpassword', 'resetpassword'); ?> +<form action="<?php print_unescaped($_['link']) ?>" id="reset-password" method="post"> <fieldset> - <?php if($_['success']): ?> - <h1><?php p($l->t('Your password was reset')); ?></h1> - <p><a href="<?php print_unescaped(OC_Helper::linkTo('', 'index.php')) ?>/"><?php p($l->t('To login page')); ?></a></p> - <?php else: ?> - <p> - <label for="password" class="infield"><?php p($l->t('New password')); ?></label> - <input type="password" name="password" id="password" - placeholder="<?php p($l->t('New password')); ?>" - value="" required /> - </p> - <input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" /> - <?php endif; ?> + <p> + <label for="password" class="infield"><?php p($l->t('New password')); ?></label> + <input type="password" name="password" id="password" value="" placeholder="<?php p($l->t('New Password')); ?>" required /> + <img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/> + </p> + <input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" /> </fieldset> </form> +<?php OCP\Util::addScript('core', 'lostpassword'); ?> diff --git a/core/routes.php b/core/routes.php index 5368fd45645..d08bd105a14 100644 --- a/core/routes.php +++ b/core/routes.php @@ -6,6 +6,16 @@ * See the COPYING-README file. */ +use OC\Core\LostPassword\Application; + +$application = new Application(); +$application->registerRoutes($this, array('routes' => array( + array('name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'), + array('name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'), + array('name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'), + ) +)); + // Post installation check /** @var $this OCP\Route\IRouter */ @@ -70,18 +80,6 @@ $this->create('core_ajax_preview', '/core/preview') ->actionInclude('core/ajax/preview.php'); $this->create('core_ajax_preview', '/core/preview.png') ->actionInclude('core/ajax/preview.php'); -$this->create('core_lostpassword_index', '/lostpassword/') - ->get() - ->action('OC\Core\LostPassword\Controller', 'index'); -$this->create('core_lostpassword_send_email', '/lostpassword/') - ->post() - ->action('OC\Core\LostPassword\Controller', 'sendEmail'); -$this->create('core_lostpassword_reset', '/lostpassword/reset/{token}/{user}') - ->get() - ->action('OC\Core\LostPassword\Controller', 'reset'); -$this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{user}') - ->post() - ->action('OC\Core\LostPassword\Controller', 'resetPassword'); // Avatar routes $this->create('core_avatar_get_tmp', '/avatar/tmp') diff --git a/core/templates/login.php b/core/templates/login.php index 6af3d769690..951ba3b4f6b 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -46,8 +46,8 @@ </p> <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?> - <a class="warning" href="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_index')) ?>"> - <?php p($l->t('Lost your password?')); ?> + <a id="lost-password" class="warning" href=""> + <?php p($l->t('Forgot your password? Reset it!')); ?> </a> <?php endif; ?> <?php if ($_['rememberLoginAllowed'] === true) : ?> @@ -74,4 +74,4 @@ <?php OCP\Util::addscript('core', 'visitortimezone'); - +OCP\Util::addScript('core', 'lostpassword'); diff --git a/l10n/ach/core.po b/l10n/ach/core.po index 0240a00ea96..6f2ac78a538 100644 --- a/l10n/ach/core.po +++ b/l10n/ach/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/ach/files_encryption.po b/l10n/ach/files_encryption.po index f2c83b06608..f022323a77f 100644 --- a/l10n/ach/files_encryption.po +++ b/l10n/ach/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ach/files_sharing.po b/l10n/ach/files_sharing.po index 3221c329bdb..72efeb85a08 100644 --- a/l10n/ach/files_sharing.po +++ b/l10n/ach/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ach\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ady/core.po b/l10n/ady/core.po index 346a9915e74..6536f34bb08 100644 --- a/l10n/ady/core.po +++ b/l10n/ady/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/ady/files_encryption.po b/l10n/ady/files_encryption.po index f18f6e97223..82b3c551a63 100644 --- a/l10n/ady/files_encryption.po +++ b/l10n/ady/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ady/files_sharing.po b/l10n/ady/files_sharing.po index 0ab68cc94ee..b4835e3b221 100644 --- a/l10n/ady/files_sharing.po +++ b/l10n/ady/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ady\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po index 587633036ec..f4b5907cb00 100644 --- a/l10n/af_ZA/core.po +++ b/l10n/af_ZA/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -169,54 +169,85 @@ msgstr "" msgid "Saving..." msgstr "Stoor..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sekondes gelede" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minute gelede" msgstr[1] "%n minute gelede" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n ure gelde" msgstr[1] "%n ure gelede" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "vandag" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "gister" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dae gelede" msgstr[1] "%n dae gelede" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "verlede maand" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n maande gelede" msgstr[1] "%n maande gelede" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "verlede jaar" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "jare gelede" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Herstel wagwoord" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ja" @@ -515,43 +546,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s wagwoord herstel" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s wagwoord herstel" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Gebruik die volgende skakel om jou wagwoord te herstel: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "" - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Versoek het gefaal!<br>Het jy seker gemaak jou e-pos/gebruiker naam is korrek?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Gebruikersnaam" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ja, Ek wil regtig my wagwoord herstel" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Jou wagwoord is herstel" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Na aanteken-bladsy" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nuwe wagwoord" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Herstel wagwoord" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Wagwoord verloor?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po index f3d2edf496d..bf803446d45 100644 --- a/l10n/af_ZA/files_encryption.po +++ b/l10n/af_ZA/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po index 4a49f3f5dd8..74195365386 100644 --- a/l10n/af_ZA/files_sharing.po +++ b/l10n/af_ZA/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: af_ZA\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ak/core.po b/l10n/ak/core.po index 6c8bb4b7138..f1b27ada7b4 100644 --- a/l10n/ak/core.po +++ b/l10n/ak/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/ak/files_encryption.po b/l10n/ak/files_encryption.po index 53c6e0dd0bf..58234f786ee 100644 --- a/l10n/ak/files_encryption.po +++ b/l10n/ak/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ak/files_sharing.po b/l10n/ak/files_sharing.po index 7fc3fb3f9b5..9082112ed78 100644 --- a/l10n/ak/files_sharing.po +++ b/l10n/ak/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ak\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/am_ET/core.po b/l10n/am_ET/core.po index d8bff3b2486..c810177ff60 100644 --- a/l10n/am_ET/core.po +++ b/l10n/am_ET/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/am_ET/files_encryption.po b/l10n/am_ET/files_encryption.po index 572adbe0ea1..062289848b0 100644 --- a/l10n/am_ET/files_encryption.po +++ b/l10n/am_ET/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/am_ET/files_sharing.po b/l10n/am_ET/files_sharing.po index cfaea4d726c..6351b6cd408 100644 --- a/l10n/am_ET/files_sharing.po +++ b/l10n/am_ET/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: am_ET\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ar/core.po b/l10n/ar/core.po index 77aacfb28e8..e9e860ffacc 100644 --- a/l10n/ar/core.po +++ b/l10n/ar/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -170,11 +170,11 @@ msgstr "" msgid "Saving..." msgstr "جاري الحفظ..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "منذ ثواني" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -184,7 +184,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -194,15 +194,15 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "اليوم" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "يوم أمس" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -212,11 +212,11 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "الشهر الماضي" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -226,14 +226,45 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "السنةالماضية" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "سنة مضت" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "تعديل كلمة السر" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "نعم" @@ -536,43 +567,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "تمت إعادة ضبط كلمة مرور %s" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "تمت إعادة ضبط كلمة مرور %s" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "وصلة تحديث كلمة المرور بعثت الى بريدك الالكتروني.<br> اذا لم تستقبل البريد خلال فترة زمنية قصيره, ابحث في سلة مهملات بريدك." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "الطلب رفض! <br> هل انت متأكد أن الاسم/العنوان البريدي صحيح؟" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "إسم المستخدم" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -580,30 +608,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "نعم، أريد إعادة ضبظ كلمة مروري" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "لقد تم تعديل كلمة السر" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "الى صفحة الدخول" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "كلمات سر جديدة" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "تعديل كلمة السر" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -830,8 +849,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "هل نسيت كلمة السر؟" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po index 8eaa26bdf16..0760ee26740 100644 --- a/l10n/ar/files_encryption.po +++ b/l10n/ar/files_encryption.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# m.shehab <shehab.mahmood@gmail.com>, 2014 +# Mahmood Shehab <shehab.mahmood@gmail.com>, 2014 # Mehdi Bounya <bounya9mehdi@gmail.com>, 2014 -# suliman <291101251@std.qu.edu.sa>, 2014 +# suliman al-ajlan <291101251@std.qu.edu.sa>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-01 01:54-0400\n" -"PO-Revision-Date: 2014-05-31 13:36+0000\n" -"Last-Translator: Mehdi Bounya <bounya9mehdi@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,18 +83,18 @@ msgid "" "administrator" msgstr "خطأ غير معروف, الرجاء التحقق من إعدادات نظامك أو راسل المدير" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "متطلبات ناقصة." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "يرجى التاكد من ان اصدار PHP 5.3.3 او احدث , مثبت و التاكد من ان OpenSSL مفعل و مهيئ بشكل صحيح. حتى الان برنامج التتشفير تم تعطيلة." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "المستخدمين التاليين لم يتم تعيين لهم التشفيير:" @@ -107,12 +107,9 @@ msgid "Initial encryption running... Please try again later." msgstr "جاري تفعيل التشفير المبدئي ، الرجاء المحاولة لاحقا" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "انتقل مباشرة الى " - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "اعدادات شخصية" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po index 9d602917318..f2b68f0f449 100644 --- a/l10n/ar/files_sharing.po +++ b/l10n/ar/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ 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" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "حفظ" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "مشاركة من طرف {owner}" @@ -118,19 +106,3 @@ msgstr "تحميل %s" #: templates/public.php:54 msgid "Direct link" msgstr "رابط مباشر" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "حفظ" diff --git a/l10n/ast/core.po b/l10n/ast/core.po index 47ffc60fea7..e71aad8eb32 100644 --- a/l10n/ast/core.po +++ b/l10n/ast/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-09 01:54-0400\n" -"PO-Revision-Date: 2014-06-08 16:10+0000\n" -"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -171,54 +171,85 @@ msgstr "Audiu" msgid "Saving..." msgstr "Guardando..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "fai segundos" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "fai %n minutu" msgstr[1] "fai %n minutos" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "fai %n hora" msgstr[1] "fai %n hores" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "güei" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ayeri" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "fai %n día" msgstr[1] "fai %n díes" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "mes caberu" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "fai %n mes" msgstr[1] "fai %n meses" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "añu caberu" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "fai años" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Restablecer contraseña" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Sí" @@ -517,43 +548,40 @@ msgstr "L'anovamientu nun foi esitosu." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s restablecer contraseña" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Hebo un fallu al unviar el corréu-e. Contauta col alministrador." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Unviósete al to corréu l'enllaz pa reaniciar la to contraseña.<br>Si nun lu recibes dientro de dellos minutos, comprueba les tos carpetes de corréu puxarra.<br>Sinón, pues entrugar al to alministrador llocal." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "¡Petición fallida!<br>¿Asegurástite qué'l to nome d'usuariu/corréu tean bien?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nome d'usuariu" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -561,30 +589,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Sí, quiero reaniciar daveres la mio contraseña agora" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Reaniciar" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Restablecióse la contraseña" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Aniciar sesión na páxina" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Contraseña nueva" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Restablecer contraseña" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -811,8 +830,8 @@ msgid "Please contact your administrator." msgstr "Por favor, contauta col to alministrador" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "¿Escaeciesti la to contraseña?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ast/files_encryption.po b/l10n/ast/files_encryption.po index f8000996c98..1dd362bd1f6 100644 --- a/l10n/ast/files_encryption.po +++ b/l10n/ast/files_encryption.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-09 01:54-0400\n" -"PO-Revision-Date: 2014-06-08 14:50+0000\n" -"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -107,12 +107,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Cifráu inicial en cursu... Inténtalo dempués." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Dir direutamente a" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "opciones personales" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/ast/files_sharing.po b/l10n/ast/files_sharing.po index c686180e616..f7847deed85 100644 --- a/l10n/ast/files_sharing.po +++ b/l10n/ast/files_sharing.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-09 01:54-0400\n" -"PO-Revision-Date: 2014-06-08 15:20+0000\n" -"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,15 +20,15 @@ msgstr "" "Language: ast\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Compartío contigo" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Compartío con otros" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Compartíu por enllaz" @@ -44,18 +44,6 @@ msgstr "Entá nun compartiesti dengún ficheru." msgid "You haven't shared any files by link yet." msgstr "Entá nun compartiesti nengún ficheru por enllaz." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Nun pudo cargase la plantía" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Guardáu" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Reaniciar" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Compartíu por {owner}" @@ -120,19 +108,3 @@ msgstr "Descargar %s" #: templates/public.php:54 msgid "Direct link" msgstr "Enllaz direutu" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Plantíes de corréu" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Tema" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Plantía" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Guardar" diff --git a/l10n/az/core.po b/l10n/az/core.po index a6a9a0e5be5..5b0ebd3ace2 100644 --- a/l10n/az/core.po +++ b/l10n/az/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/az/files_encryption.po b/l10n/az/files_encryption.po index bdf88bf5061..b1011b8317f 100644 --- a/l10n/az/files_encryption.po +++ b/l10n/az/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/az/files_sharing.po b/l10n/az/files_sharing.po index 223c9e68a07..1bdea6c0248 100644 --- a/l10n/az/files_sharing.po +++ b/l10n/az/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: az\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/be/core.po b/l10n/be/core.po index 39140dff569..0bafa73f9d1 100644 --- a/l10n/be/core.po +++ b/l10n/be/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -168,11 +168,11 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "Секунд таму" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -180,7 +180,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -188,15 +188,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "Сёння" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "Ўчора" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -204,11 +204,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "У мінулым месяцы" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -216,14 +216,45 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "У мінулым годзе" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "Гадоў таму" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Так" @@ -524,43 +555,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -568,29 +596,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -818,7 +837,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po index 21b6aef2601..89ed2d1e49d 100644 --- a/l10n/be/files_encryption.po +++ b/l10n/be/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po index 7acfb935879..4ef974ed66d 100644 --- a/l10n/be/files_sharing.po +++ b/l10n/be/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: be\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po index 570890924de..8d2066d3d9c 100644 --- a/l10n/bg_BG/core.po +++ b/l10n/bg_BG/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "Записване..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "преди секунди" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "днес" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "вчера" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "последният месец" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "последната година" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "последните години" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Нулиране на парола" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Да" @@ -514,43 +545,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Ще получите връзка за нулиране на паролата Ви." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Потребител" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,30 +586,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Вашата парола е нулирана" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Нова парола" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Нулиране на парола" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -808,8 +827,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Забравена парола?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po index 3a6d6368073..517950b0da6 100644 --- a/l10n/bg_BG/files_encryption.po +++ b/l10n/bg_BG/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po index acb6779d235..1650e05e9d3 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: bg_BG\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Запис" diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po index 6038e786f0e..2a65ea35daf 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "সংরক্ষণ করা হচ্ছে.." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "সেকেন্ড পূর্বে" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "আজ" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "গতকাল" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "গত মাস" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "গত বছর" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "বছর পূর্বে" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "কূটশব্দ পূনঃনির্ধারণ কর" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "হ্যাঁ" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "আপনার কূটশব্দটি পূনঃনির্ধারণ করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "আপনার কূটশব্দটি পূনঃনির্ধারণ করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "ব্যবহারকারী" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,30 +585,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "আপনার কূটশব্দটি পূনঃনির্ধারণ করা হয়েছে" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "প্রবেশ পৃষ্ঠায়" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "নতুন কূটশব্দ" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "কূটশব্দ পূনঃনির্ধারণ কর" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -807,8 +826,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "কূটশব্দ হারিয়েছেন?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po index abf012c2d7b..954871d6938 100644 --- a/l10n/bn_BD/files_encryption.po +++ b/l10n/bn_BD/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po index 06f0ed061d6..b98355742e1 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: bn_BD\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "সংরক্ষণ" diff --git a/l10n/bn_IN/core.po b/l10n/bn_IN/core.po index 545fdc25a0f..4c14a0290ff 100644 --- a/l10n/bn_IN/core.po +++ b/l10n/bn_IN/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/bn_IN/files_encryption.po b/l10n/bn_IN/files_encryption.po index 792d411a0f0..5d25cadd581 100644 --- a/l10n/bn_IN/files_encryption.po +++ b/l10n/bn_IN/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/bn_IN/files_sharing.po b/l10n/bn_IN/files_sharing.po index 8574b03b0e1..4036095213b 100644 --- a/l10n/bn_IN/files_sharing.po +++ b/l10n/bn_IN/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: bn_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/bs/core.po b/l10n/bs/core.po index 28fb41330d0..cd1ee00ed0a 100644 --- a/l10n/bs/core.po +++ b/l10n/bs/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -167,58 +167,89 @@ msgstr "" msgid "Saving..." msgstr "Spašavam..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -518,43 +549,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -562,29 +590,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -812,7 +831,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/bs/files_encryption.po b/l10n/bs/files_encryption.po index 2264b620421..d5179ed73cc 100644 --- a/l10n/bs/files_encryption.po +++ b/l10n/bs/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/bs/files_sharing.po b/l10n/bs/files_sharing.po index f10eccb0ef5..fbfac98f9bd 100644 --- a/l10n/bs/files_sharing.po +++ b/l10n/bs/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: bs\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" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Spasi" diff --git a/l10n/ca/core.po b/l10n/ca/core.po index 6e23c4dd723..80291f8ba5c 100644 --- a/l10n/ca/core.po +++ b/l10n/ca/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -170,54 +170,85 @@ msgstr "" msgid "Saving..." msgstr "Desant..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "segons enrere" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "fa %n minut" msgstr[1] "fa %n minuts" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "fa %n hora" msgstr[1] "fa %n hores" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "avui" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ahir" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "fa %n dies" msgstr[1] "fa %n dies" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "el mes passat" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "fa %n mes" msgstr[1] "fa %n mesos" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "l'any passat" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "anys enrere" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Reinicialitza la contrasenya" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Sí" @@ -516,43 +547,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "L'actualització ha estat correcte. Ara us redirigim a ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "restableix la contrasenya %s" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Hi ha hagut un problema enviant el correu, parleu amb el vostre administrador." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Useu l'enllaç següent per restablir la contrasenya: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu.<br>Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "La petició ha fallat!<br>Esteu segur que el correu/nom d'usuari és correcte?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nom d'usuari" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -560,30 +588,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Sí, vull restablir ara la contrasenya" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Estableix de nou" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "La vostra contrasenya s'ha reinicialitzat" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "A la pàgina d'inici de sessió" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Contrasenya nova" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Reinicialitza la contrasenya" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -810,8 +829,8 @@ msgid "Please contact your administrator." msgstr "Contacteu amb l'administrador." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Heu perdut la contrasenya?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po index e42b9cbcc6e..b0f6b5b57db 100644 --- a/l10n/ca/files_encryption.po +++ b/l10n/ca/files_encryption.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -83,18 +83,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Manca de requisits." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Els usuaris següents no estan configurats per a l'encriptació:" @@ -107,12 +107,9 @@ msgid "Initial encryption running... Please try again later." msgstr "encriptació inicial en procés... Proveu-ho més tard." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Vés directament a" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "arranjament personal" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po index 97b8fc9f776..0dfb3d4f7ac 100644 --- a/l10n/ca/files_sharing.po +++ b/l10n/ca/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Desat" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Estableix de nou" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Compartits per {owner}" @@ -118,19 +106,3 @@ msgstr "Baixa %s" #: templates/public.php:54 msgid "Direct link" msgstr "Enllaç directe" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Desa" diff --git a/l10n/ca@valencia/core.po b/l10n/ca@valencia/core.po index e5c77179ed5..2841be6d23f 100644 --- a/l10n/ca@valencia/core.po +++ b/l10n/ca@valencia/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/ca@valencia/files_encryption.po b/l10n/ca@valencia/files_encryption.po index 78bc1c95a4c..de7ebb20692 100644 --- a/l10n/ca@valencia/files_encryption.po +++ b/l10n/ca@valencia/files_encryption.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-31 01:54-0400\n" -"PO-Revision-Date: 2013-04-26 08:01+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ca@valencia/files_sharing.po b/l10n/ca@valencia/files_sharing.po index ecbc60f3156..306d9b8c009 100644 --- a/l10n/ca@valencia/files_sharing.po +++ b/l10n/ca@valencia/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ca@valencia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index b604fbd7d15..af2524dc37a 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 20:40+0000\n" -"Last-Translator: Jaroslav Lichtblau <jaroslav@lichtblau.cz>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -177,58 +177,89 @@ msgstr "Audio" msgid "Saving..." msgstr "Ukládám..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "před pár vteřinami" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "před %n minutou" msgstr[1] "před %n minutami" msgstr[2] "před %n minutami" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "před %n hodinou" msgstr[1] "před %n hodinami" msgstr[2] "před %n hodinami" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "dnes" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "včera" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "před %n dnem" msgstr[1] "před %n dny" msgstr[2] "před %n dny" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "minulý měsíc" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "před %n měsícem" msgstr[1] "před %n měsíci" msgstr[2] "před %n měsíci" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "minulý rok" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "před lety" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Obnovit heslo" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ano" @@ -528,43 +559,40 @@ msgstr "Aktualizace selhala." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "reset hesla %s" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Při odesílání e-mailu nastala chyba, kontaktujte prosím svého administrátora." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Heslo obnovíte použitím následujícího odkazu: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu.<br>Pokud jej v krátké době neobdržíte, zkontrolujte váš koš a složku spam.<br>Pokud jej nenaleznete, kontaktujte svého správce." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Požadavek selhal!<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "E-mailem Vám bude zaslán odkaz pro obnovu hesla." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Uživatelské jméno" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -572,30 +600,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ano, opravdu si nyní přeji obnovit mé heslo" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Restartovat složku" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Vaše heslo bylo obnoveno" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Na stránku přihlášení" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nové heslo" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Obnovit heslo" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -822,8 +841,8 @@ msgid "Please contact your administrator." msgstr "Kontaktujte prosím vašeho správce." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Ztratili jste své heslo?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po index f6388eb9967..37d0a23226e 100644 --- a/l10n/cs_CZ/files_encryption.po +++ b/l10n/cs_CZ/files_encryption.po @@ -6,6 +6,7 @@ # Honza Brázdil <janinko.g@gmail.com>, 2013 # Jan Kalina <honza889@gmail.com>, 2013 # Jan Liska, 2013 +# Jaroslav Lichtblau <jaroslav@lichtblau.cz>, 2014 # Josef Moravec <josef.moravec@gmail.com>, 2014 # Martin Skopal <fireball@atlas.cz>, 2013 # Petr Šťastný <petr@stastny.eu>, 2013-2014 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 07:07+0000\n" -"Last-Translator: Josef Moravec <josef.moravec@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 09:10+0000\n" +"Last-Translator: Jaroslav Lichtblau <jaroslav@lichtblau.cz>\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" @@ -111,12 +112,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Probíhá počáteční šifrování... Zkuste to prosím znovu později." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Běžte přímo do vašeho" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "osobní nastavení" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "Přejít přímo do svého %sosobního nastaveni%s." #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po index 3cbce5745be..04b8f90a2a1 100644 --- a/l10n/cs_CZ/files_external.po +++ b/l10n/cs_CZ/files_external.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-10 01:54-0400\n" -"PO-Revision-Date: 2014-06-09 15:30+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 09:22+0000\n" "Last-Translator: Jaroslav Lichtblau <jaroslav@lichtblau.cz>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -259,7 +259,7 @@ msgstr "Typ úložiště" #: templates/list.php:23 msgid "Scope" -msgstr "" +msgstr "Záběr" #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po index 04126b897c0..ccbd2d10d71 100644 --- a/l10n/cs_CZ/files_sharing.po +++ b/l10n/cs_CZ/files_sharing.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-10 01:54-0400\n" -"PO-Revision-Date: 2014-06-09 15:30+0000\n" -"Last-Translator: Jaroslav Lichtblau <jaroslav@lichtblau.cz>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -22,15 +22,15 @@ msgstr "" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Sdíleno s vámi" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Sdíleno s ostatními" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Sdíleno pomocí odkazu" @@ -46,18 +46,6 @@ msgstr "Zatím jste nesdíleli žádné soubory." msgid "You haven't shared any files by link yet." msgstr "Zatím jste nesdíleli pomocí odkazu žádný soubor." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Šablonu nelze nahrát" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Uloženo" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Restartovat složku" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Sdílí {owner}" @@ -122,19 +110,3 @@ msgstr "Stáhnout %s" #: templates/public.php:54 msgid "Direct link" msgstr "Přímý odkaz" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "E-mailové šablony" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Vzhled" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Šablona" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Uložit" diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po index 07dfee0d34e..f9e7492867a 100644 --- a/l10n/cs_CZ/lib.po +++ b/l10n/cs_CZ/lib.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-10 01:54-0400\n" -"PO-Revision-Date: 2014-06-09 15:30+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 09:40+0000\n" "Last-Translator: Jaroslav Lichtblau <jaroslav@lichtblau.cz>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -331,7 +331,7 @@ msgstr "Sdílení typu %s není korektní pro %s" msgid "" "Setting permissions for %s failed, because the permissions exceed " "permissions granted to %s" -msgstr "" +msgstr "Nastavení oprávnění pro %s selhalo, protože jsou k tomu nutná vyšší oprávnění, než jaká byla povolena pro %s" #: private/share/share.php:881 #, php-format @@ -346,41 +346,41 @@ msgstr "" #: private/share/share.php:1009 #, php-format msgid "Sharing backend %s not found" -msgstr "" +msgstr "Podpůrná vrstva sdílení %s nenalezena" #: private/share/share.php:1015 #, php-format msgid "Sharing backend for %s not found" -msgstr "" +msgstr "Podpůrná vrstva sdílení pro %s nenalezena" -#: private/share/share.php:1431 +#: private/share/share.php:1432 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" -msgstr "" +msgstr "Sdílení položky %s selhalo, protože byla sdílena uživatelem %s jako první." -#: private/share/share.php:1440 +#: private/share/share.php:1441 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" -msgstr "" +msgstr "Sdílení položky %s selhalo, protože jsou k tomu nutná vyšší oprávnění, než jaká byla %s povolena." -#: private/share/share.php:1456 +#: private/share/share.php:1457 #, php-format msgid "Sharing %s failed, because resharing is not allowed" -msgstr "" +msgstr "Sdílení položky %s selhalo, protože sdílení dále není povoleno" -#: private/share/share.php:1468 +#: private/share/share.php:1469 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" -msgstr "" +msgstr "Sdílení položky %s selhalo, protože podpůrná vrstva sdílení nenalezla zdrojový %s" -#: private/share/share.php:1482 +#: private/share/share.php:1483 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" -msgstr "" +msgstr "Sdílení položky %s selhalo, protože soubor nebyl nalezen v dočasném úložišti" #: private/tags.php:183 #, php-format diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index 4d315527f9d..79700c3e548 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 20:40+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 09:50+0000\n" "Last-Translator: Jaroslav Lichtblau <jaroslav@lichtblau.cz>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -56,15 +56,15 @@ msgstr "E-mail odeslán" msgid "You need to set your user email before being able to send test emails." msgstr "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu." -#: admin/controller.php:116 templates/admin.php:353 +#: admin/controller.php:116 templates/admin.php:349 msgid "Send mode" msgstr "Mód odesílání" -#: admin/controller.php:118 templates/admin.php:366 templates/personal.php:144 +#: admin/controller.php:118 templates/admin.php:362 templates/personal.php:144 msgid "Encryption" msgstr "Šifrování" -#: admin/controller.php:120 templates/admin.php:390 +#: admin/controller.php:120 templates/admin.php:386 msgid "Authentication method" msgstr "Metoda ověření" @@ -441,13 +441,13 @@ msgstr "Zkontrolujte prosím znovu <a href=\"%s\">instalační příručku</a>." msgid "" "PHP is apparently setup to strip inline doc blocks. This will make several " "core apps inaccessible." -msgstr "" +msgstr "PHP je patrně nastaveno tak, aby odstraňovalo vnitřní části dokumentů. Toto bude mít za následek množsví nedostupných hlavních aplikací." #: templates/admin.php:94 msgid "" "This is probably caused by a cache/accelerator such as Zend OPcache or " "eAccelerator." -msgstr "" +msgstr "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator." #: templates/admin.php:105 msgid "Database Performance Info" @@ -610,91 +610,91 @@ msgstr "Těmto skupinám bude stále možno sdílet, nemohou ale sami sdílet os msgid "Security" msgstr "Zabezpečení" -#: templates/admin.php:328 +#: templates/admin.php:326 msgid "Enforce HTTPS" msgstr "Vynutit HTTPS" -#: templates/admin.php:330 +#: templates/admin.php:328 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." msgstr "Vynutí připojování klientů k %s šifrovaným spojením." -#: templates/admin.php:336 +#: templates/admin.php:334 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." msgstr "Připojte se k %s skrze HTTPS pro povolení nebo zakázání vynucování SSL." -#: templates/admin.php:348 +#: templates/admin.php:344 msgid "Email Server" msgstr "E-mailový server" -#: templates/admin.php:350 +#: templates/admin.php:346 msgid "This is used for sending out notifications." msgstr "Toto se používá pro odesílání upozornění." -#: templates/admin.php:381 +#: templates/admin.php:377 msgid "From address" msgstr "Adresa odesílatele" -#: templates/admin.php:382 +#: templates/admin.php:378 msgid "mail" msgstr "e-mail" -#: templates/admin.php:403 +#: templates/admin.php:399 msgid "Authentication required" msgstr "Vyžadováno ověření" -#: templates/admin.php:407 +#: templates/admin.php:403 msgid "Server address" msgstr "Adresa serveru" -#: templates/admin.php:411 +#: templates/admin.php:407 msgid "Port" msgstr "Port" -#: templates/admin.php:416 +#: templates/admin.php:412 msgid "Credentials" msgstr "Přihlašovací údaje" -#: templates/admin.php:417 +#: templates/admin.php:413 msgid "SMTP Username" msgstr "SMTP uživatelské jméno " -#: templates/admin.php:420 +#: templates/admin.php:416 msgid "SMTP Password" msgstr "SMTP heslo" -#: templates/admin.php:424 +#: templates/admin.php:420 msgid "Test email settings" msgstr "Otestovat nastavení e-mailu" -#: templates/admin.php:425 +#: templates/admin.php:421 msgid "Send email" msgstr "Odeslat e-mail" -#: templates/admin.php:430 +#: templates/admin.php:426 msgid "Log" msgstr "Záznam" -#: templates/admin.php:431 +#: templates/admin.php:427 msgid "Log level" msgstr "Úroveň zaznamenávání" -#: templates/admin.php:463 +#: templates/admin.php:459 msgid "More" msgstr "Více" -#: templates/admin.php:464 +#: templates/admin.php:460 msgid "Less" msgstr "Méně" -#: templates/admin.php:470 templates/personal.php:196 +#: templates/admin.php:466 templates/personal.php:196 msgid "Version" msgstr "Verze" -#: templates/admin.php:474 templates/personal.php:199 +#: templates/admin.php:470 templates/personal.php:199 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po index a1a20a73512..3da9370a271 100644 --- a/l10n/cs_CZ/user_ldap.po +++ b/l10n/cs_CZ/user_ldap.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-10 01:54-0400\n" -"PO-Revision-Date: 2014-06-10 05:01+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 09:50+0000\n" "Last-Translator: Jaroslav Lichtblau <jaroslav@lichtblau.cz>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -180,11 +180,11 @@ msgstr "Server" #: settings.php:53 msgid "User Filter" -msgstr "" +msgstr "Uživatelský Filtr" #: settings.php:54 msgid "Login Filter" -msgstr "" +msgstr "Přihlašovací Filtr" #: settings.php:55 msgid "Group Filter" @@ -344,7 +344,7 @@ msgstr "Pokračovat" #: templates/settings.php:7 msgid "Expert" -msgstr "" +msgstr "Expertní" #: templates/settings.php:8 msgid "Advanced" diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po index e9232c6780c..0ff0c6d5423 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -168,11 +168,11 @@ msgstr "" msgid "Saving..." msgstr "Yn cadw..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "eiliad yn ôl" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -180,7 +180,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -188,15 +188,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "heddiw" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ddoe" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -204,11 +204,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "mis diwethaf" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -216,14 +216,45 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "y llynedd" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "blwyddyn yn ôl" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Ailosod cyfrinair" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ie" @@ -524,43 +555,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost.<br>Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach.<br>Os nad yw yno, cysylltwch â'ch gweinyddwr lleol." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost." - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Enw defnyddiwr" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -568,30 +596,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Ailosodwyd eich cyfrinair" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "I'r dudalen mewngofnodi" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Cyfrinair newydd" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Ailosod cyfrinair" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -818,8 +837,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Wedi colli'ch cyfrinair?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po index 6ee638fb90f..6a945597507 100644 --- a/l10n/cy_GB/files_encryption.po +++ b/l10n/cy_GB/files_encryption.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# ubuntucymraeg <owen.llywelyn@gmail.com>, 2013 +# Owen Llywelyn <owen.llywelyn@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -81,18 +81,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -105,11 +105,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po index 5a551ee974f..6942f78e98e 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: cy_GB\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Cadw" diff --git a/l10n/da/core.po b/l10n/da/core.po index 9463662518f..892ee2cf00b 100644 --- a/l10n/da/core.po +++ b/l10n/da/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 11:30+0000\n" -"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -175,54 +175,85 @@ msgstr "Lyd" msgid "Saving..." msgstr "Gemmer..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sekunder siden" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut siden" msgstr[1] "%n minutter siden" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n time siden" msgstr[1] "%n timer siden" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "i dag" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "i går" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dag siden" msgstr[1] "%n dage siden" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "sidste måned" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n måned siden" msgstr[1] "%n måneder siden" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "sidste år" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "år siden" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Nulstil kodeord" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ja" @@ -521,43 +552,40 @@ msgstr "Opdateringen mislykkedes." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s adgangskode nulstillet" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Der opstod et problem under afsending af emailen. Kontakt venligst systemadministratoren." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Anvend følgende link til at nulstille din adgangskode: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "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:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn var korrekt?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Du vil modtage et link til at nulstille dit kodeord via email." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Brugernavn" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -565,30 +593,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ja, Jeg ønsker virkelig at nulstille mit kodeord" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Nulstil" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Dit kodeord blev nulstillet" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Til login-side" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nyt kodeord" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Nulstil kodeord" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -815,8 +834,8 @@ msgid "Please contact your administrator." msgstr "Kontakt venligst din administrator" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Mistet dit kodeord?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po index b29e6b895de..046e4cf0674 100644 --- a/l10n/da/files_encryption.po +++ b/l10n/da/files_encryption.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 11:30+0000\n" -"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -108,12 +108,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Kryptering foretages... Prøv venligst igen senere." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Gå direkte til din " - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "Personlige indstillinger" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po index ae2ef6c03be..94b14a5e1b2 100644 --- a/l10n/da/files_external.po +++ b/l10n/da/files_external.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 18:32+0000\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 19:00+0000\n" "Last-Translator: Anders J. Sørensen\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -246,7 +246,7 @@ msgstr "<b>Bemærk:</b> \"%s\" er ikke installeret. Montering af %s er ikke mul #: templates/list.php:7 msgid "You don't have any external storages" -msgstr "" +msgstr "Du har ingen eksterne lagre" #: templates/list.php:16 msgid "Name" diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po index 370727d74ae..b91b35931e2 100644 --- a/l10n/da/files_sharing.po +++ b/l10n/da/files_sharing.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: Johannes Hessellund <osos@openeyes.dk>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -21,15 +21,15 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Delt med dig" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Delt med andre" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Delt via link" @@ -45,18 +45,6 @@ msgstr "Du har ikke delt nogen filer endnu." msgid "You haven't shared any files by link yet." msgstr "Du har ikke delt nogen filer endnu." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Kunne ikke indlæse skabelon" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Gemt" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Nulstil" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Delt af {owner}" @@ -121,19 +109,3 @@ msgstr "Download %s" #: templates/public.php:54 msgid "Direct link" msgstr "Direkte link" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "E-mail skabelon" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Tema" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Skabelon" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Gem" diff --git a/l10n/da/lib.po b/l10n/da/lib.po index 4ea1916d02a..7bf2f021e22 100644 --- a/l10n/da/lib.po +++ b/l10n/da/lib.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 20:00+0000\n" +"Last-Translator: Anders J. Sørensen\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" @@ -351,30 +351,30 @@ msgstr "" msgid "Sharing backend for %s not found" msgstr "" -#: private/share/share.php:1431 +#: private/share/share.php:1432 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: private/share/share.php:1440 +#: private/share/share.php:1441 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: private/share/share.php:1456 +#: private/share/share.php:1457 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: private/share/share.php:1468 +#: private/share/share.php:1469 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: private/share/share.php:1482 +#: private/share/share.php:1483 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" @@ -449,7 +449,7 @@ msgstr "En gyldig adgangskode skal angives" #: private/user/manager.php:252 msgid "The username is already being used" -msgstr "" +msgstr "Brugernavnet er allerede i brug" #: public/files/locknotacquiredexception.php:39 #, php-format diff --git a/l10n/da/settings.po b/l10n/da/settings.po index f67b95c5a80..1b3a866fbf8 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 18:16+0000\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 19:50+0000\n" "Last-Translator: Anders J. Sørensen\n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -61,7 +61,7 @@ msgstr "Kryptering" #: admin/controller.php:120 templates/admin.php:390 msgid "Authentication method" -msgstr "" +msgstr "Godkendelsesmetode" #: ajax/apps/ocs.php:20 msgid "Unable to load list from App Store" @@ -90,21 +90,21 @@ msgstr "Gruppen kan ikke oprettes" #: ajax/decryptall.php:31 msgid "Files decrypted successfully" -msgstr "" +msgstr "Filer dekrypteret med succes" #: ajax/decryptall.php:33 msgid "" "Couldn't decrypt your files, please check your owncloud.log or ask your " "administrator" -msgstr "" +msgstr "Dine filer kunne ikke dekrypteres. Gennemse din owncloud log eller spørg din administrator" #: ajax/decryptall.php:36 msgid "Couldn't decrypt your files, check your password and try again" -msgstr "" +msgstr "Dine filer kunne ikke dekrypteres. Check din adgangskode og forsøg igen" #: ajax/deletekeys.php:14 msgid "Encryption keys deleted permanently" -msgstr "" +msgstr "Krypteringsnøgle slettet permanent" #: ajax/deletekeys.php:16 msgid "" @@ -279,27 +279,27 @@ msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. " #: js/personal.js:324 msgid "Delete encryption keys permanently." -msgstr "" +msgstr "Slet krypteringsnøgler permanent." #: js/personal.js:338 msgid "Restore encryption keys." -msgstr "" +msgstr "Genopret krypteringsnøgler." #: js/users/deleteHandler.js:166 msgid "Unable to delete {objName}" -msgstr "" +msgstr "Kunne ikke slette {objName}" #: js/users/groups.js:73 js/users/groups.js:178 msgid "Error creating group" -msgstr "" +msgstr "Fejl ved oprettelse af gruppe" #: js/users/groups.js:177 msgid "A valid group name must be provided" -msgstr "" +msgstr "Et gyldigt gruppenavn skal angives " #: js/users/groups.js:205 msgid "deleted {groupName}" -msgstr "" +msgstr "slettede {groupName}" #: js/users/groups.js:206 js/users/users.js:255 msgid "undo" @@ -327,7 +327,7 @@ msgstr "aldrig" #: js/users/users.js:254 msgid "deleted {userName}" -msgstr "" +msgstr "slettede {userName}" #: js/users/users.js:371 msgid "add group" @@ -446,7 +446,7 @@ msgstr "" #: templates/admin.php:105 msgid "Database Performance Info" -msgstr "" +msgstr "Database Performance Oplysninger" #: templates/admin.php:108 msgid "" @@ -517,18 +517,18 @@ msgstr "Cron" #: templates/admin.php:196 #, php-format msgid "Last cron was executed at %s." -msgstr "" +msgstr "Seneste 'cron' blev kørt %s." #: templates/admin.php:199 #, php-format msgid "" "Last cron was executed at %s. This is more than an hour ago, something seems" " wrong." -msgstr "" +msgstr "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt." #: templates/admin.php:203 msgid "Cron was not executed yet!" -msgstr "" +msgstr "Cron har ikke kørt endnu!" #: templates/admin.php:213 msgid "Execute one task with each page loaded" @@ -566,7 +566,7 @@ msgstr "Tillad offentlig upload" #: templates/admin.php:258 msgid "Set default expiration date" -msgstr "" +msgstr "Vælg standard udløbsdato" #: templates/admin.php:260 msgid "Expire after " @@ -578,7 +578,7 @@ msgstr "dage" #: templates/admin.php:266 msgid "Enforce expiration date" -msgstr "" +msgstr "Påtving udløbsdato" #: templates/admin.php:276 msgid "Allow resharing" @@ -590,11 +590,11 @@ msgstr "" #: templates/admin.php:290 msgid "Allow users to send mail notification for shared files" -msgstr "" +msgstr "Tillad brugere at sende mail underretninger for delte filer" #: templates/admin.php:297 msgid "Exclude groups from sharing" -msgstr "" +msgstr "Ekskluder grupper fra at dele" #: templates/admin.php:308 msgid "" @@ -635,7 +635,7 @@ msgstr "Fra adresse" #: templates/admin.php:382 msgid "mail" -msgstr "" +msgstr "mail" #: templates/admin.php:403 msgid "Authentication required" @@ -872,11 +872,11 @@ msgstr "" #: templates/personal.php:178 msgid "Restore Encryption Keys" -msgstr "" +msgstr "Genopret Krypteringsnøgler" #: templates/personal.php:182 msgid "Delete Encryption Keys" -msgstr "" +msgstr "Slet Krypteringsnøgler" #: templates/users/part.createuser.php:4 msgid "Login Name" @@ -903,7 +903,7 @@ msgstr "" #: templates/users/part.grouplist.php:5 msgid "Add Group" -msgstr "" +msgstr "Tilføj Gruppe" #: templates/users/part.grouplist.php:10 msgid "Group" diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po index 5e4ad842e7e..f1398cc6838 100644 --- a/l10n/da/user_webdavauth.po +++ b/l10n/da/user_webdavauth.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Anders J. Sørensen, 2013 +# Anders J. Sørensen, 2013-2014 # Thomas <cronner@gmail.com>, 2012 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-05 06:12+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 19:15+0000\n" +"Last-Translator: Anders J. Sørensen\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" @@ -26,7 +26,7 @@ msgstr "WebDAV-godkendelse" #: templates/settings.php:3 msgid "Address:" -msgstr "" +msgstr "Adresse:" #: templates/settings.php:5 msgid "Save" diff --git a/l10n/de/core.po b/l10n/de/core.po index cedf872aebc..b0478728b16 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 11:50+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,54 +178,85 @@ msgstr "Audio" msgid "Saving..." msgstr "Speichern..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "Heute" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "Gestern" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "Vor Jahren" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Passwort zurücksetzen" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ja" @@ -524,43 +555,40 @@ msgstr "Die Aktualisierung war erfolgreich." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s-Passwort zurücksetzen" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte kontaktiere deinen Administrator." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Benutzername" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -568,30 +596,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ja, ich will mein Passwort jetzt zurücksetzen" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Zurücksetzen" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Dein Passwort wurde zurückgesetzt." - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Zur Login-Seite" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Neues Passwort" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Passwort zurücksetzen" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -818,8 +837,8 @@ msgid "Please contact your administrator." msgstr "Bitte kontaktiere Deinen Administrator." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Passwort vergessen?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po index 50302161a95..c4edd44753a 100644 --- a/l10n/de/files_encryption.po +++ b/l10n/de/files_encryption.po @@ -4,20 +4,20 @@ # # Translators: # iLennart21 <a12s34d56f78@live.com>, 2013 -# Stephan Köninger <mail@stekoe.de>, 2013 +# stephan.koeninger <mail@stekoe.de>, 2013 # Mario Siegmann <mario_siegmann@web.de>, 2013-2014 -# ninov <ninovdl@ymail.com>, 2013 +# Nino van der Linden <ninovdl@ymail.com>, 2013 # Pwnicorn <pwnicorndev@gmail.com>, 2013 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014 # thillux, 2013 -# Mirodin <blobbyjj@ymail.com>, 2013 +# Tristan <blobbyjj@ymail.com>, 2013 # kabum <uu.kabum@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-29 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 16:11+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 09:50+0000\n" "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -89,18 +89,18 @@ msgid "" "administrator" msgstr "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Fehlende Vorraussetzungen" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:" @@ -113,12 +113,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Initiale Verschlüsselung läuft... Bitte versuche es später wieder." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Direkt wechseln zu Deinem" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "Private Einstellungen" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "Wechsle direkt zu Deinen %spersonal settings%s." #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po index 497a6c52c05..bca8097d05a 100644 --- a/l10n/de/files_external.po +++ b/l10n/de/files_external.po @@ -6,13 +6,14 @@ # Christian Reiner <foss@christian-reiner.info>, 2013 # Mario Siegmann <mario_siegmann@web.de>, 2014 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014 +# kabum <uu.kabum@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 12:00+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-13 16:01+0000\n" +"Last-Translator: kabum <uu.kabum@gmail.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +51,7 @@ msgstr "Bucket" #: appinfo/app.php:60 msgid "Amazon S3 and compliant" -msgstr "Amazon S3 und Kompatible" +msgstr "Amazon S3 und kompatible" #: appinfo/app.php:63 msgid "Access Key" diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po index a41d01eb39d..7be8c5a0c2e 100644 --- a/l10n/de/files_sharing.po +++ b/l10n/de/files_sharing.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 12:00+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,15 +23,15 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Mit Dir geteilt" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Von Dir geteilt" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Geteilt über einen Link" @@ -47,18 +47,6 @@ msgstr "Du hast bis jetzt keine Dateien mit anderen geteilt." msgid "You haven't shared any files by link yet." msgstr "Du hast bis jetzt keine Dateien über einen Link mit anderen geteilt." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Vorlage kann nicht geladen werden" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Gespeichert" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Zurücksetzen" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Geteilt von {owner}" @@ -123,19 +111,3 @@ msgstr "Download %s" #: templates/public.php:54 msgid "Direct link" msgstr "Direkter Link" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Mail-Vorlagen" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Theme" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Vorlage" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Speichern" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index b2d5cb94338..5c83c30a481 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 07:30+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-13 15:50+0000\n" +"Last-Translator: kabum <uu.kabum@gmail.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -576,11 +576,11 @@ msgstr "Setze Ablaufdatum" #: templates/admin.php:260 msgid "Expire after " -msgstr "Ablauf nach dem" +msgstr "Ablauf nach " #: templates/admin.php:263 msgid "days" -msgstr "Tage" +msgstr "Tagen" #: templates/admin.php:266 msgid "Enforce expiration date" diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po index 910a8633aa6..841bd73afb2 100644 --- a/l10n/de_AT/core.po +++ b/l10n/de_AT/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -514,43 +545,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,29 +586,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -808,7 +827,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/de_AT/files_encryption.po b/l10n/de_AT/files_encryption.po index be82e2a3dfd..0ffcebed7ff 100644 --- a/l10n/de_AT/files_encryption.po +++ b/l10n/de_AT/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/de_AT/files_sharing.po b/l10n/de_AT/files_sharing.po index 44e1e087fa9..fde7ead5060 100644 --- a/l10n/de_AT/files_sharing.po +++ b/l10n/de_AT/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: de_AT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Speichern" diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po index e460652ed5e..c593cfd5592 100644 --- a/l10n/de_CH/core.po +++ b/l10n/de_CH/core.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -177,54 +177,85 @@ msgstr "" msgid "Saving..." msgstr "Speichern..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "Heute" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "Gestern" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "Vor Jahren" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Passwort zurücksetzen" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ja" @@ -523,43 +554,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s-Passwort zurücksetzen" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s-Passwort zurücksetzen" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Benutzername" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -567,30 +595,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen." -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Zurücksetzen" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Ihr Passwort wurde zurückgesetzt." - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Zur Login-Seite" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Neues Passwort" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Passwort zurücksetzen" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -817,8 +836,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Passwort vergessen?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/de_CH/files_encryption.po b/l10n/de_CH/files_encryption.po index 4bb13bfa889..548bff627f8 100644 --- a/l10n/de_CH/files_encryption.po +++ b/l10n/de_CH/files_encryption.po @@ -4,8 +4,8 @@ # # Translators: # ako84 <a0306265@unet.univie.ac.at>, 2013 -# FlorianScholz <work@bgstyle.de>, 2013 -# FlorianScholz <work@bgstyle.de>, 2013 +# Florian Scholz <work@bgstyle.de>, 2013 +# Florian Scholz <work@bgstyle.de>, 2013 # JamFX <niko@nik-o-mat.de>, 2013 # Mario Siegmann <mario_siegmann@web.de>, 2013 # traductor, 2013 @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -86,18 +86,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Fehlende Voraussetzungen" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:" @@ -110,13 +110,10 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "Persönliche Einstellungen" - #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" msgstr "Verschlüsselung" diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po index 1ecb9220874..81c368398c1 100644 --- a/l10n/de_CH/files_sharing.po +++ b/l10n/de_CH/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n" "MIME-Version: 1.0\n" @@ -20,15 +20,15 @@ msgstr "" "Language: de_CH\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -44,18 +44,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Zurücksetzen" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Geteilt von {owner}" @@ -120,19 +108,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Speichern" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index b1efd714950..67d7ed695b2 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 11:50+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,54 +178,85 @@ msgstr "Audio" msgid "Saving..." msgstr "Speichern..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "Heute" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "Gestern" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "Vor Jahren" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Passwort zurücksetzen" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ja" @@ -524,43 +555,40 @@ msgstr "Die Aktualisierung war erfolgreich." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s-Passwort zurücksetzen" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Beim Senden der E-Mail ist ein Problem aufgetreten, bitte kontaktieren Sie Ihren Administrator." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Benutzername" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -568,30 +596,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen." -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Zurücksetzen" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Ihr Passwort wurde zurückgesetzt." - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Zur Login-Seite" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Neues Passwort" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Passwort zurücksetzen" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -818,8 +837,8 @@ msgid "Please contact your administrator." msgstr "Bitte kontaktieren Sie Ihren Administrator." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Passwort vergessen?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po index 2362c837b9e..c4a475a3f8d 100644 --- a/l10n/de_DE/files_encryption.po +++ b/l10n/de_DE/files_encryption.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-29 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 16:11+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 09:50+0000\n" "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" @@ -85,18 +85,18 @@ msgid "" "administrator" msgstr "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Fehlende Voraussetzungen" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:" @@ -109,12 +109,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Anfangsverschlüsselung läuft... Bitte versuchen Sie es später wieder." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Direkt wechseln zu Ihrem" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "Persönliche Einstellungen" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "Wechseln Sie direkt zu Ihren %spersonal settings%s." #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po index 5c76e09b716..3fb6873159f 100644 --- a/l10n/de_DE/files_sharing.po +++ b/l10n/de_DE/files_sharing.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 12:00+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,15 +22,15 @@ msgstr "" "Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Mit Ihnen geteilt" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Von Ihnen geteilt" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Geteilt über einen Link" @@ -46,18 +46,6 @@ msgstr "Sie haben bis jetzt keine Dateien mit anderen geteilt." msgid "You haven't shared any files by link yet." msgstr "Sie haben bis jetzt keine Dateien über einen Link mit anderen geteilt." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Vorlage kann nicht geladen werden" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Gespeichert" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Zurücksetzen" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Geteilt von {owner}" @@ -122,19 +110,3 @@ msgstr "Download %s" #: templates/public.php:54 msgid "Direct link" msgstr "Direkte Verlinkung" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Mail-Vorlagen" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Theme" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Vorlage" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Speichern" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index 28b552c4f56..3b127fd1eb6 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 07:30+0000\n" -"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-13 15:50+0000\n" +"Last-Translator: kabum <uu.kabum@gmail.com>\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -576,11 +576,11 @@ msgstr "Setze Ablaufdatum" #: templates/admin.php:260 msgid "Expire after " -msgstr "Ablauf nach dem" +msgstr "Ablauf nach " #: templates/admin.php:263 msgid "days" -msgstr "Tage" +msgstr "Tagen" #: templates/admin.php:266 msgid "Enforce expiration date" diff --git a/l10n/el/core.po b/l10n/el/core.po index 01f57d765bd..b2bf51e9fd4 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-09 01:54-0400\n" -"PO-Revision-Date: 2014-06-08 16:30+0000\n" -"Last-Translator: Vassilis Kehayas <vkehayas@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -178,54 +178,85 @@ msgstr "Ήχος" msgid "Saving..." msgstr "Γίνεται αποθήκευση..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "δευτερόλεπτα πριν" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n λεπτό πριν" msgstr[1] "%n λεπτά πριν" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n ώρα πριν" msgstr[1] "%n ώρες πριν" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "σήμερα" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "χτες" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n ημέρα πριν" msgstr[1] "%n ημέρες πριν" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "τελευταίο μήνα" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n μήνας πριν" msgstr[1] "%n μήνες πριν" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "τελευταίο χρόνο" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "χρόνια πριν" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Επαναφορά συνθηματικού" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ναι" @@ -524,43 +555,40 @@ msgstr "Η ενημέρωση δεν ήταν επιτυχής." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s επαναφορά κωδικού πρόσβασης" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή email, παρακαλώ επικοινωνήστε με τον διαχειριστή." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Ο σύνδεσμος για να επανακτήσετε τον κωδικό σας έχει σταλεί στο email <br>αν δεν το λάβετε μέσα σε ορισμένο διάστημα, ελέγξετε τους φακελλους σας spam/junk <br> αν δεν είναι εκεί ρωτήστε τον τοπικό σας διαχειριστή " - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? " - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Όνομα χρήστη" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -568,30 +596,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα." -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Επαναφορά" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Ο κωδικός πρόσβασής σας επαναφέρθηκε" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Σελίδα εισόδου" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Νέο συνθηματικό" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Επαναφορά συνθηματικού" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -818,8 +837,8 @@ msgid "Please contact your administrator." msgstr "Παρακαλώ επικοινωνήστε με τον διαχειριστή." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Ξεχάσατε το συνθηματικό σας;" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po index ead19de670f..4390f9a4f4e 100644 --- a/l10n/el/files_encryption.po +++ b/l10n/el/files_encryption.po @@ -5,17 +5,17 @@ # Translators: # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013 # Marios Bekatoros <>, 2013 -# pe_ppe <peppe@cs.uoi.gr>, 2014 -# Teogramm <theodorewii121@hotmail.com>, 2013 -# Teogramm <theodorewii121@hotmail.com>, 2013 -# vkehayas <vkehayas@gmail.com>, 2013 +# Spyros Melissovas <peppe@cs.uoi.gr>, 2014 +# Theodore Grammenos <theodorewii121@hotmail.com>, 2013 +# Theodore Grammenos <theodorewii121@hotmail.com>, 2013 +# Vassilis Kehayas <vkehayas@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-31 01:54-0400\n" -"PO-Revision-Date: 2014-05-30 09:15+0000\n" -"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -86,18 +86,18 @@ msgid "" "administrator" msgstr "Άγνωστο σφάλμα. Παρακαλώ ελέγξτε τις ρυθμίσεις του συστήματό σας ή επικοινωνήστε με τον διαχειριστή συστημάτων σας" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Προαπαιτούμενα που απουσιάζουν." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Παρακαλώ επιβεβαιώστε ότι η PHP 5.3.3 ή νεότερη είναι εγκατεστημένη και ότι το OpenSSL μαζί με το PHP extension είναι ενεργοποιήμένο και έχει ρυθμιστεί σωστά. Προς το παρόν, η εφαρμογή κρυπτογράφησης είναι απενεργοποιημένη." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:" @@ -110,12 +110,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Εκτέλεση αρχικής κρυπτογράφησης... Παρακαλώ προσπαθήστε αργότερα." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Πηγαίνε απευθείας στο " - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "προσωπικές ρυθμίσεις" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po index 05085152802..7c4179e81c9 100644 --- a/l10n/el/files_sharing.po +++ b/l10n/el/files_sharing.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 16:40+0000\n" -"Last-Translator: Vassilis Kehayas <vkehayas@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -20,15 +20,15 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Διαμοιρασμένο με εσάς" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Διαμοιρασμένο με άλλους" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Διαμοιρασμένο μέσω συνδέσμου" @@ -44,18 +44,6 @@ msgstr "Δεν έχετε διαμοιραστεί κανένα αρχείο α msgid "You haven't shared any files by link yet." msgstr "Δεν έχετε διαμοιραστεί κανένα αρχείο μέσω συνδέσμου ακόμα." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Αδυναμία φόρτωσης προτύπου" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Αποθηκεύτηκαν" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Επαναφορά" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Διαμοιράστηκε από τον {owner}" @@ -120,19 +108,3 @@ msgstr "Λήψη %s" #: templates/public.php:54 msgid "Direct link" msgstr "Άμεσος σύνδεσμος" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Πρότυπα αλληλογραφίας" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Θέμα" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Πρότυπο" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Αποθήκευση" diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po index bf0e8bc9ca0..337531497ee 100644 --- a/l10n/en@pirate/core.po +++ b/l10n/en@pirate/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -514,43 +545,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,29 +586,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -808,7 +827,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po index c3d4fb140b6..d7b45d5be79 100644 --- a/l10n/en@pirate/files_encryption.po +++ b/l10n/en@pirate/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po index 500a196d7db..bee13dca546 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ msgstr "" "Language: en@pirate\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,19 +42,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -118,19 +106,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po index b844b623441..03aa5e36d77 100644 --- a/l10n/en_GB/core.po +++ b/l10n/en_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "Saving..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "seconds ago" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minute ago" msgstr[1] "%n minutes ago" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n hour ago" msgstr[1] "%n hours ago" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "today" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "yesterday" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n day ago" msgstr[1] "%n days ago" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "last month" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n month ago" msgstr[1] "%n months ago" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "last year" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "years ago" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Reset password" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Yes" @@ -514,43 +545,40 @@ msgstr "The update was unsuccessful." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "The update was successful. Redirecting you to ownCloud now." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s password reset" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "A problem has occurred whilst sending the email, please contact your administrator." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Use the following link to reset your password: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "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 ." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Request failed!<br>Did you make sure your email/username was correct?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "You will receive a link to reset your password via email." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Username" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,30 +586,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Yes, I really want to reset my password now" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Reset" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Your password was reset" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "To login page" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "New password" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -808,8 +827,8 @@ msgid "Please contact your administrator." msgstr "Please contact your administrator." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Lost your password?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/en_GB/files_encryption.po b/l10n/en_GB/files_encryption.po index 01f80e66e62..0251bb237c6 100644 --- a/l10n/en_GB/files_encryption.po +++ b/l10n/en_GB/files_encryption.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# mnestis <transifex@mnestis.net>, 2013-2014 +# Darren Richardson <transifex@mnestis.net>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-29 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 16:07+0000\n" -"Last-Translator: mnestis <transifex@mnestis.net>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,18 +81,18 @@ msgid "" "administrator" msgstr "Unknown error. Please check your system settings or contact your administrator" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Missing requirements." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Following users are not set up for encryption:" @@ -105,12 +105,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Initial encryption running... Please try again later." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Go directly to your " - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po index e6759dade68..a8c15c2f51c 100644 --- a/l10n/en_GB/files_sharing.po +++ b/l10n/en_GB/files_sharing.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: Darren Richardson <transifex@mnestis.net>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,15 +18,15 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Shared with you" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Shared with others" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Shared by link" @@ -42,18 +42,6 @@ msgstr "You haven't shared any files yet." msgid "You haven't shared any files by link yet." msgstr "You haven't shared any files by link yet." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Could not load template" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Saved" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Reset" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Shared by {owner}" @@ -118,19 +106,3 @@ msgstr "Download %s" #: templates/public.php:54 msgid "Direct link" msgstr "Direct link" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Mail templates" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Theme" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Template" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Save" diff --git a/l10n/en_NZ/core.po b/l10n/en_NZ/core.po index b97b4ee83ce..b3789f07b06 100644 --- a/l10n/en_NZ/core.po +++ b/l10n/en_NZ/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/en_NZ/files_encryption.po b/l10n/en_NZ/files_encryption.po index 9e85125170e..37220c99f6c 100644 --- a/l10n/en_NZ/files_encryption.po +++ b/l10n/en_NZ/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/en_NZ/files_sharing.po b/l10n/en_NZ/files_sharing.po index ea28717417e..ab0bba97c5c 100644 --- a/l10n/en_NZ/files_sharing.po +++ b/l10n/en_NZ/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: en_NZ\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/eo/core.po b/l10n/eo/core.po index 1e0b327b373..12566f698bf 100644 --- a/l10n/eo/core.po +++ b/l10n/eo/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -169,54 +169,85 @@ msgstr "" msgid "Saving..." msgstr "Konservante..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sekundoj antaŭe" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "antaŭ %n minuto" msgstr[1] "antaŭ %n minutoj" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "antaŭ %n horo" msgstr[1] "antaŭ %n horoj" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "hodiaŭ" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "hieraŭ" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "antaŭ %n tago" msgstr[1] "antaŭ %n tagoj" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "lastamonate" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "antaŭ %n monato" msgstr[1] "antaŭ %n monatoj" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "lastajare" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "jaroj antaŭe" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Rekomenci la pasvorton" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Jes" @@ -515,43 +546,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Uzu la jenan ligilon por restarigi vian pasvorton: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "" - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo ĝustas?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Uzantonomo" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Jes, mi vere volas restarigi mian pasvorton nun" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Via pasvorto rekomencis" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Al la ensaluta paĝo" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nova pasvorto" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Rekomenci la pasvorton" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "Bonvolu kontakti vian administranton." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Ĉu vi perdis vian pasvorton?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po index 8f21087f100..de369c73f8d 100644 --- a/l10n/eo/files_encryption.po +++ b/l10n/eo/files_encryption.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -81,18 +81,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Mankas neproj." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -105,12 +105,9 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Iri direkte al via" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "persona agordo" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po index 3f80e8aba8a..c79d2bb2664 100644 --- a/l10n/eo/files_sharing.po +++ b/l10n/eo/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ msgstr "" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Konservita" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Kunhavigita de {owner}" @@ -118,19 +106,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "Direkta ligilo" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Konservi" diff --git a/l10n/es/core.po b/l10n/es/core.po index 78661f42878..195e5223aaf 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -23,9 +23,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 22:40+0000\n" -"Last-Translator: victormce <victormce@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -183,54 +183,85 @@ msgstr "Audio" msgid "Saving..." msgstr "Guardando..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "hace segundos" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Hace %n minuto" msgstr[1] "hace %n minutos" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Hace %n hora" msgstr[1] "hace %n horas" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "hoy" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ayer" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Hace %n día" msgstr[1] "hace %n días" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "el mes pasado" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Hace %n mes" msgstr[1] "hace %n meses" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "el año pasado" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "hace años" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Restablecer contraseña" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Sí" @@ -529,43 +560,40 @@ msgstr "Falló la actualización" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s restablecer contraseña" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Ocurrió un problema al enviar el mensaje de correo electrónico. Contacte a su administrador." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Utilice el siguiente enlace para restablecer su contraseña: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Recibirá un enlace por correo electrónico para restablecer su contraseña" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nombre de usuario" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -573,30 +601,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Sí. Realmente deseo resetear mi contraseña ahora" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Reiniciar" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Su contraseña fue restablecida" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "A la página de inicio de sesión" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nueva contraseña" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Restablecer contraseña" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -823,8 +842,8 @@ msgid "Please contact your administrator." msgstr "Por favor, contacte con el administrador." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "¿Ha perdido su contraseña?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po index edbbeea5375..854e008c070 100644 --- a/l10n/es/files_encryption.po +++ b/l10n/es/files_encryption.po @@ -5,23 +5,23 @@ # Translators: # Art O. Pal <artopal@fastmail.fm>, 2013-2014 # asaez <asaez@asaez.eu>, 2013 -# gmoriello <inactive+gmoriello@transifex.com>, 2013 -# japaol <japaol@gmail.com>, 2013 +# German <inactive+gmoriello@transifex.com>, 2013 +# Javi <japaol@gmail.com>, 2013 # juanman <juanma@kde.org.ar>, 2013 # Maenso <balero_arana@hotmail.com>, 2013 -# mikelanabitarte <inactive+mikelanabitarte@transifex.com>, 2013 +# mikel anabitarte <inactive+mikelanabitarte@transifex.com>, 2013 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2013 -# Rubén del Campo <yo@rubendelcampo.es>, 2013 -# saskarip <saskarip@gmail.com>, 2013 +# Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013 +# Sam Askari <saskarip@gmail.com>, 2013 # William Díaz <wdiazux@gmail.com>, 2013 # xhiena <xhiena@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-29 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 16:42+0000\n" -"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -92,18 +92,18 @@ msgid "" "administrator" msgstr "Error desconocido. Revise la configuración de su sistema o contacte a su administrador" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Requisitos incompletos." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Los siguientes usuarios no han sido configurados para el cifrado:" @@ -116,12 +116,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Cifrado inicial en curso... Inténtelo más tarde." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Ir directamente a su" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "opciones personales" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po index 83dec41229f..3ca9fa44942 100644 --- a/l10n/es/files_sharing.po +++ b/l10n/es/files_sharing.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: joses <jose_mari_s@hotmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -24,15 +24,15 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Compartido contigo" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Compartido con otros" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Compartido por medio de enlaces" @@ -48,18 +48,6 @@ msgstr "Aún no has compartido ningún archivo." msgid "You haven't shared any files by link yet." msgstr "Usted todavía no ha compartido ningún archivo por medio de enlaces." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "No se cargó la plantilla" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Guardado" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Reiniciar" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Compartido por {owner}" @@ -124,19 +112,3 @@ msgstr "Descargar %s" #: templates/public.php:54 msgid "Direct link" msgstr "Enlace directo" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Plantillas para correo" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Tema" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Plantilla" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Guardar" diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index e5d63723a81..3f06acbe761 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -169,54 +169,85 @@ msgstr "" msgid "Saving..." msgstr "Guardando..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Hace %n minuto" msgstr[1] "Hace %n minutos" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Hace %n hora" msgstr[1] "Hace %n horas" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "hoy" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ayer" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Hace %n día" msgstr[1] "Hace %n días" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "el mes pasado" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Hace %n mes" msgstr[1] "Hace %n meses" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "el año pasado" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "años atrás" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Restablecer contraseña" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Sí" @@ -515,43 +546,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s restablecer contraseña" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s restablecer contraseña" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Usá este enlace para restablecer tu contraseña: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "El enlace para restablecer la contraseña fue enviada a tu e-mail. <br> Si no lo recibís en un plazo de tiempo razonable, revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de correo electrónico o nombre de usuario son correcto?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nombre de usuario" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Sí, definitivamente quiero restablecer mi contraseña ahora" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Resetear" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Tu contraseña fue restablecida" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "A la página de inicio de sesión" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nueva contraseña:" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Restablecer contraseña" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "Por favor, contacte a su administrador." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "¿Perdiste tu contraseña?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po index cce58153d89..d574eed0a5c 100644 --- a/l10n/es_AR/files_encryption.po +++ b/l10n/es_AR/files_encryption.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# cjtess <claudio.tessone@gmail.com>, 2013 +# CJTess <claudio.tessone@gmail.com>, 2013 # cnngimenez, 2013-2014 -# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2014 +# Mariano <koryyyy@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -83,18 +83,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Requisitos incompletos." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Los siguientes usuarios no fueron configurados para encriptar:" @@ -107,12 +107,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Encriptación inicial corriendo... Por favor intente mas tarde. " #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Ve directamente a tu" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "Configuración personal" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po index a6d3da0fc6b..7f02508fc44 100644 --- a/l10n/es_AR/files_sharing.po +++ b/l10n/es_AR/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -19,15 +19,15 @@ msgstr "" "Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -43,18 +43,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Guardado" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Resetear" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Compartido por {owner}" @@ -119,19 +107,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "Vínculo directo" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Guardar" diff --git a/l10n/es_BO/core.po b/l10n/es_BO/core.po index e5483929112..e3fdb470756 100644 --- a/l10n/es_BO/core.po +++ b/l10n/es_BO/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/es_BO/files_encryption.po b/l10n/es_BO/files_encryption.po index 53817bb58db..06c88516806 100644 --- a/l10n/es_BO/files_encryption.po +++ b/l10n/es_BO/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/es_BO/files_sharing.po b/l10n/es_BO/files_sharing.po index 022f4e9a670..362a6d818a2 100644 --- a/l10n/es_BO/files_sharing.po +++ b/l10n/es_BO/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: es_BO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/es_CL/core.po b/l10n/es_CL/core.po index e46b6f4f53f..8f3dc1c6db4 100644 --- a/l10n/es_CL/core.po +++ b/l10n/es_CL/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "segundos antes" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "hoy" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ayer" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "mes anterior" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "último año" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "años anteriores" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Si" @@ -514,43 +545,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Usuario" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,29 +586,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -808,7 +827,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/es_CL/files_encryption.po b/l10n/es_CL/files_encryption.po index c0c59be9f2b..d01cb9d0bc7 100644 --- a/l10n/es_CL/files_encryption.po +++ b/l10n/es_CL/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/es_CL/files_sharing.po b/l10n/es_CL/files_sharing.po index fb1b679f230..f0fe5db178a 100644 --- a/l10n/es_CL/files_sharing.po +++ b/l10n/es_CL/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: es_CL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/es_CO/core.po b/l10n/es_CO/core.po index 7a8b06540d0..f15cabff753 100644 --- a/l10n/es_CO/core.po +++ b/l10n/es_CO/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/es_CO/files_encryption.po b/l10n/es_CO/files_encryption.po index 97a316f6550..e25f24313b1 100644 --- a/l10n/es_CO/files_encryption.po +++ b/l10n/es_CO/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/es_CO/files_sharing.po b/l10n/es_CO/files_sharing.po index ca749bc72d4..617f4882961 100644 --- a/l10n/es_CO/files_sharing.po +++ b/l10n/es_CO/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: es_CO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/es_CR/core.po b/l10n/es_CR/core.po index c30264f31c3..c9634c05155 100644 --- a/l10n/es_CR/core.po +++ b/l10n/es_CR/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/es_CR/files_encryption.po b/l10n/es_CR/files_encryption.po index 70c16ce697f..1c21ff90c0d 100644 --- a/l10n/es_CR/files_encryption.po +++ b/l10n/es_CR/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/es_CR/files_sharing.po b/l10n/es_CR/files_sharing.po index c31debdf36c..60ce773cb41 100644 --- a/l10n/es_CR/files_sharing.po +++ b/l10n/es_CR/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: es_CR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/es_EC/core.po b/l10n/es_EC/core.po index 1c7818ac4e2..e1fe1edfa88 100644 --- a/l10n/es_EC/core.po +++ b/l10n/es_EC/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/es_EC/files_encryption.po b/l10n/es_EC/files_encryption.po index 074a070c2a1..5b83122e8a6 100644 --- a/l10n/es_EC/files_encryption.po +++ b/l10n/es_EC/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/es_EC/files_sharing.po b/l10n/es_EC/files_sharing.po index 26035382982..d1acc0654a8 100644 --- a/l10n/es_EC/files_sharing.po +++ b/l10n/es_EC/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: es_EC\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po index 2ce61cc5157..f741b57d7ea 100644 --- a/l10n/es_MX/core.po +++ b/l10n/es_MX/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "Guardando..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "segundos antes" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Hace %n minuto" msgstr[1] "Hace %n minutos" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Hace %n hora" msgstr[1] "Hace %n horas" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "hoy" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ayer" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Hace %n día" msgstr[1] "Hace %n días" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "el mes pasado" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Hace %n mes" msgstr[1] "Hace %n meses" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "el año pasado" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "años antes" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Restablecer contraseña" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Sí" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s restablecer contraseña" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s restablecer contraseña" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Utilice el siguiente enlace para restablecer su contraseña: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Recibirá un enlace por correo electrónico para restablecer su contraseña" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nombre de usuario" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,30 +585,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Sí. Realmente deseo resetear mi contraseña ahora" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Reiniciar" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Su contraseña fue restablecida" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "A la página de inicio de sesión" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nueva contraseña" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Restablecer contraseña" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -807,8 +826,8 @@ msgid "Please contact your administrator." msgstr "Por favor, contacte con el administrador." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "¿Ha perdido su contraseña?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/es_MX/files_encryption.po b/l10n/es_MX/files_encryption.po index 325369852ce..5b543608ca2 100644 --- a/l10n/es_MX/files_encryption.po +++ b/l10n/es_MX/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Requisitos incompletos." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Los siguientes usuarios no han sido configurados para el cifrado:" @@ -104,12 +104,9 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Ir directamente a su" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "opciones personales" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/es_MX/files_sharing.po b/l10n/es_MX/files_sharing.po index a8e4dd54cf1..25c08f8cea0 100644 --- a/l10n/es_MX/files_sharing.po +++ b/l10n/es_MX/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Reiniciar" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Compartido por {owner}" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "Enlace directo" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Guardar" diff --git a/l10n/es_PE/core.po b/l10n/es_PE/core.po index 64e29385a7a..a1429b7b499 100644 --- a/l10n/es_PE/core.po +++ b/l10n/es_PE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/es_PE/files_encryption.po b/l10n/es_PE/files_encryption.po index dab89295742..d4604e06dee 100644 --- a/l10n/es_PE/files_encryption.po +++ b/l10n/es_PE/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/es_PE/files_sharing.po b/l10n/es_PE/files_sharing.po index 971b097748b..39a524ae79c 100644 --- a/l10n/es_PE/files_sharing.po +++ b/l10n/es_PE/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: es_PE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/es_PY/core.po b/l10n/es_PY/core.po index 5f3d8163fe4..c5a3b2a4515 100644 --- a/l10n/es_PY/core.po +++ b/l10n/es_PY/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/es_PY/files_encryption.po b/l10n/es_PY/files_encryption.po index 15853c88189..df0463b4580 100644 --- a/l10n/es_PY/files_encryption.po +++ b/l10n/es_PY/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/es_PY/files_sharing.po b/l10n/es_PY/files_sharing.po index d29f4ffbafd..f3d685a5e71 100644 --- a/l10n/es_PY/files_sharing.po +++ b/l10n/es_PY/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: es_PY\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/es_US/core.po b/l10n/es_US/core.po index a79db5d98f6..48672e0a2c0 100644 --- a/l10n/es_US/core.po +++ b/l10n/es_US/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/es_US/files_encryption.po b/l10n/es_US/files_encryption.po index 8f924e5fea2..553f83c904d 100644 --- a/l10n/es_US/files_encryption.po +++ b/l10n/es_US/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/es_US/files_sharing.po b/l10n/es_US/files_sharing.po index 2042efa33a0..4c6aee5122c 100644 --- a/l10n/es_US/files_sharing.po +++ b/l10n/es_US/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: es_US\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/es_UY/core.po b/l10n/es_UY/core.po index 7ea970c1af3..2480270937c 100644 --- a/l10n/es_UY/core.po +++ b/l10n/es_UY/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/es_UY/files_encryption.po b/l10n/es_UY/files_encryption.po index b4ec9c0ed3d..0a170ca0ae9 100644 --- a/l10n/es_UY/files_encryption.po +++ b/l10n/es_UY/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/es_UY/files_sharing.po b/l10n/es_UY/files_sharing.po index df3455d77f7..e52514532df 100644 --- a/l10n/es_UY/files_sharing.po +++ b/l10n/es_UY/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: es_UY\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index 878b152ae4b..10a60fba67b 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -169,54 +169,85 @@ msgstr "" msgid "Saving..." msgstr "Salvestamine..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sekundit tagasi" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut tagasi" msgstr[1] "%n minutit tagasi" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n tund tagasi" msgstr[1] "%n tundi tagasi" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "täna" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "eile" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n päev tagasi" msgstr[1] "%n päeva tagasi" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "viimasel kuul" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n kuu tagasi" msgstr[1] "%n kuud tagasi" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "viimasel aastal" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "aastat tagasi" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Nulli parool" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Jah" @@ -515,43 +546,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s parooli lähtestus" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Tekkis tõrge e-posti saatmisel, palun kontakteeru administraatoriga." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Kasuta järgnevat linki oma parooli taastamiseks: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Link parooli vahetuseks on saadetud Sinu e-posti aadressile.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge.<br>Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õiged?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Sinu parooli taastamise link saadetakse sulle e-postile." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Kasutajanimi" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Jah, ma tõesti soovin oma parooli praegu taastada" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Algseaded" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Sinu parool on taastatud" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Sisselogimise lehele" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Uus parool" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Nulli parool" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "Palun kontakteeru oma süsteemihalduriga." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Kaotasid oma parooli?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po index 7eebd7cedfc..6e2d56a50d5 100644 --- a/l10n/et_EE/files_encryption.po +++ b/l10n/et_EE/files_encryption.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014 +# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013-2014 # Rivo Zängov <eraser@eraser.ee>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-30 01:54-0400\n" -"PO-Revision-Date: 2014-05-29 15:18+0000\n" -"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,18 +82,18 @@ msgid "" "administrator" msgstr "Tundmatu viga. Palun võta ühendust oma administraatoriga." -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Nõutavad on puudu." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Järgmised kasutajad pole seadistatud krüpteeringuks:" @@ -106,12 +106,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Liigu otse oma" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "isiklikes seadetes" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po index 3074b3bb983..148750b1258 100644 --- a/l10n/et_EE/files_sharing.po +++ b/l10n/et_EE/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -19,15 +19,15 @@ msgstr "" "Language: et_EE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -43,18 +43,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Salvestatud" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Algseaded" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Jagas {owner}" @@ -119,19 +107,3 @@ msgstr "Laadi alla %s" #: templates/public.php:54 msgid "Direct link" msgstr "Otsene link" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Salvesta" diff --git a/l10n/eu/core.po b/l10n/eu/core.po index 0a603eed11b..a6934df52e6 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-09 01:54-0400\n" -"PO-Revision-Date: 2014-06-08 06:10+0000\n" -"Last-Translator: Alexander Gabilondo <alexgabi@openmailbox.org>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -171,54 +171,85 @@ msgstr "Audio" msgid "Saving..." msgstr "Gordetzen..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "segundu" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "orain dela minutu %n" msgstr[1] "orain dela %n minutu" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "orain dela ordu %n" msgstr[1] "orain dela %n ordu" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "gaur" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "atzo" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "orain dela egun %n" msgstr[1] "orain dela %n egun" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "joan den hilabetean" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "orain dela hilabete %n" msgstr[1] "orain dela %n hilabete" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "joan den urtean" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "urte" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Berrezarri pasahitza" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Bai" @@ -517,43 +548,40 @@ msgstr "Eguneraketak ez du arrakasta izan." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s pasahitza berrezarri" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Arazo bat gertatu da posta elektronikoa bidaltzerakoan, mesedez jarri harremanetan zure administrariarekin." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Erabiltzaile izena" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -561,30 +589,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Bai, nire pasahitza orain berrabiarazi nahi dut" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Berrezarri" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Zure pasahitza berrezarri da" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Sarrera orrira" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Pasahitz berria" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Berrezarri pasahitza" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -811,8 +830,8 @@ msgid "Please contact your administrator." msgstr "Mesedez jarri harremetan zure administradorearekin." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Galdu duzu pasahitza?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po index 501f4cebadf..f42e68a4071 100644 --- a/l10n/eu/files_encryption.po +++ b/l10n/eu/files_encryption.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-05 18:02+0000\n" -"Last-Translator: Mikel Olasagasti Uranga <mikel@olasagasti.info>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,18 +84,18 @@ msgid "" "administrator" msgstr "Errore ezezaguna. Mesedez, egiaztatu zure sistemaren ezarpenak edo jarri zure administrariarekin kontaktuan." -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Eskakizun batzuk ez dira betetzen." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago." -#: hooks/hooks.php:298 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:" @@ -108,12 +108,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Hasierako enkriptaketa abian... mesedez, saiatu beranduago." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Joan zuzenean zure" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "ezarpen pertsonalak" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po index 3cfabdb5595..92a525b2fb8 100644 --- a/l10n/eu/files_sharing.po +++ b/l10n/eu/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ msgstr "" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Gordeta" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Berrezarri" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "{owner}-k partekatuta" @@ -118,19 +106,3 @@ msgstr "Deskargatu %s" #: templates/public.php:54 msgid "Direct link" msgstr "Lotura zuzena" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Gorde" diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po index 15d969cad4a..ad95c6ea8d6 100644 --- a/l10n/eu_ES/core.po +++ b/l10n/eu_ES/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/eu_ES/files_encryption.po b/l10n/eu_ES/files_encryption.po index 8e95212ac7f..a33c33bb860 100644 --- a/l10n/eu_ES/files_encryption.po +++ b/l10n/eu_ES/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po index 8b53a55eac2..c5eaaaa1870 100644 --- a/l10n/eu_ES/files_sharing.po +++ b/l10n/eu_ES/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: eu_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Gorde" diff --git a/l10n/fa/core.po b/l10n/fa/core.po index 1000a7efc57..41809802488 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -169,50 +169,81 @@ msgstr "" msgid "Saving..." msgstr "در حال ذخیره سازی..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "ثانیهها پیش" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n دقیقه قبل" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n ساعت قبل" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "امروز" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "دیروز" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n روز قبل" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "ماه قبل" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n ماه قبل" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "سال قبل" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "سالهای قبل" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "دوباره سازی گذرواژه" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "بله" @@ -510,43 +541,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}" -#: lostpassword/templates/lostpassword.php:7 -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 "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "درخواست رد شده است !<br> آیا مطمئن هستید که ایمیل/ نام کاربری شما صحیح میباشد ؟" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "نام کاربری" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -554,30 +582,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم." -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "تنظیم مجدد" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "گذرواژه شما تغییرکرد" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "به صفحه ورود" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "گذرواژه جدید" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "دوباره سازی گذرواژه" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -804,8 +823,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "آیا گذرواژه تان را به یاد نمی آورید؟" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po index 06bb6685476..d73cade1cec 100644 --- a/l10n/fa/files_encryption.po +++ b/l10n/fa/files_encryption.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# miki_mika1362 <miki_mika1362@yahoo.com>, 2013 -# hajibaba <majid.hajibaba@gmail.com>, 2014 +# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013 +# majid hajibaba <majid.hajibaba@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -82,18 +82,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "نیازمندی های گمشده" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "کاربران زیر برای رمزنگاری تنظیم نشده اند" @@ -106,13 +106,10 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "تنظیمات شخصی" - #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" msgstr "رمزگذاری" diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po index 09d37ebe64f..6342f5d832a 100644 --- a/l10n/fa/files_sharing.po +++ b/l10n/fa/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -19,15 +19,15 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -43,18 +43,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "تنظیم مجدد" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "اشتراک گذارنده {owner}" @@ -119,19 +107,3 @@ msgstr "دانلود %s" #: templates/public.php:54 msgid "Direct link" msgstr "پیوند مستقیم" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "ذخیره" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index ef10f89adfb..cc608a7b392 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 06:40+0000\n" -"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -170,54 +170,85 @@ msgstr "Ääni" msgid "Saving..." msgstr "Tallennetaan..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sekuntia sitten" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuutti sitten" msgstr[1] "%n minuuttia sitten" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n tunti sitten" msgstr[1] "%n tuntia sitten" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "tänään" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "eilen" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n päivä sitten" msgstr[1] "%n päivää sitten" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "viime kuussa" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n kuukausi sitten" msgstr[1] "%n kuukautta sitten" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "viime vuonna" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "vuotta sitten" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Palauta salasana" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Kyllä" @@ -516,43 +547,40 @@ msgstr "Päivitys epäonnistui." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s salasanan nollaus" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Sähköpostia lähettäessä tapahtui virhe, ota yhteys järjestelmän ylläpitäjään." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Linkki salasanan nollaamiseen on lähetetty sähköpostiisi.<br>Jos et saa viestiä pian, tarkista roskapostikansiosi.<br>Jos et löydä viestiä roskapostinkaan seasta, ota yhteys ylläpitäjään." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Saat sähköpostitse linkin nollataksesi salasanan." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Käyttäjätunnus" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -560,30 +588,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Kyllä, haluan nollata salasanani nyt" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Nollaa salasana" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Salasanasi nollattiin" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Kirjautumissivulle" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Uusi salasana" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Palauta salasana" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -810,8 +829,8 @@ msgid "Please contact your administrator." msgstr "Ota yhteys ylläpitäjään." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Unohditko salasanasi?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po index d3f114f8c9a..e0160fd9cd5 100644 --- a/l10n/fi_FI/files_encryption.po +++ b/l10n/fi_FI/files_encryption.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# muro <janne.morsky@metropolia.fi>, 2013 +# Janne Mörsky <janne.morsky@metropolia.fi>, 2013 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2013-2014 -# nahka <nahkaz@gmail.com>, 2014 +# nahkaz <nahkaz@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-29 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 14:13+0000\n" -"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,18 +83,18 @@ msgid "" "administrator" msgstr "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään." -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Seuraavat käyttäjät eivät ole määrittäneet salausta:" @@ -107,13 +107,10 @@ msgid "Initial encryption running... Please try again later." msgstr "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "henkilökohtaiset asetukset" - #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" msgstr "Salaus" diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po index 93ce3af0b2a..a1c3e73b408 100644 --- a/l10n/fi_FI/files_sharing.po +++ b/l10n/fi_FI/files_sharing.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,15 +18,15 @@ msgstr "" "Language: fi_FI\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Jaettu kanssasi" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Jaettu muiden kanssa" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Jaettu linkin kautta" @@ -42,18 +42,6 @@ msgstr "Et ole jakanut yhtäkään tiedostoa vielä." msgid "You haven't shared any files by link yet." msgstr "Et ole vielä jakanut yhtäkään tiedostoa linkin kautta." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Mallipohjan lataaminen epäonnistui" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Tallennettu" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Nollaa salasana" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Jakanut {owner}" @@ -118,19 +106,3 @@ msgstr "Lataa %s" #: templates/public.php:54 msgid "Direct link" msgstr "Suora linkki" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Sähköpostimallit" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Teema" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Mallit" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Tallenna" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index 7b3fce78835..decb30e2466 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 06:40+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 23:10+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" @@ -48,15 +48,15 @@ msgstr "Sähköposti lähetetty" msgid "You need to set your user email before being able to send test emails." msgstr "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta." -#: admin/controller.php:116 templates/admin.php:353 +#: admin/controller.php:116 templates/admin.php:349 msgid "Send mode" msgstr "Lähetystila" -#: admin/controller.php:118 templates/admin.php:366 templates/personal.php:144 +#: admin/controller.php:118 templates/admin.php:362 templates/personal.php:144 msgid "Encryption" msgstr "Salaus" -#: admin/controller.php:120 templates/admin.php:390 +#: admin/controller.php:120 templates/admin.php:386 msgid "Authentication method" msgstr "Tunnistautumistapa" @@ -602,91 +602,91 @@ msgstr "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaa msgid "Security" msgstr "Tietoturva" -#: templates/admin.php:328 +#: templates/admin.php:326 msgid "Enforce HTTPS" msgstr "Pakota HTTPS" -#: templates/admin.php:330 +#: templates/admin.php:328 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." msgstr "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta." -#: templates/admin.php:336 +#: templates/admin.php:334 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." msgstr "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen." -#: templates/admin.php:348 +#: templates/admin.php:344 msgid "Email Server" msgstr "Sähköpostipalvelin" -#: templates/admin.php:350 +#: templates/admin.php:346 msgid "This is used for sending out notifications." msgstr "Tätä käytetään ilmoitusten lähettämiseen." -#: templates/admin.php:381 +#: templates/admin.php:377 msgid "From address" msgstr "Lähettäjän osoite" -#: templates/admin.php:382 +#: templates/admin.php:378 msgid "mail" msgstr "" -#: templates/admin.php:403 +#: templates/admin.php:399 msgid "Authentication required" msgstr "Tunnistautuminen vaaditaan" -#: templates/admin.php:407 +#: templates/admin.php:403 msgid "Server address" msgstr "Palvelimen osoite" -#: templates/admin.php:411 +#: templates/admin.php:407 msgid "Port" msgstr "Portti" -#: templates/admin.php:416 +#: templates/admin.php:412 msgid "Credentials" msgstr "Tilitiedot" -#: templates/admin.php:417 +#: templates/admin.php:413 msgid "SMTP Username" msgstr "SMTP-käyttäjätunnus" -#: templates/admin.php:420 +#: templates/admin.php:416 msgid "SMTP Password" msgstr "SMTP-salasana" -#: templates/admin.php:424 +#: templates/admin.php:420 msgid "Test email settings" msgstr "Testaa sähköpostiasetukset" -#: templates/admin.php:425 +#: templates/admin.php:421 msgid "Send email" msgstr "Lähetä sähköpostiviesti" -#: templates/admin.php:430 +#: templates/admin.php:426 msgid "Log" msgstr "Loki" -#: templates/admin.php:431 +#: templates/admin.php:427 msgid "Log level" msgstr "Lokitaso" -#: templates/admin.php:463 +#: templates/admin.php:459 msgid "More" msgstr "Enemmän" -#: templates/admin.php:464 +#: templates/admin.php:460 msgid "Less" msgstr "Vähemmän" -#: templates/admin.php:470 templates/personal.php:196 +#: templates/admin.php:466 templates/personal.php:196 msgid "Version" msgstr "Versio" -#: templates/admin.php:474 templates/personal.php:199 +#: templates/admin.php:470 templates/personal.php:199 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -826,7 +826,7 @@ msgstr "Poista kuva" #: templates/personal.php:98 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "Joko png- tai jpg-kuva. Mieluite neliö, voit kuitenkin rajata kuvaa." +msgstr "Joko png- tai jpg-kuva. Mieluiten neliö, voit kuitenkin rajata kuvaa." #: templates/personal.php:100 msgid "Your avatar is provided by your original account." diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 83606db4148..3d5029e06db 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -178,54 +178,85 @@ msgstr "" msgid "Saving..." msgstr "Enregistrement..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "il y a quelques secondes" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "il y a %n minute" msgstr[1] "il y a %n minutes" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Il y a %n heure" msgstr[1] "Il y a %n heures" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "aujourd'hui" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "hier" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "il y a %n jour" msgstr[1] "il y a %n jours" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "le mois dernier" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Il y a %n mois" msgstr[1] "Il y a %n mois" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "l'année dernière" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "il y a plusieurs années" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Réinitialiser le mot de passe" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Oui" @@ -524,43 +555,40 @@ msgstr "La mise à jour a échoué." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "Réinitialisation de votre mot de passe %s" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez contacter votre administrateur." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nom d'utilisateur" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -568,30 +596,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Oui, je veux vraiment réinitialiser mon mot de passe maintenant" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Réinitialiser" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Votre mot de passe a été réinitialisé" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Retour à la page d'authentification" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nouveau mot de passe" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Réinitialiser le mot de passe" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -818,8 +837,8 @@ msgid "Please contact your administrator." msgstr "Veuillez contacter votre administrateur." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Mot de passe perdu ?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po index 62b7334466c..68c87691d2c 100644 --- a/l10n/fr/files_encryption.po +++ b/l10n/fr/files_encryption.po @@ -5,17 +5,17 @@ # Translators: # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013 # Christophe Lherieau <skimpax@gmail.com>, 2013-2014 -# etiess <etiess@gmail.com>, 2013 -# froozeify <froozeify@mail.com>, 2013 -# lyly95, 2013 -# ogre_sympathique, 2013-2014 +# Etienne <etiess@gmail.com>, 2013 +# Froozeify <froozeify@mail.com>, 2013 +# Lynda AMICHE, 2013 +# Ogre Sympathique, 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-31 01:54-0400\n" -"PO-Revision-Date: 2014-05-30 08:51+0000\n" -"Last-Translator: ogre_sympathique\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -86,18 +86,18 @@ msgid "" "administrator" msgstr "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter un administrateur." -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Système minimum requis non respecté." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :" @@ -110,12 +110,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Chiffrement initial en cours... Veuillez re-essayer ultérieurement." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Allez directement à votre" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "paramètres personnel" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po index 3cace798a41..05492456cde 100644 --- a/l10n/fr/files_sharing.po +++ b/l10n/fr/files_sharing.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -23,15 +23,15 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Partagé avec vous" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Partagé avec d'autres" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Partagé par lien" @@ -47,18 +47,6 @@ msgstr "Vous ne partagez pas de fichier pour l'instant" msgid "You haven't shared any files by link yet." msgstr "Vous ne partagez aucun de fichier par lien pour l'instant." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Impossible de charger le modèle" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Sauvegarder" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Réinitialiser" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Partagé par {owner}" @@ -123,19 +111,3 @@ msgstr "Télécharger %s" #: templates/public.php:54 msgid "Direct link" msgstr "Lien direct" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Modèles de courriels" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Thème" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Modèles" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Sauvegarder" diff --git a/l10n/fr_CA/core.po b/l10n/fr_CA/core.po index dd5c12b1f26..56335144f04 100644 --- a/l10n/fr_CA/core.po +++ b/l10n/fr_CA/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/fr_CA/files_encryption.po b/l10n/fr_CA/files_encryption.po index 7a9fa82571e..3c19eb7d0c0 100644 --- a/l10n/fr_CA/files_encryption.po +++ b/l10n/fr_CA/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/fr_CA/files_sharing.po b/l10n/fr_CA/files_sharing.po index 40a65336415..60ac7eb0691 100644 --- a/l10n/fr_CA/files_sharing.po +++ b/l10n/fr_CA/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index 4a2ed580c81..2981ff5cc59 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 08:02+0000\n" -"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -169,54 +169,85 @@ msgstr "Son" msgid "Saving..." msgstr "Gardando..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "hai %n minuto" msgstr[1] "vai %n minutos" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "hai %n hora" msgstr[1] "vai %n horas" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "hoxe" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "onte" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "hai %n día" msgstr[1] "vai %n días" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "último mes" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "hai %n mes" msgstr[1] "vai %n meses" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "último ano" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "anos atrás" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Restabelecer o contrasinal" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Si" @@ -515,43 +546,40 @@ msgstr "A actualización foi satisfactoria." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "Restabelecer o contrasinal %s" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Produciuse un problema ao mesmo tempo que enviaba o correo, póñase en contacto co administrador." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Usa a seguinte ligazón para restabelecer o contrasinal: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Envióuselle ao seu correo unha ligazón para restabelecer o seu contrasinal.<br>Se non o recibe nun prazo razoábel de tempo, revise o seu cartafol de correo lixo ou de non desexados.<br> Se non o atopa aí pregúntelle ao seu administrador local.." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Non foi posíbel facer a petición!<br>Asegúrese de que o seu enderezo de correo ou nome de usuario é correcto." - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Recibirá unha ligazón por correo para restabelecer o contrasinal" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nome de usuario" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Si, confirmo que quero restabelecer agora o meu contrasinal" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Restabelecer" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "O contrasinal foi restabelecido" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "A páxina de conexión" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Novo contrasinal" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Restabelecer o contrasinal" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "Contacte co administrador." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Perdeu o contrasinal?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po index b99b5ae269b..7a8bac36ea5 100644 --- a/l10n/gl/files_encryption.po +++ b/l10n/gl/files_encryption.po @@ -3,17 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# mbouzada <mbouzada@gmail.com>, 2013 -# mbouzada <mbouzada@gmail.com>, 2013 -# mbouzada <mbouzada@gmail.com>, 2013-2014 +# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013 +# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013 +# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013-2014 # Xosé M. Lamas <correo.xmgz@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-04 01:54-0400\n" -"PO-Revision-Date: 2014-06-03 10:11+0000\n" -"Last-Translator: mbouzada <mbouzada@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 09:30+0000\n" +"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,18 +84,18 @@ msgid "" "administrator" msgstr "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou contacte co administrador" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Non se cumpren os requisitos." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de que o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado." -#: hooks/hooks.php:296 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Os seguintes usuarios non teñen configuración para o cifrado:" @@ -108,12 +108,9 @@ msgid "Initial encryption running... Please try again later." msgstr "O cifrado inicial está en execución... Tenteo máis tarde." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Vaia directamente ao seu" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "axustes persoais" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "Vaia directamente aos seus %saxustes persoais%s." #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po index 4184e60a2ed..ec7accc89b2 100644 --- a/l10n/gl/files_sharing.po +++ b/l10n/gl/files_sharing.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 08:04+0000\n" -"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +19,15 @@ msgstr "" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Compartido con vostede" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Compartido con outros" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Compartido por ligazón" @@ -43,18 +43,6 @@ msgstr "Aínda non compartiu ningún ficheiro." msgid "You haven't shared any files by link yet." msgstr "Aínda non compartiu ningún ficheiro por ligazón." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Non foi posíbel cargar o modelo" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Gardado" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Restabelecer" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Compartido por {owner}" @@ -119,19 +107,3 @@ msgstr "Descargar %s" #: templates/public.php:54 msgid "Direct link" msgstr "Ligazón directa" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Modelos de correo" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Tema" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Modelo" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Gardar" diff --git a/l10n/he/core.po b/l10n/he/core.po index 900bf99e232..0c2141fb6ab 100644 --- a/l10n/he/core.po +++ b/l10n/he/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -169,54 +169,85 @@ msgstr "" msgid "Saving..." msgstr "שמירה…" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "שניות" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "לפני %n דקה" msgstr[1] "לפני %n דקות" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "לפני %n שעה" msgstr[1] "לפני %n שעות" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "היום" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "אתמול" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "לפני %n יום" msgstr[1] "לפני %n ימים" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "חודש שעבר" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "לפני %n חודש" msgstr[1] "לפני %n חודשים" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "שנה שעברה" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "שנים" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "איפוס ססמה" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "כן" @@ -515,43 +546,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "הקישור לאיפוס הססמה שלך נשלח אליך בדוא״ל.<br>אם לא קיבלת את הקישור תוך זמן סביר, מוטב לבדוק את תיבת הזבל שלך.<br>אם ההודעה לא שם, כדאי לשאול את מנהל הרשת שלך ." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "הבקשה נכשלה!<br>האם כתובת הדוא״ל/שם המשתמש שלך נכונים?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "שם משתמש" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "כן, אני רוצה לאפס את הסיסמה שלי עכשיו." -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "הססמה שלך אופסה" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "לדף הכניסה" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "ססמה חדשה" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "איפוס ססמה" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "שכחת את ססמתך?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po index 264c161a9f5..89d1a935278 100644 --- a/l10n/he/files_encryption.po +++ b/l10n/he/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po index ff206b8440a..d1d3048d6b0 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "שותף בידי {owner}" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "שמירה" diff --git a/l10n/hi/core.po b/l10n/hi/core.po index a5707aef3cc..419eae3774b 100644 --- a/l10n/hi/core.po +++ b/l10n/hi/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -169,54 +169,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -515,43 +546,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "प्रयोक्ता का नाम" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,29 +587,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "आपका पासवर्ड बदला गया है" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "नया पासवर्ड" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -809,7 +828,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po index 53023152cba..8867cb396b4 100644 --- a/l10n/hi/files_encryption.po +++ b/l10n/hi/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po index 991c82dcf4e..007b47518ed 100644 --- a/l10n/hi/files_sharing.po +++ b/l10n/hi/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "सहेजें" diff --git a/l10n/hi_IN/core.po b/l10n/hi_IN/core.po index f2cc990566c..a6cfc6b8468 100644 --- a/l10n/hi_IN/core.po +++ b/l10n/hi_IN/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/hi_IN/files_encryption.po b/l10n/hi_IN/files_encryption.po index 2e3ec67f708..f777f394a86 100644 --- a/l10n/hi_IN/files_encryption.po +++ b/l10n/hi_IN/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/hi_IN/files_sharing.po b/l10n/hi_IN/files_sharing.po index 9ad9419cda0..8a5681c6e0a 100644 --- a/l10n/hi_IN/files_sharing.po +++ b/l10n/hi_IN/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: hi_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/hr/core.po b/l10n/hr/core.po index f620afecf4c..ac58b8645e4 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -167,58 +167,89 @@ msgstr "" msgid "Saving..." msgstr "Spremanje..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sekundi prije" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "danas" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "jučer" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "prošli mjesec" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "prošlu godinu" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "godina" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Poništavanje lozinke" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Da" @@ -518,43 +549,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "Koristite ovaj link da biste poništili lozinku: {link}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "Koristite ovaj link da biste poništili lozinku: {link}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Primit ćete link kako biste poništili zaporku putem e-maila." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Korisničko ime" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -562,30 +590,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Vaša lozinka je resetirana" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Idi na stranicu za prijavu" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nova lozinka" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Poništavanje lozinke" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -812,8 +831,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Izgubili ste lozinku?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po index 99329d32d46..4a7fc0b0646 100644 --- a/l10n/hr/files_encryption.po +++ b/l10n/hr/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po index 7c5c042efaa..92f1fafbfc8 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ 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" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Snimi" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index e0f03d94d31..1868aedd6f4 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -44,12 +44,12 @@ msgstr "Az adatbázis frissítése megtörtént" #: ajax/update.php:19 msgid "Checked database schema update" -msgstr "" +msgstr "Az adatbázis séma frissítését ellenőrztük" #: ajax/update.php:27 #, php-format msgid "Disabled incompatible apps: %s" -msgstr "" +msgstr "Letiltásra került inkompatibilis alkalmazások: %s" #: avatar/controller.php:69 msgid "No image or file provided" @@ -161,64 +161,95 @@ msgstr "Mappa" #: js/js.js:592 msgid "Image" -msgstr "" +msgstr "Kép" #: js/js.js:593 msgid "Audio" -msgstr "" +msgstr "Hang" #: js/js.js:607 msgid "Saving..." msgstr "Mentés..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "pár másodperce" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n perccel ezelőtt" msgstr[1] "%n perccel ezelőtt" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n órával ezelőtt" msgstr[1] "%n órával ezelőtt" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "ma" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "tegnap" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n nappal ezelőtt" msgstr[1] "%n nappal ezelőtt" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "múlt hónapban" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n hónappal ezelőtt" msgstr[1] "%n hónappal ezelőtt" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "tavaly" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "több éve" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Jelszó-visszaállítás" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Igen" @@ -321,7 +352,7 @@ msgstr "Megosztotta: {owner}" #: js/share.js:205 msgid "Shared with {recipients}" -msgstr "" +msgstr "Megosztva ővelük: {recipients}" #: js/share.js:211 msgid "Share" @@ -503,7 +534,7 @@ msgstr "Nincs törlésre kijelölt címke." #: js/update.js:30 msgid "Updating {productName} to version {version}, this may take a while." -msgstr "" +msgstr " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig." #: js/update.js:43 msgid "Please reload the page." @@ -511,49 +542,46 @@ msgstr "Kérjük frissítse az oldalt!" #: js/update.js:52 msgid "The update was unsuccessful." -msgstr "" +msgstr "A frissítés nem sikerült." #: js/update.js:61 msgid "The update was successful. Redirecting you to ownCloud now." msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s jelszó visszaállítás" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Hiba történt e-mail küldése közben. Érdemes az adminisztrátort értesíteni." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Használja ezt a linket a jelszó ismételt beállításához: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Emailben fog kapni egy linket, amivel új jelszót tud majd beállítani magának. <br>Ha a levél nem jött meg, holott úgy érzi, hogy már meg kellett volna érkeznie, akkor ellenőrizze a spam/levélszemét mappáját. <br>Ha ott sincsen, akkor érdeklődjön a rendszergazdánál." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Felhasználónév" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -561,30 +589,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Igen, tényleg meg akarom változtatni a jelszavam" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Visszaállítás" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "A jelszava megváltozott" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "A bejelentkező ablakhoz" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Az új jelszó" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Jelszó-visszaállítás" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -736,7 +755,7 @@ msgstr "Adatbázis konfigurálása" #: templates/installation.php:96 #, php-format msgid "Only %s is available." -msgstr "" +msgstr "Csak %s érhető el." #: templates/installation.php:111 templates/installation.php:113 msgid "Database user" @@ -762,7 +781,7 @@ msgstr "Adatbázis szerver" msgid "" "SQLite will be used as database. For larger installations we recommend to " "change this." -msgstr "" +msgstr "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy változtassa meg ezt a beállítást." #: templates/installation.php:159 msgid "Finish setup" @@ -811,8 +830,8 @@ msgid "Please contact your administrator." msgstr "Kérjük, lépjen kapcsolatba a rendszergazdával." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Elfelejtette a jelszavát?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" @@ -854,26 +873,26 @@ msgstr "Köszönjük a türelmét." #: templates/update.admin.php:3 #, php-format msgid "%s will be updated to version %s." -msgstr "" +msgstr "%s frissítődni fog erre a verzióra: %s." #: templates/update.admin.php:7 msgid "The following apps will be disabled:" -msgstr "" +msgstr "A következő alkalmazások lesznek letiltva:" #: templates/update.admin.php:17 #, php-format msgid "The theme %s has been disabled." -msgstr "" +msgstr "Ez a smink: %s letiltásra került." #: templates/update.admin.php:21 msgid "" "Please make sure that the database, the config folder and the data folder " "have been backed up before proceeding." -msgstr "" +msgstr "Kérjük gondoskodjon róla, hogy elmentse az adatbázist, a konfigurációs mappa és az adatamappa tartalmát, mielőtt folytatja." #: templates/update.admin.php:23 msgid "Start update" -msgstr "" +msgstr "A frissítés megkezdése" #: templates/update.user.php:3 msgid "" diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index ef20b107282..b742ae7940a 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -4,14 +4,14 @@ # # Translators: # ebela <bela@dandre.hu>, 2013 -# Laszlo Tornoci <torlasz@gmail.com>, 2013 +# Laszlo Tornoci <torlasz@gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 20:00+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +36,7 @@ msgstr "A fájlnév nem lehet semmi." #: ajax/newfile.php:63 #, php-format msgid "\"%s\" is an invalid file name." -msgstr "" +msgstr "\"%s\" érvénytelen, mint fájlnév." #: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110 msgid "" @@ -47,7 +47,7 @@ msgstr "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/ #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157 #: lib/app.php:77 msgid "The target folder has been moved or deleted." -msgstr "" +msgstr "A célmappa törlődött, vagy áthelyezésre került." #: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86 #, php-format @@ -147,7 +147,7 @@ msgstr "Fájlok" #: appinfo/app.php:27 msgid "All files" -msgstr "" +msgstr "Az összes állomány" #: js/file-upload.js:257 msgid "Unable to upload {filename} as it is a directory or has 0 bytes" @@ -155,12 +155,12 @@ msgstr "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, v #: js/file-upload.js:270 msgid "Total file size {size1} exceeds upload limit {size2}" -msgstr "" +msgstr "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}" #: js/file-upload.js:281 msgid "" "Not enough free space, you are uploading {size1} but only {size2} is left" -msgstr "" +msgstr "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}." #: js/file-upload.js:358 msgid "Upload cancelled." @@ -179,7 +179,7 @@ msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a fel msgid "URL cannot be empty" msgstr "Az URL-cím nem maradhat kitöltetlenül" -#: js/file-upload.js:559 js/filelist.js:1188 +#: js/file-upload.js:559 js/filelist.js:1190 msgid "{new_name} already exists" msgstr "{new_name} már létezik" @@ -217,55 +217,55 @@ msgid "" "big." msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok." -#: js/filelist.js:619 js/filelist.js:1691 +#: js/filelist.js:621 js/filelist.js:1693 msgid "Pending" msgstr "Folyamatban" -#: js/filelist.js:1139 +#: js/filelist.js:1141 msgid "Error moving file." -msgstr "" +msgstr "Hiba történt a fájl áthelyezése közben." -#: js/filelist.js:1147 +#: js/filelist.js:1149 msgid "Error moving file" msgstr "Az állomány áthelyezése nem sikerült." -#: js/filelist.js:1147 +#: js/filelist.js:1149 msgid "Error" msgstr "Hiba" -#: js/filelist.js:1225 +#: js/filelist.js:1227 msgid "Could not rename file" msgstr "Az állomány nem nevezhető át" -#: js/filelist.js:1346 +#: js/filelist.js:1348 msgid "Error deleting file." msgstr "Hiba a file törlése közben." -#: js/filelist.js:1449 templates/list.php:62 +#: js/filelist.js:1451 templates/list.php:62 msgid "Name" msgstr "Név" -#: js/filelist.js:1450 templates/list.php:73 +#: js/filelist.js:1452 templates/list.php:73 msgid "Size" msgstr "Méret" -#: js/filelist.js:1451 templates/list.php:76 +#: js/filelist.js:1453 templates/list.php:76 msgid "Modified" msgstr "Módosítva" -#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168 +#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mappa" msgstr[1] "%n mappa" -#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169 +#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n állomány" msgstr[1] "%n állomány" -#: js/filelist.js:1599 js/filelist.js:1638 +#: js/filelist.js:1601 js/filelist.js:1640 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n állomány feltöltése" @@ -273,7 +273,7 @@ msgstr[1] "%n állomány feltöltése" #: js/files.js:101 msgid "\"{name}\" is an invalid file name." -msgstr "" +msgstr "\"{name}\" érvénytelen, mint fájlnév." #: js/files.js:122 msgid "Your storage is full, files can not be updated or synced anymore!" @@ -314,7 +314,7 @@ msgstr "%s átnevezése nem sikerült" #: lib/helper.php:23 templates/list.php:25 #, php-format msgid "Upload (max. %s)" -msgstr "" +msgstr "Feltöltés (max. %s)" #: templates/admin.php:6 msgid "File handling" @@ -341,7 +341,7 @@ msgstr "WebDAV" msgid "" "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via " "WebDAV</a>" -msgstr "Ezt a címet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>" +msgstr "Ezt a címet használja, ha <a href=\"%s\" target=\"_blank\">WebDAV-on keresztül szeretné elérni a fájljait</a>" #: templates/list.php:5 msgid "New" @@ -399,4 +399,4 @@ msgstr "A fájllista ellenőrzése zajlik, kis türelmet!" #: templates/list.php:102 msgid "Currently scanning" -msgstr "" +msgstr "Mappaellenőrzés: " diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po index acbee89e1a8..51041282a9a 100644 --- a/l10n/hu_HU/files_encryption.po +++ b/l10n/hu_HU/files_encryption.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# blackc0de <complic@vipmail.hu>, 2013 +# Ádám Matisz <complic@vipmail.hu>, 2013 # ebela <bela@dandre.hu>, 2013 # Laszlo Tornoci <torlasz@gmail.com>, 2013 -# osztraksajt <osztraksajt@gmail.com>, 2014 +# Tivadar Sáfrány <osztraksajt@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -84,18 +84,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Hiányzó követelmények." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Kérem gondoskodjon arról, hogy PHP 5.3.3 vagy annál frissebb legyen telepítve, továbbá az OpenSSL a megfelelő PHP-bővítménnyel együtt rendelkezésre álljon és helyesen legyen konfigurálva! A titkosító modul egyelőre kikapcsolásra került." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "A következő felhasználók nem állították be a titkosítást:" @@ -108,12 +108,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Kezedeti titkosítás fut... Próbálja később." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Ugrás ide:" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "személyes beállítások" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po index 244274e6d38..03162e2334b 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 20:20+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "Külső tárolók" #: appinfo/app.php:45 msgid "Local" -msgstr "" +msgstr "Helyi" #: appinfo/app.php:48 msgid "Location" diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po index 2c92225ab52..816efd26c48 100644 --- a/l10n/hu_HU/files_sharing.po +++ b/l10n/hu_HU/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ msgstr "" "Language: hu_HU\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Elmentve" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Visszaállítás" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Megosztotta: {owner}" @@ -118,19 +106,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "Közvetlen link" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Mentés" diff --git a/l10n/hy/core.po b/l10n/hy/core.po index bc83530603e..7dc7b09da30 100644 --- a/l10n/hy/core.po +++ b/l10n/hy/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po index 3e24ddda16b..5d4b66745bc 100644 --- a/l10n/hy/files_encryption.po +++ b/l10n/hy/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po index 44d71f14b93..567c47a2664 100644 --- a/l10n/hy/files_sharing.po +++ b/l10n/hy/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: hy\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Պահպանել" diff --git a/l10n/ia/core.po b/l10n/ia/core.po index 4f01480e21b..8f9e2a9b21d 100644 --- a/l10n/ia/core.po +++ b/l10n/ia/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "Salveguardante..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "secundas passate" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuta passate" msgstr[1] "%n minutas passate" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n hora passate" msgstr[1] "%n horas passate" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "hodie" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "heri" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "ultime mense" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "ultime anno" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "annos passate" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Reinitialisar contrasigno" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Si" @@ -514,43 +545,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Le actualisation terminava con successo. On redirige nunc a tu ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s contrasigno re-fixate" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Un problema ha occurrite quando on inviava le message de e-posta, pro favor continge tu administrator." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "" - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nomine de usator" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,30 +586,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Re-fixar" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Tu contrasigno esseva reinitialisate" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "al pagina de initio de session" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nove contrasigno" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Reinitialisar contrasigno" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -808,8 +827,8 @@ msgid "Please contact your administrator." msgstr "Pro favor continge tu administrator." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Tu perdeva le contrasigno?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po index 177892043c6..01b58c8bc81 100644 --- a/l10n/ia/files_encryption.po +++ b/l10n/ia/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po index ce4f19bb9d6..81ad96f92dd 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Re-fixar" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Salveguardar" diff --git a/l10n/id/core.po b/l10n/id/core.po index 56d378bf8bb..89c14d67968 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -168,50 +168,81 @@ msgstr "" msgid "Saving..." msgstr "Menyimpan..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "beberapa detik yang lalu" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n menit yang lalu" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n jam yang lalu" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "hari ini" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "kemarin" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n hari yang lalu" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "bulan kemarin" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n bulan yang lalu" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "tahun kemarin" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "beberapa tahun lalu" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Atur ulang sandi" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ya" @@ -509,43 +540,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s sandi diatur ulang" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Terjadi masalah saat mengirim email, silakan hubungi administrator Anda." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Tautan untuk mengatur ulang sandi anda telah dikirimkan ke email Anda.<br>Jika anda tidak menerimanya selama waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada juga, coba tanyakanlah kepada administrator lokal anda." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Permintaan gagal!<br>Apakah anda yakin email/nama pengguna anda benar?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Anda akan menerima tautan penyetelan ulang sandi lewat Email." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nama pengguna" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -553,30 +581,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Atur Ulang" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Sandi Anda telah diatur ulang" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Ke halaman masuk" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Sandi baru" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Atur ulang sandi" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -803,8 +822,8 @@ msgid "Please contact your administrator." msgstr "Silahkan hubungi administrator anda." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Lupa sandi?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po index 5da1618c800..637c3f60bb0 100644 --- a/l10n/id/files_encryption.po +++ b/l10n/id/files_encryption.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -81,18 +81,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Persyaratan yang hilang." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Pengguna berikut belum diatur untuk enkripsi:" @@ -105,12 +105,9 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Langsung ke anda" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "pengaturan pribadi" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po index 6a73c58e58f..53fc2de1033 100644 --- a/l10n/id/files_sharing.po +++ b/l10n/id/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Disimpan" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Atur Ulang" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Dibagikan oleh {owner}" @@ -118,19 +106,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "Tautan langsung" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Simpan" diff --git a/l10n/is/core.po b/l10n/is/core.po index f46a06c41bb..61e0d2588b7 100644 --- a/l10n/is/core.po +++ b/l10n/is/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "Er að vista ..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sek." -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "í dag" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "í gær" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "síðasta mánuði" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "síðasta ári" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "einhverjum árum" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Endursetja lykilorð" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Já" @@ -514,43 +545,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Notendanafn" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,30 +586,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Lykilorðið þitt hefur verið endursett." - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Fara á innskráningarsíðu" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nýtt lykilorð" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Endursetja lykilorð" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -808,8 +827,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Týndir þú lykilorðinu?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po index e70f833e702..76481271c47 100644 --- a/l10n/is/files_encryption.po +++ b/l10n/is/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po index ace3e63c5ba..fa3cd50e184 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Vista" diff --git a/l10n/it/core.po b/l10n/it/core.po index 5757ed911d4..6120a5a270c 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 07:10+0000\n" -"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -171,54 +171,85 @@ msgstr "Audio" msgid "Saving..." msgstr "Salvataggio in corso..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "secondi fa" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuto fa" msgstr[1] "%n minuti fa" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n ora fa" msgstr[1] "%n ore fa" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "oggi" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ieri" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n giorno fa" msgstr[1] "%n giorni fa" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "mese scorso" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n mese fa" msgstr[1] "%n mesi fa" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "anno scorso" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "anni fa" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Ripristina la password" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Sì" @@ -517,43 +548,40 @@ msgstr "L'aggiornamento non è riuscito." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "Ripristino password di %s" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Si è verificato un problema durante l'invio della email, contatta il tuo amministratore." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Usa il collegamento seguente per ripristinare la password: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Il collegamento per ripristinare la password è stato inviato al tuo indirizzo di posta.<br>Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Riceverai un collegamento per ripristinare la tua password via email" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nome utente" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -561,30 +589,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Sì, voglio davvero ripristinare la mia password adesso" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Ripristina" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "La password è stata ripristinata" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Alla pagina di accesso" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nuova password" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Ripristina la password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -811,8 +830,8 @@ msgid "Please contact your administrator." msgstr "Contatta il tuo amministratore di sistema." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Hai perso la password?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po index 703c8cc7f0c..ae1e6890119 100644 --- a/l10n/it/files_encryption.po +++ b/l10n/it/files_encryption.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-29 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 17:32+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 07:40+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" @@ -83,18 +83,18 @@ msgid "" "administrator" msgstr "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Requisiti mancanti." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "I seguenti utenti non sono configurati per la cifratura:" @@ -107,12 +107,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Cifratura iniziale in esecuzione... Riprova più tardi." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Passa direttamente a" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "impostazioni personali" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "Vai direttamente alle tue %simpostazioni personali%s." #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po index 264adc57ae5..c25051b9100 100644 --- a/l10n/it/files_sharing.po +++ b/l10n/it/files_sharing.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +19,15 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Condiviso con te" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Condiviso con altri" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Condiviso tramite collegamento" @@ -43,18 +43,6 @@ msgstr "Non hai ancora condiviso alcun file." msgid "You haven't shared any files by link yet." msgstr "Non hai ancora condiviso alcun file tramite collegamento." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Impossibile caricare il modello" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Salvato" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Ripristina" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Condiviso da {owner}" @@ -119,19 +107,3 @@ msgstr "Scarica %s" #: templates/public.php:54 msgid "Direct link" msgstr "Collegamento diretto" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Modelli di messaggio" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Tema" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Modello" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Salva" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index 7ba579ee1a6..a3c7f08cae6 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-11 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 07:40+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,15 +51,15 @@ msgstr "Email inviata" msgid "You need to set your user email before being able to send test emails." msgstr "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email." -#: admin/controller.php:116 templates/admin.php:353 +#: admin/controller.php:116 templates/admin.php:349 msgid "Send mode" msgstr "Modalità di invio" -#: admin/controller.php:118 templates/admin.php:366 templates/personal.php:144 +#: admin/controller.php:118 templates/admin.php:362 templates/personal.php:144 msgid "Encryption" msgstr "Cifratura" -#: admin/controller.php:120 templates/admin.php:390 +#: admin/controller.php:120 templates/admin.php:386 msgid "Authentication method" msgstr "Metodo di autenticazione" @@ -287,7 +287,7 @@ msgstr "Ripristina le chiavi di cifratura." #: js/users/deleteHandler.js:166 msgid "Unable to delete {objName}" -msgstr "" +msgstr "Impossibile eliminare {objName}" #: js/users/groups.js:73 js/users/groups.js:178 msgid "Error creating group" @@ -299,7 +299,7 @@ msgstr "Deve essere fornito un nome valido per il gruppo" #: js/users/groups.js:205 msgid "deleted {groupName}" -msgstr "" +msgstr "{groupName} eliminato" #: js/users/groups.js:206 js/users/users.js:255 msgid "undo" @@ -327,7 +327,7 @@ msgstr "mai" #: js/users/users.js:254 msgid "deleted {userName}" -msgstr "" +msgstr "{userName} eliminato" #: js/users/users.js:371 msgid "add group" @@ -605,91 +605,91 @@ msgstr "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarl msgid "Security" msgstr "Protezione" -#: templates/admin.php:328 +#: templates/admin.php:326 msgid "Enforce HTTPS" msgstr "Forza HTTPS" -#: templates/admin.php:330 +#: templates/admin.php:328 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." msgstr "Forza i client a connettersi a %s tramite una connessione cifrata." -#: templates/admin.php:336 +#: templates/admin.php:334 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." msgstr "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL." -#: templates/admin.php:348 +#: templates/admin.php:344 msgid "Email Server" msgstr "Server di posta" -#: templates/admin.php:350 +#: templates/admin.php:346 msgid "This is used for sending out notifications." msgstr "Viene utilizzato per inviare le notifiche." -#: templates/admin.php:381 +#: templates/admin.php:377 msgid "From address" msgstr "Indirizzo mittente" -#: templates/admin.php:382 +#: templates/admin.php:378 msgid "mail" msgstr "posta" -#: templates/admin.php:403 +#: templates/admin.php:399 msgid "Authentication required" msgstr "Autenticazione richiesta" -#: templates/admin.php:407 +#: templates/admin.php:403 msgid "Server address" msgstr "Indirizzo del server" -#: templates/admin.php:411 +#: templates/admin.php:407 msgid "Port" msgstr "Porta" -#: templates/admin.php:416 +#: templates/admin.php:412 msgid "Credentials" msgstr "Credenziali" -#: templates/admin.php:417 +#: templates/admin.php:413 msgid "SMTP Username" msgstr "Nome utente SMTP" -#: templates/admin.php:420 +#: templates/admin.php:416 msgid "SMTP Password" msgstr "Password SMTP" -#: templates/admin.php:424 +#: templates/admin.php:420 msgid "Test email settings" msgstr "Prova impostazioni email" -#: templates/admin.php:425 +#: templates/admin.php:421 msgid "Send email" msgstr "Invia email" -#: templates/admin.php:430 +#: templates/admin.php:426 msgid "Log" msgstr "Log" -#: templates/admin.php:431 +#: templates/admin.php:427 msgid "Log level" msgstr "Livello di log" -#: templates/admin.php:463 +#: templates/admin.php:459 msgid "More" msgstr "Altro" -#: templates/admin.php:464 +#: templates/admin.php:460 msgid "Less" msgstr "Meno" -#: templates/admin.php:470 templates/personal.php:196 +#: templates/admin.php:466 templates/personal.php:196 msgid "Version" msgstr "Versione" -#: templates/admin.php:474 templates/personal.php:199 +#: templates/admin.php:470 templates/personal.php:199 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " diff --git a/l10n/ja/core.po b/l10n/ja/core.po index 5df4c22d0c3..2e10bc90884 100644 --- a/l10n/ja/core.po +++ b/l10n/ja/core.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-10 01:54-0400\n" -"PO-Revision-Date: 2014-06-10 03:00+0000\n" -"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -174,50 +174,81 @@ msgstr "オーディオ" msgid "Saving..." msgstr "保存中..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "数秒前" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分前" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 時間前" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "今日" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "昨日" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n日前" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "1ヶ月前" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%nヶ月前" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "1年前" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "数年前" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "パスワードをリセット" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "はい" @@ -515,43 +546,40 @@ msgstr "アップデートに失敗しました。" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "アップデートに成功しました。今すぐownCloudにリダイレクトします。" -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s パスワードリセット" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "メールの送信中に問題が発生しました。管理者に問い合わせください。" - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "パスワードをリセットするには次のリンクをクリックしてください: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "パスワードリセットのリンクをあなたのメールアドレスに送信しました。<br>しばらくたっても受信できない場合は、スパム／迷惑メールフォルダーを確認してください。<br>もしそこにもない場合は、管理者に問い合わせてください。" - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "リクエストに失敗しました！<br>あなたのメール／ユーザー名が正しいことを確認しましたか？" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "メールでパスワードをリセットするリンクが届きます。" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "ユーザー名" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "はい、今すぐパスワードをリセットします。" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "リセット" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "あなたのパスワードはリセットされました。" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "ログインページへ戻る" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "新しいパスワードを入力" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "パスワードをリセット" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "管理者に問い合わせてください。" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "パスワードを忘れましたか？" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ja/files_encryption.po b/l10n/ja/files_encryption.po index faf97f7fb42..33866da79d9 100644 --- a/l10n/ja/files_encryption.po +++ b/l10n/ja/files_encryption.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-05 01:54-0400\n" -"PO-Revision-Date: 2014-06-04 17:31+0000\n" -"Last-Translator: kuromabo <md81bird@hitaki.net>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -84,18 +84,18 @@ msgid "" "administrator" msgstr "不明なエラーです。システム設定を確認するか、管理者に問い合わせてください。" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "必要要件が満たされていません。" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。" -#: hooks/hooks.php:298 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "以下のユーザーは、暗号化設定がされていません：" @@ -108,12 +108,9 @@ msgid "Initial encryption running... Please try again later." msgstr "初期暗号化実行中... 後でもう一度お試しください。" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "あなたのディレクトリへ" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "秘密鍵をアンロックできます" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/ja/files_sharing.po b/l10n/ja/files_sharing.po index bb7ca9c3adf..e016f6bda8a 100644 --- a/l10n/ja/files_sharing.po +++ b/l10n/ja/files_sharing.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: YANO Tetsu <tetuyano+transi@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -22,15 +22,15 @@ msgstr "" "Language: ja_JP\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "あなたと共有" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "他人と共有" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "URLリンクで共有済" @@ -46,18 +46,6 @@ msgstr "まだ共有を行なっているファイルはありません。" msgid "You haven't shared any files by link yet." msgstr "まだURLリンクで共有を行なっているファイルはありません。" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "テンプレートを読み出せませんでした" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "保存されました" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "リセット" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "{owner} と共有中" @@ -122,19 +110,3 @@ msgstr "%s をダウンロード" #: templates/public.php:54 msgid "Direct link" msgstr "リンク" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "メールテンプレート" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "テーマ" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "テンプレート" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "保存" diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po index 0d61e05dbb1..77a55383324 100644 --- a/l10n/ja/settings.po +++ b/l10n/ja/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-11 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 07:50+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" @@ -289,7 +289,7 @@ msgstr "暗号化キーを復元する。" #: js/users/deleteHandler.js:166 msgid "Unable to delete {objName}" -msgstr "" +msgstr "{objName} を削除できません" #: js/users/groups.js:73 js/users/groups.js:178 msgid "Error creating group" @@ -301,7 +301,7 @@ msgstr "有効なグループ名を指定する必要があります" #: js/users/groups.js:205 msgid "deleted {groupName}" -msgstr "" +msgstr "{groupName} を削除しました" #: js/users/groups.js:206 js/users/users.js:255 msgid "undo" @@ -329,7 +329,7 @@ msgstr "無し" #: js/users/users.js:254 msgid "deleted {userName}" -msgstr "" +msgstr "{userName} を削除しました" #: js/users/users.js:371 msgid "add group" diff --git a/l10n/jv/core.po b/l10n/jv/core.po index cafb4bbb05c..bdf16c2929c 100644 --- a/l10n/jv/core.po +++ b/l10n/jv/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/jv/files_encryption.po b/l10n/jv/files_encryption.po index 9dbe3b08975..008b0e4f384 100644 --- a/l10n/jv/files_encryption.po +++ b/l10n/jv/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/jv/files_sharing.po b/l10n/jv/files_sharing.po index 844b97f177c..5480b8dc920 100644 --- a/l10n/jv/files_sharing.po +++ b/l10n/jv/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: jv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po index 6ff35f926b2..11a19926e28 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -167,50 +167,81 @@ msgstr "" msgid "Saving..." msgstr "შენახვა..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "წამის წინ" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "დღეს" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "გუშინ" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "გასულ თვეში" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "ბოლო წელს" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "წლის წინ" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "პაროლის შეცვლა" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "კი" @@ -508,43 +539,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "მომხმარებლის სახელი" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -552,30 +580,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "თქვენი პაროლი შეცვლილია" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "შესვლის გვერდზე" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "ახალი პაროლი" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "პაროლის შეცვლა" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -802,8 +821,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "დაგავიწყდათ პაროლი?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po index 9e698e3bbc9..9f3163b0640 100644 --- a/l10n/ka_GE/files_encryption.po +++ b/l10n/ka_GE/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po index 7b1992fb3ce..be8847e4669 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ka_GE\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "გაზიარდა {owner} –ის მიერ" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "შენახვა" diff --git a/l10n/km/core.po b/l10n/km/core.po index cd168a4bcd9..0dcaaa89b3a 100644 --- a/l10n/km/core.po +++ b/l10n/km/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -168,50 +168,81 @@ msgstr "" msgid "Saving..." msgstr "កំពុងរក្សាទុក" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "វិនាទីមុន" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n នាទីមុន" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n ម៉ោងមុន" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "ថ្ងៃនេះ" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ម្សិលមិញ" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n ថ្ងៃមុន" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "ខែមុន" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n ខែមុន" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "ឆ្នាំមុន" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "ឆ្នាំមុន" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "កំណត់ពាក្យសម្ងាត់ម្ដងទៀត" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "ព្រម" @@ -509,43 +540,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "មានកំហុសបានកើតឡើងនៅពេលលកំពុងផ្ញើអ៊ីមែលចេញ, សូមទាក់ទងអភិបាលរបស់អ្នក។" - -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "ឈ្មោះអ្នកប្រើ" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -553,30 +581,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "ពាក្យសម្ងាត់របស់អ្នកត្រូវបានកំណត់ឡើងវិញ" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "ទៅទំព័រចូល" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "ពាក្យសម្ងាត់ថ្មី" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "កំណត់ពាក្យសម្ងាត់ម្ដងទៀត" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -803,8 +822,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "បាត់ពាក្យសម្ងាត់របស់អ្នក?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/km/files_encryption.po b/l10n/km/files_encryption.po index 57fbebe8b40..e01c1c73bef 100644 --- a/l10n/km/files_encryption.po +++ b/l10n/km/files_encryption.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# សុវិចិត្រ Sovichet ទេព Tep, 2014 +# Sovichet Tep, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -81,18 +81,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -105,13 +105,10 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "ការកំណត់ផ្ទាល់ខ្លួន" - #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" msgstr "កូដនីយកម្ម" diff --git a/l10n/km/files_sharing.po b/l10n/km/files_sharing.po index d36c5f6e327..dc9691113c0 100644 --- a/l10n/km/files_sharing.po +++ b/l10n/km/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n" "MIME-Version: 1.0\n" @@ -19,15 +19,15 @@ msgstr "" "Language: km\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -43,18 +43,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "បានរក្សាទុក" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "{owner} បានចែករំលែក" @@ -119,19 +107,3 @@ msgstr "ទាញយក %s" #: templates/public.php:54 msgid "Direct link" msgstr "តំណផ្ទាល់" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "រក្សាទុក" diff --git a/l10n/kn/core.po b/l10n/kn/core.po index 3c68c32ea77..1b831ef0ed9 100644 --- a/l10n/kn/core.po +++ b/l10n/kn/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -167,50 +167,81 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -508,43 +539,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -552,29 +580,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -802,7 +821,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po index 7d5f722d703..3276e2bb005 100644 --- a/l10n/kn/files_encryption.po +++ b/l10n/kn/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po index 1b0c02ff33d..9b9fec709e7 100644 --- a/l10n/kn/files_sharing.po +++ b/l10n/kn/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: kn\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ko/core.po b/l10n/ko/core.po index fb39ca2491d..a430b71f5fe 100644 --- a/l10n/ko/core.po +++ b/l10n/ko/core.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -174,50 +174,81 @@ msgstr "" msgid "Saving..." msgstr "저장 중..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "초 전" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n분 전 " -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n시간 전 " -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "오늘" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "어제" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n일 전 " -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "지난 달" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n달 전 " -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "작년" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "년 전" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "암호 재설정" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "예" @@ -515,43 +546,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "업데이트가 성공하였습니다. ownCloud로 돌아갑니다." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s 암호 재설정" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s 암호 재설정" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "암호를 초기화 하기 위한 링크가 이메일로 발송되었습니다.<br>만약 수 분 이내에 메일이 도착하지 않은 경우, 스팸 메일함을 확인하십시오.<br>스팸 메일함에도 없다면, 메일 관리자에게 문의하십시오." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "요청이 실패했습니다!<br>이메일 주소와 사용자 이름을 정확하게 입력하셨습니까?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "이메일로 암호 재설정 링크를 보냈습니다." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "사용자 이름" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "예, 지금 내 암호를 재설정합니다" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "재설정" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "암호가 재설정되었습니다" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "로그인 화면으로" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "새 암호" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "암호 재설정" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "관리자에게 문의하십시오." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "암호를 잊으셨습니까?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po index c26727da341..9dd92058893 100644 --- a/l10n/ko/files_encryption.po +++ b/l10n/ko/files_encryption.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# 책읽는달팽 <bjh13579@gmail.com>, 2013 +# woosuk park <bjh13579@gmail.com>, 2013 # Park Shinjo <peremen@gmail.com>, 2013 # Shinjo Park <kde@peremen.name>, 2013 -# 책읽는달팽 <bjh13579@gmail.com>, 2013 +# woosuk park <bjh13579@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -84,18 +84,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "요구 사항이 부족합니다." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "PHP 5.3.3 이상 설치 여부, PHP의 OpenSSL 확장 기능 활성화 및 설정 여부를 확인하십시오. 암호화 앱이 비활성화 되었습니다." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "다음 사용자는 암호화를 사용할 수 없습니다:" @@ -108,12 +108,9 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "다음으로 바로 가기: " - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "개인 설정" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po index 4b2a1454b39..72a3f57aa35 100644 --- a/l10n/ko/files_sharing.po +++ b/l10n/ko/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -20,15 +20,15 @@ msgstr "" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -44,18 +44,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "저장됨" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "재설정" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "{owner} 님이 공유함" @@ -120,19 +108,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "직접 링크" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "저장" diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po index e17f1795648..149d70fb07a 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "پاشکهوتدهکات..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "دووباره كردنهوهی وشهی نهێنی" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "بەڵێ" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "ناوی بهکارهێنهر" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,30 +585,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "وشەی نهێنی نوێ" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "دووباره كردنهوهی وشهی نهێنی" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po index 98cff5b3e61..70d3f303871 100644 --- a/l10n/ku_IQ/files_encryption.po +++ b/l10n/ku_IQ/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po index 922135a9f95..e6edf9ccf51 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ku_IQ\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "پاشکهوتکردن" diff --git a/l10n/lb/core.po b/l10n/lb/core.po index 13785fcaa3c..c00a8294a2a 100644 --- a/l10n/lb/core.po +++ b/l10n/lb/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -169,54 +169,85 @@ msgstr "" msgid "Saving..." msgstr "Speicheren..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "Sekonnen hir" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n Minutt hir" msgstr[1] "%n Minutten hir" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "haut" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "gëschter" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "leschte Mount" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "Lescht Joer" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "Joren hir" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Passwuert zréck setzen" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Jo" @@ -515,43 +546,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s Passwuert ass nei gesat" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s Passwuert ass nei gesat" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "De Link fir d'Passwuert zréckzesetzen gouf un deng E-Mail-Adress geschéckt.<br>Falls du d'Mail net an den nächste Minutte kriss, kuck w.e.gl. an dengem Spam-Dossier.<br>Wann do och keng Mail ass, fro w.e.gl. däin Adminstrateur." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Ufro feelfeschloen!<br>Hues du séchergestallt dass deng Email respektiv däi Benotzernumm korrekt sinn?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Benotzernumm" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Jo, ech wëll mäi Passwuert elo zrécksetzen" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Zeréck setzen" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Däi Passwuert ass zréck gesat ginn" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Bei d'Login-Säit" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Neit Passwuert" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Passwuert zréck setzen" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Passwuert vergiess?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po index d4271fc1538..964f3e7b44b 100644 --- a/l10n/lb/files_encryption.po +++ b/l10n/lb/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po index f7ecfeef161..24dfe485937 100644 --- a/l10n/lb/files_sharing.po +++ b/l10n/lb/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ msgstr "" "Language: lb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Zeréck setzen" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -118,19 +106,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Späicheren" diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index e5ea056e2f2..251a6402ce8 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/core.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -172,58 +172,89 @@ msgstr "" msgid "Saving..." msgstr "Saugoma..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "prieš sekundę" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] " prieš %n minutę" msgstr[1] " prieš %n minučių" msgstr[2] " prieš %n minučių" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "prieš %n valandą" msgstr[1] "prieš %n valandų" msgstr[2] "prieš %n valandų" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "šiandien" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "vakar" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "prieš %n dieną" msgstr[1] "prieš %n dienas" msgstr[2] "prieš %n dienų" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "praeitą mėnesį" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "prieš %n mėnesį" msgstr[1] "prieš %n mėnesius" msgstr[2] "prieš %n mėnesių" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "praeitais metais" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "prieš metus" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Atkurti slaptažodį" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Taip" @@ -523,43 +554,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s slaptažodžio atnaujinimas" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s slaptažodžio atnaujinimas" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Slaptažodio atkūrimui naudokite šią nuorodą: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "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:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Klaida!<br>Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Prisijungimo vardas" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -567,30 +595,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Taip, aš tikrai noriu atnaujinti slaptažodį" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Atstatyti" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Jūsų slaptažodis buvo nustatytas iš naujo" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Į prisijungimo puslapį" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Naujas slaptažodis" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Atkurti slaptažodį" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -817,8 +836,8 @@ msgid "Please contact your administrator." msgstr "Kreipkitės į savo sistemos administratorių." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Pamiršote slaptažodį?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po index e9df56d3333..2aa605d9a2c 100644 --- a/l10n/lt_LT/files_encryption.po +++ b/l10n/lt_LT/files_encryption.po @@ -5,13 +5,13 @@ # Translators: # Dr. ROX <to.dr.rox@gmail.com>, 2013 # Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013-2014 -# fizikiukas <fizikiukas@gmail.com>, 2013 +# Valentinas <fizikiukas@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -83,18 +83,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Trūkstami laukai." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Sekantys naudotojai nenustatyti šifravimui:" @@ -107,12 +107,9 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Eiti tiesiai į Jūsų" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "asmeniniai nustatymai" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po index b0ad06adf75..7dbe09d4d38 100644 --- a/l10n/lt_LT/files_sharing.po +++ b/l10n/lt_LT/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -20,15 +20,15 @@ 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" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -44,18 +44,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Atstatyti" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Bendrina {owner}" @@ -120,19 +108,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "Tiesioginė nuoroda" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Išsaugoti" diff --git a/l10n/lv/core.po b/l10n/lv/core.po index 58d04176b47..8f718160194 100644 --- a/l10n/lv/core.po +++ b/l10n/lv/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -168,58 +168,89 @@ msgstr "" msgid "Saving..." msgstr "Saglabā..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sekundes atpakaļ" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Tagad, %n minūtes" msgstr[1] "Pirms %n minūtes" msgstr[2] "Pirms %n minūtēm" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Šodien, %n stundas" msgstr[1] "Pirms %n stundas" msgstr[2] "Pirms %n stundām" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "šodien" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "vakar" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Šodien, %n dienas" msgstr[1] "Pirms %n dienas" msgstr[2] "Pirms %n dienām" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "pagājušajā mēnesī" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Šomēnes, %n mēneši" msgstr[1] "Pirms %n mēneša" msgstr[2] "Pirms %n mēnešiem" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "gājušajā gadā" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "gadus atpakaļ" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Mainīt paroli" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Jā" @@ -519,43 +550,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s paroles maiņa" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s paroles maiņa" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Izmantojiet šo saiti, lai mainītu paroli: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Saite uz paroles atjaunošanas vietu ir nosūtīta uz epastu.<br>Ja vēstu nav atnākusi, pārbaudiet epasta mēstuļu mapi.<br>Jā tās tur nav, jautājiet sistēmas administratoram." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Pieprasījums neizdevās!<br>Vai Jūs pārliecinājāties ka epasts/lietotājvārds ir pareizi?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Lietotājvārds" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -563,30 +591,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Jā, Es tiešām vēlos mainīt savu paroli" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Jūsu parole tika nomainīta" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Uz ielogošanās lapu" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Jauna parole" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Mainīt paroli" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -813,8 +832,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Aizmirsāt paroli?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po index 85eb5e2aa75..7dfda6d5201 100644 --- a/l10n/lv/files_encryption.po +++ b/l10n/lv/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po index e3019595ab3..b94e1fb5073 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Dalījās {owner}" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Saglabāt" diff --git a/l10n/mk/core.po b/l10n/mk/core.po index cf99935406a..84ee45d6928 100644 --- a/l10n/mk/core.po +++ b/l10n/mk/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-09 01:54-0400\n" -"PO-Revision-Date: 2014-06-08 21:10+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "Снимам..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "пред секунди" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "денеска" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "вчера" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "минатиот месец" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "минатата година" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "пред години" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Ресетирај лозинка" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Да" @@ -514,43 +545,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s ресетирање на лозинката" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s ресетирање на лозинката" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "" - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Корисничко име" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,30 +586,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Да, јас сега навистина сакам да ја поништам својата лозинка" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Поништи" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Вашата лозинка беше ресетирана" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Кон страницата за најава" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Нова лозинка" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Ресетирај лозинка" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -808,8 +827,8 @@ msgid "Please contact your administrator." msgstr "Ве молиме контактирајте го вашиот администратор." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Ја заборавивте лозинката?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po index f356a80886c..74870e92323 100644 --- a/l10n/mk/files_encryption.po +++ b/l10n/mk/files_encryption.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# miroj <jmiroslav@softhome.net>, 2013 +# Miroslav Jovanovic <jmiroslav@softhome.net>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -81,18 +81,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Барања кои недостасуваат." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -105,12 +105,9 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Одете директно на вашиот" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "лични подесувања" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po index b7626b5e764..e82269df3f8 100644 --- a/l10n/mk/files_sharing.po +++ b/l10n/mk/files_sharing.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-09 01:54-0400\n" -"PO-Revision-Date: 2014-06-08 21:10+0000\n" -"Last-Translator: Miroslav Jovanovic <jmiroslav@softhome.net>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,15 +18,15 @@ msgstr "" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Споделено со тебе" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Сподели со останатите" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Споделено со врска" @@ -42,18 +42,6 @@ msgstr "Вие досега немате споделено ниту една д msgid "You haven't shared any files by link yet." msgstr "Сеуште немате споделено датотека со врска." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Не можам да го вчитам шаблонот" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Снимено" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Поништи" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Споделени од {owner}" @@ -118,19 +106,3 @@ msgstr "Преземи %s" #: templates/public.php:54 msgid "Direct link" msgstr "Директна врска" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Шаблони за електронска пошта" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Теми" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Шаблон" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Сними" diff --git a/l10n/ml/core.po b/l10n/ml/core.po index 8eeeb110ca9..3e11516e52e 100644 --- a/l10n/ml/core.po +++ b/l10n/ml/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/ml/files_encryption.po b/l10n/ml/files_encryption.po index 97a4e829836..298f5fbd8d4 100644 --- a/l10n/ml/files_encryption.po +++ b/l10n/ml/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ml/files_sharing.po b/l10n/ml/files_sharing.po index 4e4badec5f6..cefaeb82a1f 100644 --- a/l10n/ml/files_sharing.po +++ b/l10n/ml/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ml\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po index 8378a3a517d..8b4a95bd1cc 100644 --- a/l10n/ml_IN/core.po +++ b/l10n/ml_IN/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/ml_IN/files_encryption.po b/l10n/ml_IN/files_encryption.po index b9990473a70..82c34bb81f8 100644 --- a/l10n/ml_IN/files_encryption.po +++ b/l10n/ml_IN/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ml_IN/files_sharing.po b/l10n/ml_IN/files_sharing.po index bce5d5500ee..92e0cf2b216 100644 --- a/l10n/ml_IN/files_sharing.po +++ b/l10n/ml_IN/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ml_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/mn/core.po b/l10n/mn/core.po index d70087f1979..b3a403fc4f6 100644 --- a/l10n/mn/core.po +++ b/l10n/mn/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/mn/files_encryption.po b/l10n/mn/files_encryption.po index 52576cbdca5..b95309182d7 100644 --- a/l10n/mn/files_encryption.po +++ b/l10n/mn/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/mn/files_sharing.po b/l10n/mn/files_sharing.po index c58ec2bb943..91fef904e41 100644 --- a/l10n/mn/files_sharing.po +++ b/l10n/mn/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: mn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po index 4c9cb0036e0..918f82ade1e 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -167,50 +167,81 @@ msgstr "" msgid "Saving..." msgstr "Simpan..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Penetapan semula kata laluan" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ya" @@ -508,43 +539,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nama pengguna" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -552,30 +580,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Kata laluan anda telah diset semula" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Ke halaman log masuk" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Kata laluan baru" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Penetapan semula kata laluan" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -802,8 +821,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Hilang kata laluan?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po index ee50309f927..50c191271ff 100644 --- a/l10n/ms_MY/files_encryption.po +++ b/l10n/ms_MY/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po index 2372ec2a356..0b533be93bb 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ms_MY\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Simpan" diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po index 53080217d18..5f583b879a8 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -167,50 +167,81 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "စက္ကန့်အနည်းငယ်က" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "ယနေ့" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "မနေ့က" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "ပြီးခဲ့သောလ" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "မနှစ်က" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "နှစ် အရင်က" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "ဟုတ်" @@ -508,43 +539,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "သုံးစွဲသူအမည်" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -552,29 +580,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "သင်၏စကားဝှက်ကိုပြန်ဖော်ပြီးပါပြီ။" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "ဝင်ရောက်သည့်စာမျက်နှာသို့" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "စကားဝှက်အသစ်" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -802,8 +821,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "သင်၏စကားဝှက်ပျောက်သွားပြီလား။" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po index cec974e1585..37a5a48ee78 100644 --- a/l10n/my_MM/files_encryption.po +++ b/l10n/my_MM/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po index e2c2ff4ddc3..91bfa5a60ca 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: my_MM\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index da923dc8a7d..fee9cd88df7 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-11 01:54-0400\n" -"PO-Revision-Date: 2014-06-10 13:02+0000\n" -"Last-Translator: vidaren <news@vidartysse.net>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -171,54 +171,85 @@ msgstr "Audio" msgid "Saving..." msgstr "Lagrer..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "få sekunder siden" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "for %n minutt siden" msgstr[1] "for %n minutter siden" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "for %n time siden" msgstr[1] "for %n timer siden" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "i dag" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "i går" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "for %n dag siden" msgstr[1] "for %n dager siden" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "forrige måned" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "for %n måned siden" msgstr[1] "for %n måneder siden" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "i fjor" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "årevis siden" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Tilbakestill passord" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ja" @@ -517,43 +548,40 @@ msgstr "Oppdateringen var vellykket." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s nullstilling av passord" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Et problem oppstod ved sending av mailen. Kontakt administratoren." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Bruk følgende lenke for å tilbakestille passordet ditt: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Lenken for nullstilling av passordet ditt er sendt til din email.<br>Hvis du ikke mottar den innen rimelig tid, sjekk spam- og søppelmappene i epost-programmet.<br>Hvis den ikke er der, kontakt din lokale administrator ." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Anmodning feilet!<br>Forsikret du deg om at din email/brukernavn var korrekt?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Du burde motta detaljer om å tilbakestille passordet ditt via epost." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Brukernavn" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -561,30 +589,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er nullstilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ja, jeg vil virkelig nullstille passordet mitt nå" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Nullstill" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Passordet ditt ble tilbakestilt" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Til innlogginssiden" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nytt passord" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Tilbakestill passord" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -811,8 +830,8 @@ msgid "Please contact your administrator." msgstr "Vennligst kontakt administratoren din." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Mistet passordet ditt?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po index abe60fe08d7..a148623d671 100644 --- a/l10n/nb_NO/files_encryption.po +++ b/l10n/nb_NO/files_encryption.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-31 01:54-0400\n" -"PO-Revision-Date: 2014-05-30 19:21+0000\n" -"Last-Translator: vidaren <news@vidartysse.net>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,18 +81,18 @@ msgid "" "administrator" msgstr "Ukjent feil. Sjekk systeminnstillingene eller kontakt administratoren." -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Manglende krav." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Vennligst se til at PHP 5.3.3 eller nyere er installert og at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Enn så lenge er krypterings-appen deaktivert." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Følgende brukere er ikke satt opp for kryptering:" @@ -105,12 +105,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Førstegangs kryptering kjører... Prøv igjen senere." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Gå direkte til din" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "personlige innstillinger" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po index bd9dd3e9f44..3f26401bb26 100644 --- a/l10n/nb_NO/files_sharing.po +++ b/l10n/nb_NO/files_sharing.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 07:10+0000\n" -"Last-Translator: vidaren <news@vidartysse.net>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +19,15 @@ msgstr "" "Language: nb_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Delt med deg" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Delt med andre" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Delt med lenke" @@ -43,18 +43,6 @@ msgstr "Du har ikke delt noen filer ennå." msgid "You haven't shared any files by link yet." msgstr "Du har ikke delt noen filer med lenke ennå." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Klarte ikke å laste mal" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Lagret" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Nullstill" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Delt av {owner}" @@ -119,19 +107,3 @@ msgstr "Last ned %s" #: templates/public.php:54 msgid "Direct link" msgstr "Direkte lenke" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Epost-maler" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Tema" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Mal" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Lagre" diff --git a/l10n/nds/core.po b/l10n/nds/core.po index bae7fa67dd5..c4c9132f5d7 100644 --- a/l10n/nds/core.po +++ b/l10n/nds/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/nds/files_encryption.po b/l10n/nds/files_encryption.po index f60a7386d0e..d1ddd666cfa 100644 --- a/l10n/nds/files_encryption.po +++ b/l10n/nds/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/nds/files_sharing.po b/l10n/nds/files_sharing.po index d9507373ba9..60dfb64a32c 100644 --- a/l10n/nds/files_sharing.po +++ b/l10n/nds/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: nds\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ne/core.po b/l10n/ne/core.po index a1c9238b7e9..124264237f9 100644 --- a/l10n/ne/core.po +++ b/l10n/ne/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po index 565b48ecf4c..5f49fe755bf 100644 --- a/l10n/ne/files_encryption.po +++ b/l10n/ne/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po index 872105f97dc..459ab9edbab 100644 --- a/l10n/ne/files_sharing.po +++ b/l10n/ne/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ne\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index 4f2026447f9..be837b24021 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -164,60 +164,91 @@ msgstr "Afbeelding" #: js/js.js:593 msgid "Audio" -msgstr "" +msgstr "Audio" #: js/js.js:607 msgid "Saving..." msgstr "Opslaan" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "seconden geleden" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "%n minuten geleden" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "%n uur geleden" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "vandaag" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "gisteren" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "%n dagen geleden" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "vorige maand" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "%n maanden geleden" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "vorig jaar" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "jaar geleden" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Reset wachtwoord" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ja" @@ -516,43 +547,40 @@ msgstr "De update is niet geslaagd." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s wachtwoord reset" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Er ontstond een probleem bij het versturen van het e-mailbericht, neem contact op met uw beheerder." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Gebruik de volgende link om uw wachtwoord te resetten: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spammap.<br>Als het daar ook niet is, vraag dan uw beheerder om hulp." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Gebruikersnaam" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -560,30 +588,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ja, ik wil mijn wachtwoord nu echt resetten" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Reset" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Uw wachtwoord is gewijzigd" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Naar de login-pagina" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nieuw wachtwoord" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Reset wachtwoord" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -810,8 +829,8 @@ msgid "Please contact your administrator." msgstr "Neem contact op met uw systeembeheerder." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Wachtwoord vergeten?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po index 6647356b035..412b3571c4a 100644 --- a/l10n/nl/files_encryption.po +++ b/l10n/nl/files_encryption.po @@ -4,14 +4,14 @@ # # Translators: # André Koot <meneer@tken.net>, 2013-2014 -# Len <lenny@weijl.org>, 2013 +# Lennart Weijl <lenny@weijl.org>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-31 01:54-0400\n" -"PO-Revision-Date: 2014-05-30 07:32+0000\n" -"Last-Translator: André Koot <meneer@tken.net>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -82,18 +82,18 @@ msgid "" "administrator" msgstr "Onbekende fout. Controleer uw systeeminstellingen of neem contact op met de beheerder" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Missende benodigdheden." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "De volgende gebruikers hebben geen configuratie voor encryptie:" @@ -106,12 +106,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Initiële versleuteling bezig... Probeer het later opnieuw." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Ga meteen naar uw" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "persoonlijke instellingen" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po index 0d62a897235..cd945636bff 100644 --- a/l10n/nl/files_external.po +++ b/l10n/nl/files_external.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 20: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" @@ -208,7 +208,7 @@ msgstr "Persoonlijk" #: js/mountsfilelist.js:36 msgid "System" -msgstr "" +msgstr "Systeem" #: js/settings.js:318 js/settings.js:325 msgid "Saved" @@ -245,7 +245,7 @@ msgstr "<b>Let op:</b> \"%s\" is niet geïnstalleerd. Mounten van %s is niet mog #: templates/list.php:7 msgid "You don't have any external storages" -msgstr "" +msgstr "U hebt geen externe opslag" #: templates/list.php:16 msgid "Name" @@ -253,11 +253,11 @@ msgstr "Naam" #: templates/list.php:20 msgid "Storage type" -msgstr "" +msgstr "Opslagtype" #: templates/list.php:23 msgid "Scope" -msgstr "" +msgstr "Scope" #: templates/settings.php:2 msgid "External Storage" diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po index ce1fa5dbe03..c3f3a33b487 100644 --- a/l10n/nl/files_sharing.po +++ b/l10n/nl/files_sharing.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: André Koot <meneer@tken.net>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -19,15 +19,15 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Deelde met u" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Deelde met anderen" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Gedeeld via een link" @@ -43,18 +43,6 @@ msgstr "U hebt nog geen bestanden gedeeld." msgid "You haven't shared any files by link yet." msgstr "U hebt nog geen bestanden via een link gedeeld." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Kon sjabloon niet laden" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Bewaard" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Reset" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Gedeeld door {owner}" @@ -119,19 +107,3 @@ msgstr "Download %s" #: templates/public.php:54 msgid "Direct link" msgstr "Directe link" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "E-mailsjablonen" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Thema" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Sjabloon" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Bewaren" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 1a827610274..41b45ccc46d 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-11 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 20: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" @@ -287,7 +287,7 @@ msgstr "Herstel de encryptiesleutels" #: js/users/deleteHandler.js:166 msgid "Unable to delete {objName}" -msgstr "" +msgstr "Kan {objName} niet verwijderen" #: js/users/groups.js:73 js/users/groups.js:178 msgid "Error creating group" @@ -299,7 +299,7 @@ msgstr "Er moet een geldige groepsnaam worden opgegeven" #: js/users/groups.js:205 msgid "deleted {groupName}" -msgstr "" +msgstr "verwijderd {groupName}" #: js/users/groups.js:206 js/users/users.js:255 msgid "undo" @@ -327,7 +327,7 @@ msgstr "geen" #: js/users/users.js:254 msgid "deleted {userName}" -msgstr "" +msgstr "verwijderd {userName}" #: js/users/users.js:371 msgid "add group" diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index 128c0a12d04..b5caf7f9090 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -171,54 +171,85 @@ msgstr "" msgid "Saving..." msgstr "Lagrar …" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sekund sidan" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minutt sidan" msgstr[1] "%n minutt sidan" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n time sidan" msgstr[1] "%n timar sidan" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "i dag" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "i går" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dag sidan" msgstr[1] "%n dagar sidan" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "førre månad" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n månad sidan" msgstr[1] "%n månadar sidan" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "i fjor" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "år sidan" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Nullstill passord" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ja" @@ -517,43 +548,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s passordnullstilling" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s passordnullstilling" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Lenkja til å nullstilla passordet med er sendt til e-posten din.<br>Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid.<br>Spør din lokale administrator viss han ikkje er der heller." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/brukarnamn?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Du vil få ein e-post med ei lenkje for å nullstilla passordet." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Brukarnamn" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -561,30 +589,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ja, eg vil nullstilla passordet mitt no" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Passordet ditt er nullstilt" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Til innloggingssida" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nytt passord" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Nullstill passord" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -811,8 +830,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Gløymt passordet?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po index 895762c0e47..9739cb56ebc 100644 --- a/l10n/nn_NO/files_encryption.po +++ b/l10n/nn_NO/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po index 039fb0bdc1d..45b8356c81a 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ msgstr "" "Language: nn_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Delt av {owner}" @@ -118,19 +106,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Lagra" diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po index 56a846a71ff..ba40e97261f 100644 --- a/l10n/nqo/core.po +++ b/l10n/nqo/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" "MIME-Version: 1.0\n" @@ -167,50 +167,81 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -508,43 +539,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -552,29 +580,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -802,7 +821,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/nqo/files_encryption.po b/l10n/nqo/files_encryption.po index c514d702216..2606e0a32ef 100644 --- a/l10n/nqo/files_encryption.po +++ b/l10n/nqo/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/nqo/files_sharing.po b/l10n/nqo/files_sharing.po index e776b4ea91a..d100cbea467 100644 --- a/l10n/nqo/files_sharing.po +++ b/l10n/nqo/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: nqo\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/oc/core.po b/l10n/oc/core.po index 6354fedb9da..42084607918 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "Enregistra..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "segonda a" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "uèi" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ièr" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "mes passat" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "an passat" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "ans a" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Senhal tornat botar" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Òc" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "Utiliza lo ligam seguent per tornar botar lo senhal : {link}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "Utiliza lo ligam seguent per tornar botar lo senhal : {link}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Reçaupràs un ligam per tornar botar ton senhal via corrièl." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Non d'usancièr" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,30 +585,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Ton senhal es estat tornat botar" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Pagina cap al login" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Senhal novèl" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Senhal tornat botar" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -807,8 +826,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "L'as perdut lo senhal ?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po index 10b03869650..100cefe0e81 100644 --- a/l10n/oc/files_encryption.po +++ b/l10n/oc/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po index 7286fb21b35..89d2f60ce3b 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: oc\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Enregistra" diff --git a/l10n/or_IN/core.po b/l10n/or_IN/core.po index 69a53c74a32..6eed65c554d 100644 --- a/l10n/or_IN/core.po +++ b/l10n/or_IN/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/or_IN/files_encryption.po b/l10n/or_IN/files_encryption.po index fc0ac2cadca..6f975f3d4f1 100644 --- a/l10n/or_IN/files_encryption.po +++ b/l10n/or_IN/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/or_IN/files_sharing.po b/l10n/or_IN/files_sharing.po index ea6f0d86891..6e7b3749a29 100644 --- a/l10n/or_IN/files_sharing.po +++ b/l10n/or_IN/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: or_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/pa/core.po b/l10n/pa/core.po index e040cbdf63f..138b1d3d8b5 100644 --- a/l10n/pa/core.po +++ b/l10n/pa/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "ਅੱਜ" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ਕੱਲ੍ਹ" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "ਪਿਛਲੇ ਮਹੀਨੇ" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "ਪਿਛਲੇ ਸਾਲ" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "ਹਾਂ" @@ -514,43 +545,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "ਯੂਜ਼ਰ-ਨਾਂ" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,29 +586,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -808,7 +827,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/pa/files_encryption.po b/l10n/pa/files_encryption.po index 2adfb595ca2..d3cc336554b 100644 --- a/l10n/pa/files_encryption.po +++ b/l10n/pa/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/pa/files_sharing.po b/l10n/pa/files_sharing.po index 10ae34a6f6e..efb5f4e947f 100644 --- a/l10n/pa/files_sharing.po +++ b/l10n/pa/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: pa\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index b1c9c977d76..7b5fb92531a 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 07:20+0000\n" -"Last-Translator: Maciej Przybecki <maciej.przybecki@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -171,58 +171,89 @@ msgstr "Dźwięk" msgid "Saving..." msgstr "Zapisywanie..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sekund temu" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minute temu" msgstr[1] "%n minut temu" msgstr[2] "%n minut temu" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n godzine temu" msgstr[1] "%n godzin temu" msgstr[2] "%n godzin temu" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "dziś" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "wczoraj" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dzień temu" msgstr[1] "%n dni temu" msgstr[2] "%n dni temu" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "w zeszłym miesiącu" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n miesiąc temu" msgstr[1] "%n miesięcy temu" msgstr[2] "%n miesięcy temu" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "w zeszłym roku" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "lat temu" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Zresetuj hasło" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Tak" @@ -522,43 +553,40 @@ msgstr "Aktualizacja nie powiodła się." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s reset hasła" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Pojawił się problem podczas wysyłania wiadomości email, skontaktuj się z administratorem" - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Użyj tego odnośnika by zresetować hasło: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nazwa użytkownika" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -566,30 +594,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Tak, naprawdę chcę zresetować hasło teraz" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Resetuj" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Zresetowano hasło" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Do strony logowania" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nowe hasło" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Zresetuj hasło" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -816,8 +835,8 @@ msgid "Please contact your administrator." msgstr "Skontaktuj się z administratorem" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Nie pamiętasz hasła?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po index 82f82edb4b3..9bd504c7f5f 100644 --- a/l10n/pl/files_encryption.po +++ b/l10n/pl/files_encryption.po @@ -4,15 +4,15 @@ # # Translators: # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013 -# maxxx <maxxxrally@gmail.com>, 2014 -# bobie <maciej.przybecki@gmail.com>, 2013-2014 +# Krzysztof Łojowski <maxxxrally@gmail.com>, 2014 +# Maciej Przybecki <maciej.przybecki@gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-04 01:54-0400\n" -"PO-Revision-Date: 2014-06-02 11:31+0000\n" -"Last-Translator: bobie <maciej.przybecki@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -83,18 +83,18 @@ msgid "" "administrator" msgstr "Nieznany błąd. Proszę sprawdzić ustawienia systemowe lub skontaktować się z administratorem" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Brak wymagań." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone." -#: hooks/hooks.php:296 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:" @@ -107,12 +107,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Trwa szyfrowanie początkowe...Spróbuj ponownie." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Przejdź bezpośrednio do" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "Ustawienia osobiste" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po index 36558bb96b2..0bb143438a4 100644 --- a/l10n/pl/files_sharing.po +++ b/l10n/pl/files_sharing.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 07:20+0000\n" -"Last-Translator: Maciej Przybecki <maciej.przybecki@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -19,15 +19,15 @@ 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" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Współdzielony z Tobą" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Współdzielony z innymi" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Współdzielony linkiem" @@ -43,18 +43,6 @@ msgstr "Nie współdzielisz jeszcze żadnych plików." msgid "You haven't shared any files by link yet." msgstr "Nie współdzielisz jeszcze żadnych plików linkiem" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Nie można załadować szablonu" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Zapisano" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Resetuj" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Udostępnione przez {owner}" @@ -119,19 +107,3 @@ msgstr "Pobierz %s" #: templates/public.php:54 msgid "Direct link" msgstr "Bezpośredni link" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Szablony maili" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Motyw" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Szablon" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Zapisz" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index 2e91fa46563..9da9cfcb45f 100644 --- a/l10n/pt_BR/core.po +++ b/l10n/pt_BR/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 15:50+0000\n" -"Last-Translator: Flávio Veras <flaviove@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -169,54 +169,85 @@ msgstr "Audio" msgid "Saving..." msgstr "Salvando..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] " ha %n minuto" msgstr[1] "ha %n minutos" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "ha %n hora" msgstr[1] "ha %n horas" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "hoje" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ontem" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "ha %n dia" msgstr[1] "ha %n dias" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "último mês" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "ha %n mês" msgstr[1] "ha %n meses" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "último ano" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "anos atrás" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Redefinir senha" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Sim" @@ -515,43 +546,40 @@ msgstr "A atualização não foi bem sucedida." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "A atualização teve êxito. Você será redirecionado ao ownCloud agora." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s redefinir senha" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Um problema ocorreu durante o envio do e-mail, por favor, contate o administrador." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Use o seguinte link para redefinir sua senha: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "O link para redefinir sua senha foi enviada para o seu e-mail. <br> Se você não recebê-lo dentro de um período razoável de tempo, verifique o spam/lixo. <br> Se ele não estiver lá perguntar ao seu administrador local." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corretos?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Você receberá um link para redefinir sua senha por e-mail." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nome de usuário" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer, por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Sim, realmente quero criar uma nova senha." -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Resetar" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Sua senha foi redefinida" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Para a página de login" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nova senha" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Redefinir senha" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "Por favor, contate o administrador." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Esqueceu sua senha?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po index 9976c9471ac..59d9ffac8a4 100644 --- a/l10n/pt_BR/files_encryption.po +++ b/l10n/pt_BR/files_encryption.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# bjamalaro <bjamalaro@yahoo.com.br>, 2013 +# Bruno Jamalaro <bjamalaro@yahoo.com.br>, 2013 # Flávio Veras <flaviove@gmail.com>, 2013-2014 -# wcavassin <cavassin@gmail.com>, 2013 +# Wanderlei Antonio Cavassin <cavassin@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-29 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 14:14+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 17:30+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" @@ -83,18 +83,18 @@ msgid "" "administrator" msgstr "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contato com o administrador" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Requisitos não encontrados." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Seguintes usuários não estão configurados para criptografia:" @@ -107,12 +107,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Criptografia inicial em execução ... Por favor, tente novamente mais tarde." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Ir diretamente para o seu" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "configurações pessoais." +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "Ir direto para suas %spersonal settings%s." #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po index eb03fdc120e..05c980bdb6e 100644 --- a/l10n/pt_BR/files_sharing.po +++ b/l10n/pt_BR/files_sharing.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 16:50+0000\n" -"Last-Translator: Flávio Veras <flaviove@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -18,15 +18,15 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Compartilhado com você" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Compartilhados com outros" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Compartilhado por link" @@ -42,18 +42,6 @@ msgstr "Você ainda não compartilhou nenhum arquivo." msgid "You haven't shared any files by link yet." msgstr "Você ainda não compartilhou nenhum arquivo por link." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Não foi possível carregar modelo" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Salvo" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Resetar" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Compartilhado por {owner}" @@ -118,19 +106,3 @@ msgstr "Baixar %s" #: templates/public.php:54 msgid "Direct link" msgstr "Link direto" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Modelo de email" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Tema" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Modelo" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Guardar" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index f5c6e2e6627..877ac102706 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -176,54 +176,85 @@ msgstr "" msgid "Saving..." msgstr "A guardar..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "Minutos atrás" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuto atrás" msgstr[1] "%n minutos atrás" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n hora atrás" msgstr[1] "%n horas atrás" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "hoje" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ontem" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dia atrás" msgstr[1] "%n dias atrás" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "ultímo mês" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n mês atrás" msgstr[1] "%n meses atrás" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "ano passado" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "anos atrás" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Repor password" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Sim" @@ -522,43 +553,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s reposição da password" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Use o seguinte endereço para repor a sua password: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Vai receber um endereço para repor a sua password" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nome de utilizador" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -566,30 +594,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora." -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Repor" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "A sua password foi reposta" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Para a página de entrada" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nova palavra-chave" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Repor password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -816,8 +835,8 @@ msgid "Please contact your administrator." msgstr "Por favor contacte o administrador." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Esqueceu-se da sua password?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po index a1ceb83a551..1687ea5846a 100644 --- a/l10n/pt_PT/files_encryption.po +++ b/l10n/pt_PT/files_encryption.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-10 01:54-0400\n" -"PO-Revision-Date: 2014-06-09 16:20+0000\n" -"Last-Translator: Fernando Moura <moura232@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -109,12 +109,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Criptografia inicial em execução ... Por favor, tente novamente mais tarde. " #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Ir directamente para o seu" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "configurações personalizadas " +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po index d3e2e2bd52b..2a90f84df07 100644 --- a/l10n/pt_PT/files_sharing.po +++ b/l10n/pt_PT/files_sharing.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -22,15 +22,15 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Partilhado consigo " -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Partilhado com outros" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -46,18 +46,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Guardado" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Repor" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Partilhado por {owner}" @@ -122,19 +110,3 @@ msgstr "Download %s" #: templates/public.php:54 msgid "Direct link" msgstr "Link direto" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Guardar" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index c079d55875b..6b34b875340 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -6,6 +6,7 @@ # Bruno Matias <bmgmatias@gmail.com>, 2013 # Daniel Pinto <daniel@mouxy.net>, 2013 # zedascouves <duartegrilo@gmail.com>, 2013 +# Fernando Moura <moura232@gmail.com>, 2014 # Helder Meneses <helder.meneses@gmail.com>, 2013-2014 # Jose Manuel Ruas <jmruas@gmail.com>, 2014 # Nelson Rosado <nelsontrosado@gmail.com>, 2013-2014 @@ -16,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-11 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 11:43+0000\n" +"Last-Translator: Fernando Moura <moura232@gmail.com>\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" @@ -296,15 +297,15 @@ msgstr "" #: js/users/groups.js:73 js/users/groups.js:178 msgid "Error creating group" -msgstr "" +msgstr "Erro ao criar grupo" #: js/users/groups.js:177 msgid "A valid group name must be provided" -msgstr "" +msgstr "Um nome válido do grupo tem de ser fornecido" #: js/users/groups.js:205 msgid "deleted {groupName}" -msgstr "" +msgstr "apagar {Nome do grupo}" #: js/users/groups.js:206 js/users/users.js:255 msgid "undo" @@ -332,7 +333,7 @@ msgstr "nunca" #: js/users/users.js:254 msgid "deleted {userName}" -msgstr "" +msgstr "apagar{utilizador}" #: js/users/users.js:371 msgid "add group" @@ -451,7 +452,7 @@ msgstr "" #: templates/admin.php:105 msgid "Database Performance Info" -msgstr "" +msgstr "Informação sobre desempenho da Base de Dados" #: templates/admin.php:108 msgid "" @@ -559,7 +560,7 @@ msgstr "Permitir que os utilizadores usem a API de partilha" #: templates/admin.php:247 msgid "Allow users to share via link" -msgstr "" +msgstr "Permitir que os utilizadores partilhem através do link" #: templates/admin.php:251 msgid "Enforce password protection" @@ -908,7 +909,7 @@ msgstr "" #: templates/users/part.grouplist.php:5 msgid "Add Group" -msgstr "" +msgstr "Adicionar grupo" #: templates/users/part.grouplist.php:10 msgid "Group" @@ -916,11 +917,11 @@ msgstr "Grupo" #: templates/users/part.grouplist.php:18 msgid "Everyone" -msgstr "" +msgstr "Para todos" #: templates/users/part.grouplist.php:29 msgid "Admins" -msgstr "" +msgstr "Administrador" #: templates/users/part.setquota.php:7 msgid "Default Quota" diff --git a/l10n/ro/core.po b/l10n/ro/core.po index f66b885f507..73ec0186060 100644 --- a/l10n/ro/core.po +++ b/l10n/ro/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -171,58 +171,89 @@ msgstr "" msgid "Saving..." msgstr "Se salvează..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "secunde în urmă" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "acum %n minut" msgstr[1] "acum %n minute" msgstr[2] "acum %n minute" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "acum %n oră" msgstr[1] "acum %n ore" msgstr[2] "acum %n ore" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "astăzi" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ieri" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "acum %n zi" msgstr[1] "acum %n zile" msgstr[2] "acum %n zile" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "ultima lună" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "ultimul an" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "ani în urmă" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Resetează parola" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Da" @@ -522,43 +553,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Actualizare reușită. Ești redirecționat către ownCloud." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Folosește următorul link pentru a reseta parola: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Linkul pentru resetarea parolei tale a fost trimis pe email. <br>Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. <br>Daca nu sunt acolo intreaba administratorul local." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corecte?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Vei primi un mesaj prin care vei putea reseta parola via email." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Nume utilizator" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -566,30 +594,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Da, eu chiar doresc să îmi resetez parola acum" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Parola a fost resetată" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Spre pagina de autentificare" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Noua parolă" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Resetează parola" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -816,8 +835,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Ai uitat parola?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po index 10021696c97..88fcebecfc9 100644 --- a/l10n/ro/files_encryption.po +++ b/l10n/ro/files_encryption.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -81,18 +81,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -105,13 +105,10 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "setari personale" - #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" msgstr "Încriptare" diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po index 648443cbf3a..4026741440a 100644 --- a/l10n/ro/files_sharing.po +++ b/l10n/ro/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Salvat" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -118,19 +106,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Salvează" diff --git a/l10n/ru/core.po b/l10n/ru/core.po index fa4b4d4a64b..30a02b276ac 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -29,9 +29,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-11 01:54-0400\n" -"PO-Revision-Date: 2014-06-10 21:50+0000\n" -"Last-Translator: Fukurokudzu <sergei.fukurokudzu@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -189,58 +189,89 @@ msgstr "Аудио" msgid "Saving..." msgstr "Сохранение..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "несколько секунд назад" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n минуту назад" msgstr[1] "%n минуты назад" msgstr[2] "%n минут назад" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n час назад" msgstr[1] "%n часа назад" msgstr[2] "%n часов назад" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "сегодня" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "вчера" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n день назад" msgstr[1] "%n дня назад" msgstr[2] "%n дней назад" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "в прошлом месяце" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n месяц назад" msgstr[1] "%n месяца назад" msgstr[2] "%n месяцев назад" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "в прошлом году" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "несколько лет назад" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Сбросить пароль" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Да" @@ -540,43 +571,40 @@ msgstr "Обновление не удалось." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s сброс пароля" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Произошла ошибка при отправке сообщения электронной почты, пожалуйста, свяжитесь с Вашим администратором." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Используйте следующую ссылку чтобы сбросить пароль: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Ссылка для сброса пароля отправлена вам по электронной почте.<br>Если вы не получите письмо в пределах одной-двух минут, проверьте папку Спам. <br>Если письма там нет, обратитесь к своему администратору." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Запрос не удался. Вы уверены, что email или имя пользователя указаны верно?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "На ваш адрес Email выслана ссылка для сброса пароля." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Имя пользователя" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -584,30 +612,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Да, я действительно хочу сбросить свой пароль" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Сброс" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Ваш пароль был сброшен" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "На страницу авторизации" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Новый пароль" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Сбросить пароль" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -834,8 +853,8 @@ msgid "Please contact your administrator." msgstr "Пожалуйста, свяжитесь с вашим администратором." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Забыли пароль?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po index 7ec4b28810b..e479324a730 100644 --- a/l10n/ru/files_encryption.po +++ b/l10n/ru/files_encryption.po @@ -3,22 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ант По <du6egub@gmail.com>, 2013 -# alfsoft <alfsoft@gmail.com>, 2013 -# lord93 <lordakryl@gmail.com>, 2013 +# Alexander Poberezhsky <du6egub@gmail.com>, 2013 +# Alf <alfsoft@gmail.com>, 2013 +# Andrew Batchmauga <lordakryl@gmail.com>, 2013 # Gennady <mxiru@mail.ru>, 2014 # jekader <jekader@gmail.com>, 2013 -# eurekafag <rkfg@rkfg.me>, 2013 +# Serge Shpikin <rkfg@rkfg.me>, 2013 # Swab <swab@i.ua>, 2014 # Victor Bravo <>, 2013 -# vsapronov <vladimir.sapronov@gmail.com>, 2013 +# Vladimir Sapronov <vladimir.sapronov@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-30 01:54-0400\n" -"PO-Revision-Date: 2014-05-29 08:11+0000\n" -"Last-Translator: Gennady <mxiru@mail.ru>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -89,18 +89,18 @@ msgid "" "administrator" msgstr "Неизвестная ошибка. Пожалуйста, проверьте системные настройки или свяжитесь с администратором" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Требования отсутствуют." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Для следующих пользователей шифрование не настроено:" @@ -113,12 +113,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Работает первоначальное шифрование... Пожалуйста, повторите попытку позже." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Перейти прямо в" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "персональные настройки" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po index ca541eb93d8..6887a86b40e 100644 --- a/l10n/ru/files_sharing.po +++ b/l10n/ru/files_sharing.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -24,15 +24,15 @@ 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" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -48,18 +48,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Сохранено" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Сброс" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Доступ открыл {owner}" @@ -124,19 +112,3 @@ msgstr "Скачать %s" #: templates/public.php:54 msgid "Direct link" msgstr "Прямая ссылка" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Тема" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Шаблон" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Сохранить" diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po index 8b57a117928..55c89de561c 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "සුරැකෙමින් පවතී..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "තත්පරයන්ට පෙර" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "අද" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "ඊයේ" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "පෙර මාසයේ" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "පෙර අවුරුද්දේ" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "අවුරුදු කීපයකට පෙර" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "මුරපදය ප්රත්යාරම්භ කරන්න" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "ඔව්" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "ඔබගේ මුරපදය ප්රත්යාරම්භ කිරීම සඳහා යොමුව විද්යුත් තැපෑලෙන් ලැබෙනු ඇත" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "පරිශීලක නම" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,30 +585,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "ඔබේ මුරපදය ප්රත්යාරම්භ කරන ලදී" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "පිවිසුම් පිටුවට" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "නව මුරපදය" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "මුරපදය ප්රත්යාරම්භ කරන්න" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -807,8 +826,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "මුරපදය අමතකද?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po index 2911fb32a10..c5acd138953 100644 --- a/l10n/si_LK/files_encryption.po +++ b/l10n/si_LK/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po index 96201144fd3..cc919c37be6 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: si_LK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "සුරකින්න" diff --git a/l10n/sk/core.po b/l10n/sk/core.po index bf963dfd0a7..aa95a8acb5e 100644 --- a/l10n/sk/core.po +++ b/l10n/sk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -167,58 +167,89 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -518,43 +549,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -562,29 +590,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -812,7 +831,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po index 2af59c39656..827990715e8 100644 --- a/l10n/sk/files_encryption.po +++ b/l10n/sk/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po index b0d9fe0696a..040855b3fd2 100644 --- a/l10n/sk/files_sharing.po +++ b/l10n/sk/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Uložiť" diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po index 2f1ba93f07e..babc91d94c9 100644 --- a/l10n/sk_SK/core.po +++ b/l10n/sk_SK/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-11 01:54-0400\n" -"PO-Revision-Date: 2014-06-10 13:02+0000\n" -"Last-Translator: Marián Hvolka <marian.hvolka@stuba.sk>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -169,58 +169,89 @@ msgstr "Zvuk" msgid "Saving..." msgstr "Ukladám..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "pred sekundami" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "pred %n minútou" msgstr[1] "pred %n minútami" msgstr[2] "pred %n minútami" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "pred %n hodinou" msgstr[1] "pred %n hodinami" msgstr[2] "pred %n hodinami" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "dnes" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "včera" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "pred %n dňom" msgstr[1] "pred %n dňami" msgstr[2] "pred %n dňami" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "minulý mesiac" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "pred %n mesiacom" msgstr[1] "pred %n mesiacmi" msgstr[2] "pred %n mesiacmi" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "minulý rok" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "pred rokmi" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Obnovenie hesla" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Áno" @@ -520,43 +551,40 @@ msgstr "Aktualizácia zlyhala." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "reset hesla %s" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Vyskytol sa problém pri odosielaní emailu, prosím obráťte sa na správcu." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Odkaz na obnovenie hesla bol odoslaný na vašu emailovú adresu.<br>Ak ho v krátkej dobe neobdržíte, skontrolujte si váš kôš a priečinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Požiadavka zlyhala.<br>Uistili ste sa, že vaše používateľské meno a email sú správne?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Odkaz pre obnovenie hesla obdržíte emailom." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Meno používateľa" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -564,30 +592,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Áno, želám si teraz obnoviť svoje heslo" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Resetovať" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Vaše heslo bolo obnovené" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Na prihlasovaciu stránku" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nové heslo" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Obnovenie hesla" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -814,8 +833,8 @@ msgid "Please contact your administrator." msgstr "Kontaktujte prosím vášho administrátora." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Zabudli ste heslo?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po index 6f973b465d3..96109b027ee 100644 --- a/l10n/sk_SK/files_encryption.po +++ b/l10n/sk_SK/files_encryption.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 07:20+0000\n" -"Last-Translator: Marián Hvolka <marian.hvolka@stuba.sk>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -106,12 +106,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Počiatočné šifrovanie beží... Skúste to neskôr znovu." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Choďte priamo do vášho" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "osobné nastavenia" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po index 13544987fec..517200e10ca 100644 --- a/l10n/sk_SK/files_sharing.po +++ b/l10n/sk_SK/files_sharing.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-11 01:54-0400\n" -"PO-Revision-Date: 2014-06-10 13:02+0000\n" -"Last-Translator: Marián Hvolka <marian.hvolka@stuba.sk>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -18,15 +18,15 @@ msgstr "" "Language: sk_SK\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Zdieľané s vami" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Zdieľané s ostanými" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Zdieľané pomocou odkazu" @@ -42,18 +42,6 @@ msgstr "Zatiaľ ste nezdieľali žiadne súbory." msgid "You haven't shared any files by link yet." msgstr "Zatiaľ ste pomocou odkazu nezdieľali žiaden súbor." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Šablónu nemožno nahrať" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Uložené" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Resetovať" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Zdieľa {owner}" @@ -118,19 +106,3 @@ msgstr "Stiahnuť %s" #: templates/public.php:54 msgid "Direct link" msgstr "Priama linka" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Emailové šablóny" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Téma" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Šablóna" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Uložiť" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 7071ce1cc48..7aebbccef32 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -169,11 +169,11 @@ msgstr "" msgid "Saving..." msgstr "Poteka shranjevanje ..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "pred nekaj sekundami" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "pred %n minuto" @@ -181,7 +181,7 @@ msgstr[1] "pred %n minutama" msgstr[2] "pred %n minutami" msgstr[3] "pred %n minutami" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "pred %n uro" @@ -189,15 +189,15 @@ msgstr[1] "pred %n urama" msgstr[2] "pred %n urami" msgstr[3] "pred %n urami" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "danes" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "včeraj" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "pred %n dnevom" @@ -205,11 +205,11 @@ msgstr[1] "pred %n dnevoma" msgstr[2] "pred %n dnevi" msgstr[3] "pred %n dnevi" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "zadnji mesec" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "pred %n mesecem" @@ -217,14 +217,45 @@ msgstr[1] "pred %n mesecema" msgstr[2] "pred %n meseci" msgstr[3] "pred %n meseci" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "lansko leto" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "let nazaj" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Ponastavi geslo" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Da" @@ -525,43 +556,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "Ponastavitev gesla %s" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Prišlo je do napake med pošiljanjem elektronskega sporočila. Stopite v stik s skrbnikom sistema." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Za ponastavitev gesla uporabite povezavo: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Povezava za ponastavitev gesla je bila poslana na elektronski naslov.<br>V kolikor sporočila ne prejmete v doglednem času, preverite tudi mape vsiljene pošte.<br>Če ne bo niti tam, stopite v stik s skrbnikom." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Uporabniško ime" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -569,30 +597,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Da, potrjujem ponastavitev gesla" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Ponastavi" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Geslo je ponovno nastavljeno" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Na prijavno stran" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Novo geslo" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Ponastavi geslo" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -819,8 +838,8 @@ msgid "Please contact your administrator." msgstr "Stopite v stik s skrbnikom sistema." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Ali ste pozabili geslo?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po index 3acc39312b3..be25770e8f1 100644 --- a/l10n/sl/files_encryption.po +++ b/l10n/sl/files_encryption.po @@ -4,13 +4,13 @@ # # Translators: # barbarak <barbarak@arnes.si>, 2013 -# mateju <>, 2013-2014 +# Matej Urbančič <>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -82,18 +82,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Manjkajoče zahteve" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Preverite, ali je na strežniku nameščen paket PHP 5.3.3 ali novejši, da je omogočen in pravilno nastavljen PHP OpenSSL. Z obstoječimi možnostmi šifriranje ni mogoče." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Navedeni uporabniki še nimajo nastavljenega šifriranja:" @@ -106,12 +106,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Začetno šifriranje je v teku ... Poskusite kasneje." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Skočite neposredno na" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "osebne nastavitve" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po index d396bbe5d30..12d6137382f 100644 --- a/l10n/sl/files_sharing.po +++ b/l10n/sl/files_sharing.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: Romana <romanaro@hotmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +19,15 @@ 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" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Deljen z vami" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Deljen z ostalimi" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Souporaba preko povezave" @@ -43,18 +43,6 @@ msgstr "Niste še delili datotek" msgid "You haven't shared any files by link yet." msgstr "Niste še delili datotek preko povezave" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Predloge ni bilo mogoče naložiti" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Shranjeno" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Ponastavi" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Souporabo omogoča {owner}" @@ -119,19 +107,3 @@ msgstr "Prejmi %s" #: templates/public.php:54 msgid "Direct link" msgstr "Neposredna povezava" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Predloga elektronske pošte" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Tema" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Predloga" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Shrani" diff --git a/l10n/sq/core.po b/l10n/sq/core.po index 82af41207b5..f444cdbc3bc 100644 --- a/l10n/sq/core.po +++ b/l10n/sq/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -169,54 +169,85 @@ msgstr "" msgid "Saving..." msgstr "Duke ruajtur..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sekonda më parë" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut më parë" msgstr[1] "%n minuta më parë" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n orë më parë" msgstr[1] "%n orë më parë" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "sot" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "dje" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n ditë më parë" msgstr[1] "%n ditë më parë" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "muajin e shkuar" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n muaj më parë" msgstr[1] "%n muaj më parë" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "vitin e shkuar" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "vite më parë" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Rivendos kodin" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Po" @@ -515,43 +546,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "Kodi i %s -it u rivendos" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "Kodi i %s -it u rivendos" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Përdorni lidhjen në vijim për të rivendosur kodin: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj.<br>Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam).<br>Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Përdoruesi" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Po, dua ta rivendos kodin tani" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Kodi yt u rivendos" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Tek faqja e hyrjes" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Kodi i ri" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Rivendos kodin" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Ke humbur kodin?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po index cd312b93825..768d43ef9e1 100644 --- a/l10n/sq/files_encryption.po +++ b/l10n/sq/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po index e98b047cd32..2b2f860f26a 100644 --- a/l10n/sq/files_sharing.po +++ b/l10n/sq/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" "MIME-Version: 1.0\n" @@ -19,15 +19,15 @@ msgstr "" "Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -43,18 +43,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -119,19 +107,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "Lidhje direkte" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Ruaj" diff --git a/l10n/sr/core.po b/l10n/sr/core.po index 53d7521cdf5..7745664999c 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -167,58 +167,89 @@ msgstr "" msgid "Saving..." msgstr "Чување у току..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "пре неколико секунди" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "данас" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "јуче" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "прошлог месеца" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "прошле године" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "година раније" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Ресетуј лозинку" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Да" @@ -518,43 +549,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "Овом везом ресетујте своју лозинку: {link}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "Овом везом ресетујте своју лозинку: {link}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Добићете везу за ресетовање лозинке путем е-поште." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Корисничко име" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -562,30 +590,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Ваша лозинка је ресетована" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "На страницу за пријаву" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Нова лозинка" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Ресетуј лозинку" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -812,8 +831,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Изгубили сте лозинку?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po index 049f1b7b073..4d22860fde4 100644 --- a/l10n/sr/files_encryption.po +++ b/l10n/sr/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po index 3738a153879..30d5390d281 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ 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" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Сачувај" diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po index ea50b7416b7..4c3bc6f8ac9 100644 --- a/l10n/sr@latin/core.po +++ b/l10n/sr@latin/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -169,58 +169,89 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "Pre par sekundi" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "Danas" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "juče" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Prije %n dan." msgstr[1] "Prije %n dana." msgstr[2] "Prije %n dana." -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "prošlog meseca" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "prošle godine" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "pre nekoliko godina" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Resetuj lozinku" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Da" @@ -520,43 +551,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Ažuriranje je uspelo. Prosleđivanje na ownCloud." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "Koristite sledeći link za reset lozinke: {link}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "Koristite sledeći link za reset lozinke: {link}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Dobićete vezu za resetovanje lozinke putem e-pošte." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Korisničko ime" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -564,30 +592,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Vaša lozinka je resetovana" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Na login stranicu" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nova lozinka" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Resetuj lozinku" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -814,8 +833,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Izgubili ste lozinku?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po index ecc4d3e78d5..92a1c60f064 100644 --- a/l10n/sr@latin/files_encryption.po +++ b/l10n/sr@latin/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po index 97702d7cf63..50a6f9b304f 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ 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" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Snimi" diff --git a/l10n/su/core.po b/l10n/su/core.po index 138d1b4f73b..951c7a7f10a 100644 --- a/l10n/su/core.po +++ b/l10n/su/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n" "MIME-Version: 1.0\n" @@ -167,50 +167,81 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -508,43 +539,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -552,29 +580,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -802,7 +821,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/su/files_encryption.po b/l10n/su/files_encryption.po index 9a941b86fd6..ed477fab014 100644 --- a/l10n/su/files_encryption.po +++ b/l10n/su/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/su/files_sharing.po b/l10n/su/files_sharing.po index e0d683c47e3..7d4279f73c9 100644 --- a/l10n/su/files_sharing.po +++ b/l10n/su/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: su\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index 0d8af41be5c..f8611f4ea5e 100644 --- a/l10n/sv/core.po +++ b/l10n/sv/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -176,54 +176,85 @@ msgstr "" msgid "Saving..." msgstr "Sparar..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "sekunder sedan" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut sedan" msgstr[1] "%n minuter sedan" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n timme sedan" msgstr[1] "%n timmar sedan" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "i dag" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "i går" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dag sedan" msgstr[1] "%n dagar sedan" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "förra månaden" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n månad sedan" msgstr[1] "%n månader sedan" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "förra året" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "år sedan" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Återställ lösenordet" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Ja" @@ -522,43 +553,40 @@ msgstr "Uppdateringen misslyckades." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s återställ lösenord" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "Ett problem har uppstått under tiden e-post sändes, vänligen kontakta din administratör." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Använd följande länk för att återställa lösenordet: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "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:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Begäran misslyckades!<br>Är du helt säker på att din e-postadress/användarnamn är korrekt?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Du får en länk att återställa ditt lösenord via e-post." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Användarnamn" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -566,30 +594,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Ja, jag vill verkligen återställa mitt lösenord nu" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Återställ" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Ditt lösenord har återställts" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Till logginsidan" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Nytt lösenord" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Återställ lösenordet" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -816,8 +835,8 @@ msgid "Please contact your administrator." msgstr "Kontakta din administratör." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Glömt ditt lösenord?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po index 763343c67f3..6f22c27c14a 100644 --- a/l10n/sv/files_encryption.po +++ b/l10n/sv/files_encryption.po @@ -3,22 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# AsavarTzeth <asavartzeth@gmail.com>, 2014 +# Patrik Nilsson <asavartzeth@gmail.com>, 2014 # Daniel Sandman <revoltism@gmail.com>, 2013 # Gustav Smedberg <shadow.elf@hotmail.com>, 2013 -# henrikhjelm <mailto@henrikhjelm.se>, 2014 -# medialabs, 2013 -# kallemooo <karl.h.thoren@gmail.com>, 2013 +# henrik hjelm <mailto@henrikhjelm.se>, 2014 +# Juho Ojala, 2013 +# Karl Thorén <karl.h.thoren@gmail.com>, 2013 # Magnus Höglund <magnus@linux.com>, 2013 -# medialabs, 2013 +# Juho Ojala, 2013 # Stefan Gagner <stefan@mei-ya.se>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-29 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 19:40+0000\n" -"Last-Translator: henrikhjelm <mailto@henrikhjelm.se>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -89,18 +89,18 @@ msgid "" "administrator" msgstr "Okänt fel. Kontrollera dina systeminställningar eller kontakta din administratör" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Krav som saknas" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Följande användare har inte aktiverat kryptering:" @@ -113,12 +113,9 @@ msgid "Initial encryption running... Please try again later." msgstr "Initiala krypteringen körs... Var god försök igen senare." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Gå direkt till din" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "personliga inställningar" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po index 48bb824dd8e..951d08b2cc2 100644 --- a/l10n/sv/files_sharing.po +++ b/l10n/sv/files_sharing.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -22,15 +22,15 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Delat med dig" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Delat med andra" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -46,18 +46,6 @@ msgstr "Du har inte delat några filer ännu." msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Kunde inte ladda mall" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Sparad" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Återställ" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Delad av {owner}" @@ -122,19 +110,3 @@ msgstr "Ladda ner %s" #: templates/public.php:54 msgid "Direct link" msgstr "Direkt länk" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "e-postmallar" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Teman" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Mallar" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Spara" diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po index 25d5e2730c3..aed61104cd6 100644 --- a/l10n/sw_KE/core.po +++ b/l10n/sw_KE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po index d697a104bd1..a07baadcdcd 100644 --- a/l10n/sw_KE/files_encryption.po +++ b/l10n/sw_KE/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po index 33b4babb135..d9dcff48fbd 100644 --- a/l10n/sw_KE/files_sharing.po +++ b/l10n/sw_KE/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: sw_KE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ta_IN/core.po b/l10n/ta_IN/core.po index a1af44b02a8..3fb6dae1a21 100644 --- a/l10n/ta_IN/core.po +++ b/l10n/ta_IN/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/ta_IN/files_encryption.po b/l10n/ta_IN/files_encryption.po index e53964ca4c7..c511e9904a2 100644 --- a/l10n/ta_IN/files_encryption.po +++ b/l10n/ta_IN/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ta_IN/files_sharing.po b/l10n/ta_IN/files_sharing.po index 0c54d084a9e..8986466347a 100644 --- a/l10n/ta_IN/files_sharing.po +++ b/l10n/ta_IN/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ta_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po index 0c2bd8587a5..498fcb09125 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "சேமிக்கப்படுகிறது..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "செக்கன்களுக்கு முன்" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "இன்று" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "நேற்று" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "கடந்த மாதம்" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "கடந்த வருடம்" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "வருடங்களுக்கு முன்" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "மீளமைத்த கடவுச்சொல்" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "ஆம்" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். " -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "பயனாளர் பெயர்" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,30 +585,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "உங்களுடைய கடவுச்சொல் மீளமைக்கப்பட்டது" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "புகுபதிகைக்கான பக்கம்" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "புதிய கடவுச்சொல்" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "மீளமைத்த கடவுச்சொல்" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -807,8 +826,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po index 36f5c18b0b8..55f15140919 100644 --- a/l10n/ta_LK/files_encryption.po +++ b/l10n/ta_LK/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po index 3bc4db4bd07..00119f9b2e4 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ta_LK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "பகிரப்பட்டது {சொந்தகாரர்}" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "சேமிக்க " diff --git a/l10n/te/core.po b/l10n/te/core.po index 9b06626af04..0a147c23b7a 100644 --- a/l10n/te/core.po +++ b/l10n/te/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "క్షణాల క్రితం" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n నిమిషం క్రితం" msgstr[1] "%n నిమిషాల క్రితం" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n గంట క్రితం" msgstr[1] "%n గంటల క్రితం" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "ఈరోజు" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "నిన్న" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n రోజు క్రితం" msgstr[1] "%n రోజుల క్రితం" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "పోయిన నెల" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n నెల క్రితం" msgstr[1] "%n నెలల క్రితం" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "పోయిన సంవత్సరం" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "సంవత్సరాల క్రితం" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "అవును" @@ -514,43 +545,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "వాడుకరి పేరు" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,29 +586,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "కొత్త సంకేతపదం" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -808,8 +827,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "మీ సంకేతపదం పోయిందా?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po index 182b49a08c3..74042957624 100644 --- a/l10n/te/files_encryption.po +++ b/l10n/te/files_encryption.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# వీవెన్ వీరపనేని <veeven@gmail.com>, 2013 +# వీవెన్ <veeven@gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -81,18 +81,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -105,13 +105,10 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "వ్యక్తిగత అమరికలు" - #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" msgstr "" diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po index 87a044c77f4..dcd28b7c972 100644 --- a/l10n/te/files_sharing.po +++ b/l10n/te/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "భద్రపరచు" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 9ab068ac1fa..1a45e8f498c 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -514,43 +545,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,29 +586,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 183a049778c..d4a54d32940 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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 bd48d821e04..df57f11d9a9 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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" @@ -103,11 +103,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 740d1beccc6..51a9194c898 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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 d469875042a..85f055700fa 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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,15 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 595d074c974..1d1f136ab88 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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 1889a9013a4..e6c2286b3a8 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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 4c458373e45..791213cecb4 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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/private.pot b/l10n/templates/private.pot index 8e3c0372aa2..fd3c2c35db8 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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/settings.pot b/l10n/templates/settings.pot index d8f3a7b8aef..3c68ea3f3ee 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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" @@ -47,15 +47,15 @@ msgstr "" msgid "You need to set your user email before being able to send test emails." msgstr "" -#: admin/controller.php:116 templates/admin.php:353 +#: admin/controller.php:116 templates/admin.php:349 msgid "Send mode" msgstr "" -#: admin/controller.php:118 templates/admin.php:366 templates/personal.php:144 +#: admin/controller.php:118 templates/admin.php:362 templates/personal.php:144 msgid "Encryption" msgstr "" -#: admin/controller.php:120 templates/admin.php:390 +#: admin/controller.php:120 templates/admin.php:386 msgid "Authentication method" msgstr "" @@ -600,90 +600,90 @@ msgstr "" msgid "Security" msgstr "" -#: templates/admin.php:328 +#: templates/admin.php:326 msgid "Enforce HTTPS" msgstr "" -#: templates/admin.php:330 +#: templates/admin.php:328 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." msgstr "" -#: templates/admin.php:336 +#: templates/admin.php:334 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." msgstr "" -#: templates/admin.php:348 +#: templates/admin.php:344 msgid "Email Server" msgstr "" -#: templates/admin.php:350 +#: templates/admin.php:346 msgid "This is used for sending out notifications." msgstr "" -#: templates/admin.php:381 +#: templates/admin.php:377 msgid "From address" msgstr "" -#: templates/admin.php:382 +#: templates/admin.php:378 msgid "mail" msgstr "" -#: templates/admin.php:403 +#: templates/admin.php:399 msgid "Authentication required" msgstr "" -#: templates/admin.php:407 +#: templates/admin.php:403 msgid "Server address" msgstr "" -#: templates/admin.php:411 +#: templates/admin.php:407 msgid "Port" msgstr "" -#: templates/admin.php:416 +#: templates/admin.php:412 msgid "Credentials" msgstr "" -#: templates/admin.php:417 +#: templates/admin.php:413 msgid "SMTP Username" msgstr "" -#: templates/admin.php:420 +#: templates/admin.php:416 msgid "SMTP Password" msgstr "" -#: templates/admin.php:424 +#: templates/admin.php:420 msgid "Test email settings" msgstr "" -#: templates/admin.php:425 +#: templates/admin.php:421 msgid "Send email" msgstr "" -#: templates/admin.php:430 +#: templates/admin.php:426 msgid "Log" msgstr "" -#: templates/admin.php:431 +#: templates/admin.php:427 msgid "Log level" msgstr "" -#: templates/admin.php:463 +#: templates/admin.php:459 msgid "More" msgstr "" -#: templates/admin.php:464 +#: templates/admin.php:460 msgid "Less" msgstr "" -#: templates/admin.php:470 templates/personal.php:196 +#: templates/admin.php:466 templates/personal.php:196 msgid "Version" msgstr "" -#: templates/admin.php:474 templates/personal.php:199 +#: templates/admin.php:470 templates/personal.php:199 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank" "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" " diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index a115622e50f..12b570a3a4d 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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 40190205415..aa039ba8353 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-12 01:54-0400\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\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 3713817ef55..a2f4cfc7e83 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -167,50 +167,81 @@ msgstr "" msgid "Saving..." msgstr "กำลังบันทึกข้อมูล..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "วินาที ก่อนหน้านี้" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "วันนี้" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "เมื่อวานนี้" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "เดือนที่แล้ว" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "ปีที่แล้ว" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "ปี ที่ผ่านมา" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "เปลี่ยนรหัสผ่าน" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "ตกลง" @@ -508,43 +539,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "ชื่อผู้ใช้งาน" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -552,30 +580,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "รหัสผ่านของคุณถูกเปลี่ยนเรียบร้อยแล้ว" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "ไปที่หน้าเข้าสู่ระบบ" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "รหัสผ่านใหม่" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "เปลี่ยนรหัสผ่าน" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -802,8 +821,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "ลืมรหัสผ่าน?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po index a35e6e9d583..cdeef2abe6e 100644 --- a/l10n/th_TH/files_encryption.po +++ b/l10n/th_TH/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po index d18d1213204..bed6d4ad03e 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: th_TH\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "ถูกแชร์โดย {owner}" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "บันทึก" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index c11c8a435ca..a941617ef41 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 12:10+0000\n" -"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -171,54 +171,85 @@ msgstr "Ses" msgid "Saving..." msgstr "Kaydediliyor..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "saniyeler önce" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n dakika önce" msgstr[1] "%n dakika önce" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n saat önce" msgstr[1] "%n saat önce" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "bugün" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "dün" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n gün önce" msgstr[1] "%n gün önce" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "geçen ay" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n ay önce" msgstr[1] "%n ay önce" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "geçen yıl" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "yıllar önce" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Parolayı sıfırla" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Evet" @@ -517,43 +548,40 @@ msgstr "Güncelleme başarısız oldu." msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz." -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "%s parola sıfırlama" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "E-posta gönderilirken bir hata oluştu. Lütfen yöneticinizle iletişime geçin." - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk/gereksiz dizinini kontrol ediniz.<br>Eğer yine bulamazsanız sistem yöneticinize danışın." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "İstek başarısız!<br>E-posta ve/veya kullanıcı adınızın doğru olduğundan emin misiniz?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Kullanıcı Adı" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -561,30 +589,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Sıfırla" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Parolanız sıfırlandı" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Giriş sayfasına git" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Yeni parola" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Parolayı sıfırla" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -811,8 +830,8 @@ msgid "Please contact your administrator." msgstr "Lütfen sistem yöneticiniz ile iletişime geçin." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Parolanızı mı unuttunuz?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po index 3a189b7876a..2d7cdbd66e5 100644 --- a/l10n/tr/files_encryption.po +++ b/l10n/tr/files_encryption.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# ismail yenigül <ismail.yenigul@surgate.com>, 2013 -# volkangezer <volkangezer@gmail.com>, 2013-2014 +# ismail yenigul <ismail.yenigul@surgate.com>, 2013 +# Volkan Gezer <volkangezer@gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-29 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 14:18+0000\n" -"Last-Translator: volkangezer <volkangezer@gmail.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 17:53+0000\n" +"Last-Translator: Volkan Gezer <volkangezer@gmail.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" @@ -82,18 +82,18 @@ msgid "" "administrator" msgstr "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "Gereklilikler eksik." -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğundan ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı." -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:" @@ -106,12 +106,9 @@ msgid "Initial encryption running... Please try again later." msgstr "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin." #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "Doğrudan " - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "kişisel ayarlarınıza gidin" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "Doğrudan %skişisel ayarlarınıza%s gidin." #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po index 055a17e1c79..3479bae01fa 100644 --- a/l10n/tr/files_external.po +++ b/l10n/tr/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 12:10+0000\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 18:30+0000\n" "Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -112,7 +112,7 @@ msgstr "Güvenli ftps://" #: appinfo/app.php:101 msgid "Client ID" -msgstr "İstemci Kimliğ" +msgstr "İstemci kimliği" #: appinfo/app.php:102 msgid "Client secret" @@ -192,7 +192,7 @@ msgstr "Dropbox depo yapılandırma hatası" #: js/dropbox.js:68 js/google.js:89 msgid "Grant access" -msgstr "Erişim sağlandı" +msgstr "Erişimi sağla" #: js/dropbox.js:102 msgid "Please provide a valid Dropbox app key and secret." diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po index 37f51f8b5cd..cdd7821f5e8 100644 --- a/l10n/tr/files_sharing.po +++ b/l10n/tr/files_sharing.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -18,15 +18,15 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "Sizinle paylaşılmış" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "Diğerleri ile paylaşılmış" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "Bağlantı ile paylaşılmış" @@ -42,18 +42,6 @@ msgstr "Henüz hiçbir dosya paylaşmadınız." msgid "You haven't shared any files by link yet." msgstr "Bağlantı ile henüz hiçbir dosya paylaşmadınız." -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "Şablon yüklenemedi" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "Kaydedildi" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Sıfırla" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "{owner} tarafından paylaşılmış" @@ -118,19 +106,3 @@ msgstr "İndir: %s" #: templates/public.php:54 msgid "Direct link" msgstr "Doğrudan bağlantı" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "Posta şablonları" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "Tema" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "Şablon" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Kaydet" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index f5f19347e99..aad9536b66a 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-11 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-13 01:54-0400\n" +"PO-Revision-Date: 2014-06-12 16:10+0000\n" +"Last-Translator: Volkan Gezer <volkangezer@gmail.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" @@ -287,7 +287,7 @@ msgstr "Şifreleme anahtarlarını geri yükle." #: js/users/deleteHandler.js:166 msgid "Unable to delete {objName}" -msgstr "" +msgstr "{objName} silinemiyor" #: js/users/groups.js:73 js/users/groups.js:178 msgid "Error creating group" @@ -299,7 +299,7 @@ msgstr "Geçerli bir grup adı mutlaka sağlanmalı" #: js/users/groups.js:205 msgid "deleted {groupName}" -msgstr "" +msgstr "{groupName} silindi" #: js/users/groups.js:206 js/users/users.js:255 msgid "undo" @@ -327,7 +327,7 @@ msgstr "hiçbir zaman" #: js/users/users.js:254 msgid "deleted {userName}" -msgstr "" +msgstr "{userName} silindi" #: js/users/users.js:371 msgid "add group" diff --git a/l10n/tzm/core.po b/l10n/tzm/core.po index 09e5c3e918b..a3ce05cacb7 100644 --- a/l10n/tzm/core.po +++ b/l10n/tzm/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/tzm/files_encryption.po b/l10n/tzm/files_encryption.po index ca51ee1060e..9f0bd0aef1b 100644 --- a/l10n/tzm/files_encryption.po +++ b/l10n/tzm/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/tzm/files_sharing.po b/l10n/tzm/files_sharing.po index c08aed20aa4..5bcb49d34fa 100644 --- a/l10n/tzm/files_sharing.po +++ b/l10n/tzm/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: tzm\n" "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ug/core.po b/l10n/ug/core.po index 4552878d9dd..9da12da2a05 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" @@ -167,50 +167,81 @@ msgstr "" msgid "Saving..." msgstr "ساقلاۋاتىدۇ…" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "بۈگۈن" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "تۈنۈگۈن" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "ھەئە" @@ -508,43 +539,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "ئىشلەتكۈچى ئاتى" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -552,29 +580,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "يېڭى ئىم" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -802,7 +821,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po index ad014580c60..257bde4bd76 100644 --- a/l10n/ug/files_encryption.po +++ b/l10n/ug/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po index 8c51ecef488..6ceb3cf88b5 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ msgstr "" "Language: ug\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -118,19 +106,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "ساقلا" diff --git a/l10n/uk/core.po b/l10n/uk/core.po index ec60ae04a01..a472530344e 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -169,58 +169,89 @@ msgstr "" msgid "Saving..." msgstr "Зберігаю..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "секунди тому" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n хвилину тому" msgstr[1] "%n хвилини тому" msgstr[2] "%n хвилин тому" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n годину тому" msgstr[1] "%n години тому" msgstr[2] "%n годин тому" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "сьогодні" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "вчора" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n день тому" msgstr[1] "%n дні тому" msgstr[2] "%n днів тому" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "минулого місяця" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n місяць тому" msgstr[1] "%n місяці тому" msgstr[2] "%n місяців тому" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "минулого року" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "роки тому" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Скинути пароль" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Так" @@ -520,43 +551,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Оновлення виконалось успішно. Перенаправляємо вас на ownCloud." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s пароль скинуто" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s пароль скинуто" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Використовуйте наступне посилання для скидання пароля: {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Посилання для того, щоб скинути ваш пароль було надіслано на ваший Email.<br>Якщо ви не отримали його найближчим часом, перевірте ваший спам каталог.<br>Якщо і там немає, спитайте вашого місцевого Адміністратора." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Запит завершився невдало !<br>Ви переконані, що ваша адреса Email/ім'я користувача вірні ?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Ім'я користувача" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -564,30 +592,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Так, я справді бажаю скинути мій пароль зараз" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Перевстановити" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Ваш пароль був скинутий" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "До сторінки входу" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Новий пароль" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Скинути пароль" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -814,8 +833,8 @@ msgid "Please contact your administrator." msgstr "Будь ласка, зверніться до вашого Адміністратора." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Забули пароль?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po index 94427439a3e..42976e4d9d0 100644 --- a/l10n/uk/files_encryption.po +++ b/l10n/uk/files_encryption.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -81,18 +81,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -105,13 +105,10 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "особисті налаштування" - #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" msgstr "Шифрування" diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po index 3bafe793cb6..a87a44241bb 100644 --- a/l10n/uk/files_sharing.po +++ b/l10n/uk/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ 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" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Перевстановити" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Опублікував {owner}" @@ -118,19 +106,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "Пряме посилання" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Зберегти" diff --git a/l10n/ur/core.po b/l10n/ur/core.po index 1931cdbdefb..9aef119e029 100644 --- a/l10n/ur/core.po +++ b/l10n/ur/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n" "MIME-Version: 1.0\n" @@ -167,54 +167,85 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -513,43 +544,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -557,29 +585,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -807,7 +826,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/ur/files_encryption.po b/l10n/ur/files_encryption.po index 99bceb54362..d37917c316c 100644 --- a/l10n/ur/files_encryption.po +++ b/l10n/ur/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ur/files_sharing.po b/l10n/ur/files_sharing.po index 3dfe7e37340..57160cbc400 100644 --- a/l10n/ur/files_sharing.po +++ b/l10n/ur/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ur\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po index 0328d1c8ec5..60545e8fede 100644 --- a/l10n/ur_PK/core.po +++ b/l10n/ur_PK/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -168,54 +168,85 @@ msgstr "" msgid "Saving..." msgstr "محفوظ ھو رہا ہے ..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "سیکنڈز پہلے" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n منٹس پہلے" msgstr[1] "%n منٹس پہلے" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "آج" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "کل" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "پچھلے مہنیے" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "پچھلے سال" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "سالوں پہلے" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "ری سیٹ پاسورڈ" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "ہاں" @@ -514,43 +545,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "ای میل بھیجنے کے دوران ایک مسئلہ پیش آیا ہے , براہ مہربانی اپنےایڈمنسٹریٹر سے رابطہ کریں." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔ {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "آپ کا پاس ورڈ ری سیٹ کرنےکا لنک آپ کی ای میل ميں بھیجح دیا گیا ہے .<br> اگر آپ اسکو معقول وقت کے اندر وصول نہیں کرتے ، آپ سپیم/جنک کے فولڈرز دیکھیں .<br> اگر وہ وہاں نہیں ہے تو اپنے مقامی منتظم سے کہیں ۔" - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "گذارش ناکام!<br>کيا پ نے يقينی بنايا کہ آپ کی ای میل / صارف کا نام درست تھا؟" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "یوزر نیم" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -558,30 +586,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "ری سیٹ" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "آپ کا پاسورڈ ری سیٹ کر دیا گیا ہے" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "لاگ ان صفحے کی طرف" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "نیا پاسورڈ" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "ری سیٹ پاسورڈ" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -808,8 +827,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "کیا آپ پاسورڈ بھول گئے ہیں؟" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po index 33c437bf83e..ffd26f04db8 100644 --- a/l10n/ur_PK/files_encryption.po +++ b/l10n/ur_PK/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po index 22a381bbef3..2b5c4ee4020 100644 --- a/l10n/ur_PK/files_sharing.po +++ b/l10n/ur_PK/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: ur_PK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "ری سیٹ" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "حفظ" diff --git a/l10n/uz/core.po b/l10n/uz/core.po index 80cf2479163..8c8bbb23c57 100644 --- a/l10n/uz/core.po +++ b/l10n/uz/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-07 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 05:54+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n" "MIME-Version: 1.0\n" @@ -167,50 +167,81 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "" @@ -508,43 +539,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:7 -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 ." +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -552,29 +580,20 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" msgstr "" #: setup/controller.php:140 @@ -802,7 +821,7 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" +msgid "Forgot your password? Reset it!" msgstr "" #: templates/login.php:55 diff --git a/l10n/uz/files_encryption.po b/l10n/uz/files_encryption.po index 1a6198476b5..e6d923cc19d 100644 --- a/l10n/uz/files_encryption.po +++ b/l10n/uz/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/uz/files_sharing.po b/l10n/uz/files_sharing.po index 3632b57caea..e2363af21a1 100644 --- a/l10n/uz/files_sharing.po +++ b/l10n/uz/files_sharing.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-06 01:54-0400\n" -"PO-Revision-Date: 2014-06-06 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: uz\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,19 +41,7 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - -#: js/share.js:55 +#: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "" diff --git a/l10n/vi/core.po b/l10n/vi/core.po index 02995e86473..2ec97e6a8c9 100644 --- a/l10n/vi/core.po +++ b/l10n/vi/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -171,50 +171,81 @@ msgstr "" msgid "Saving..." msgstr "Đang lưu..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "vài giây trước" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n phút trước" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n giờ trước" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "hôm nay" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "hôm qua" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n ngày trước" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "tháng trước" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n tháng trước" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "năm trước" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "năm trước" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "Khôi phục mật khẩu" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Có" @@ -512,43 +543,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud." -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s thiết lập lại mật khẩu" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s thiết lập lại mật khẩu" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "Liên kết tạo lại mật khẩu đã được gửi tới hộp thư của bạn.<br>Nếu bạn không thấy nó sau một khoảng thời gian, vui lòng kiểm tra trong thư mục Spam/Rác.<br>Nếu vẫn không thấy, vui lòng hỏi người quản trị hệ thống." - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhập của bạn chính xác?" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "Vui lòng kiểm tra Email để khôi phục lại mật khẩu." -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "Tên đăng nhập" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -556,30 +584,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "Vâng, tôi muốn thiết lập lại mật khẩu ngay." -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "Khởi động lại" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "Mật khẩu của bạn đã được khôi phục" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "Trang đăng nhập" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "Mật khẩu mới" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "Khôi phục mật khẩu" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -806,8 +825,8 @@ msgid "Please contact your administrator." msgstr "Vui lòng liên hệ với quản trị viên." #: templates/login.php:50 -msgid "Lost your password?" -msgstr "Bạn quên mật khẩu ?" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po index 824ee79accc..d654f8ea132 100644 --- a/l10n/vi/files_encryption.po +++ b/l10n/vi/files_encryption.po @@ -3,14 +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 -# Nguyễn Tài <mattheu.9x@gmail.com>, 2014 +# Hồ Tuấn Kiệt <hotuankiet_2000@yahoo.com>, 2013 +# Nguyễn Hữu Tài <mattheu.9x@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -82,18 +82,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -106,13 +106,10 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "Thiết lập cá nhân" - #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" msgstr "Mã hóa" diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po index 59e2dbc15e5..434da01317c 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "Khởi động lại" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "Được chia sẽ bởi {owner}" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "Lưu" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index 1d93dafaa90..eb53db88af1 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/core.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-11 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 04:00+0000\n" -"Last-Translator: phy <transifex@phy25.com>\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -174,50 +174,81 @@ msgstr "" msgid "Saving..." msgstr "保存中" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "秒前" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分钟前" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 小时前" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "今天" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "昨天" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n 天前" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "上月" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n 月前" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "去年" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "年前" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "重置密码" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "是" @@ -515,43 +546,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "更新成功。正在重定向至 ownCloud。" -#: lostpassword/controller.php:70 +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:151 +msgid "" +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." +msgstr "" + +#: lostpassword/controller/lostcontroller.php:168 #, php-format msgid "%s password reset" msgstr "重置 %s 的密码" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." -msgstr "发送电子邮件时发生问题，请和管理员联系。" - #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "使用以下链接重置您的密码：{link}" -#: lostpassword/templates/lostpassword.php:7 -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 "重置密码的链接已发送到您的邮箱。<br>如果您觉得在合理的时间内还未收到邮件，请查看 spam/junk 目录。<br>如果没有在那里，请询问您的本地管理员。" - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "请求失败<br>您确定您的邮箱/用户名是正确的？" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "您将会收到包含可以重置密码链接的邮件。" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "用户名" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -559,30 +587,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "使得，我真的要现在重设密码" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "重置" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "您的密码已重置" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "到登录页面" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "新密码" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "重置密码" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -809,8 +828,8 @@ msgid "Please contact your administrator." msgstr "请联系你的管理员。" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "忘记密码？" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po index 478a0760d36..8b28365aefc 100644 --- a/l10n/zh_CN/files_encryption.po +++ b/l10n/zh_CN/files_encryption.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-11 01:54-0400\n" -"PO-Revision-Date: 2014-06-11 04:20+0000\n" -"Last-Translator: phy <transifex@phy25.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -108,12 +108,9 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "直接进入你的" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "个人设置" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po index fc05579d045..4d0c4d0df43 100644 --- a/l10n/zh_CN/files_sharing.po +++ b/l10n/zh_CN/files_sharing.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -20,15 +20,15 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -44,18 +44,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "已保存" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "重置" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "由{owner}共享" @@ -120,19 +108,3 @@ msgstr "下载 %s" #: templates/public.php:54 msgid "Direct link" msgstr "直接链接" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "保存" diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po index d28dadd22ba..60f11118640 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -167,50 +167,81 @@ msgstr "" msgid "Saving..." msgstr "" -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "今日" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "昨日" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "前一月" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "重設密碼" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "Yes" @@ -508,43 +539,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "更新成功, 正" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" msgstr "" -#: lostpassword/controller.php:72 -msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." msgstr "" -#: lostpassword/templates/email.php:2 -msgid "Use the following link to reset your password: {link}" -msgstr "請用以下連結重設你的密碼: {link}" - -#: lostpassword/templates/lostpassword.php:7 +#: lostpassword/controller/lostcontroller.php:151 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 ." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" msgstr "" -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "請用以下連結重設你的密碼: {link}" + +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "你將收到一封電郵" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "用戶名稱" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -552,30 +580,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "你的密碼已被重設" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "前往登入版面" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "新密碼" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "重設密碼" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -802,8 +821,8 @@ msgid "Please contact your administrator." msgstr "" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "忘記密碼" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po index 17eaff41cb2..3f827f4695d 100644 --- a/l10n/zh_HK/files_encryption.po +++ b/l10n/zh_HK/files_encryption.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-05-28 01:54-0400\n" -"PO-Revision-Date: 2014-05-28 05:54+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -80,18 +80,18 @@ msgid "" "administrator" msgstr "" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "" -#: hooks/hooks.php:299 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "" @@ -104,11 +104,8 @@ msgid "Initial encryption running... Please try again later." msgstr "" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" +#, php-format +msgid "Go directly to your %spersonal settings%s." msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po index 3eb964a84d2..f23a9710f56 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ msgstr "" "Language: zh_HK\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -41,18 +41,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "" @@ -117,19 +105,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "儲存" diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po index f55ca2853e4..d3d1dc1331a 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-15 01:54-0400\n" +"PO-Revision-Date: 2014-06-15 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -169,50 +169,81 @@ msgstr "" msgid "Saving..." msgstr "儲存中..." -#: js/js.js:1271 +#: js/js.js:1276 msgid "seconds ago" msgstr "幾秒前" -#: js/js.js:1272 +#: js/js.js:1277 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分鐘前" -#: js/js.js:1273 +#: js/js.js:1278 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 小時前" -#: js/js.js:1274 +#: js/js.js:1279 msgid "today" msgstr "今天" -#: js/js.js:1275 +#: js/js.js:1280 msgid "yesterday" msgstr "昨天" -#: js/js.js:1276 +#: js/js.js:1281 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n 天前" -#: js/js.js:1277 +#: js/js.js:1282 msgid "last month" msgstr "上個月" -#: js/js.js:1278 +#: js/js.js:1283 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n 個月前" -#: js/js.js:1279 +#: js/js.js:1284 msgid "last year" msgstr "去年" -#: js/js.js:1280 +#: js/js.js:1285 msgid "years ago" msgstr "幾年前" +#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 +msgid "Couldn't send reset email. Please contact your administrator." +msgstr "" + +#: js/lostpassword.js:5 +msgid "" +"The link to reset your password has been sent to your email. 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 "" + +#: js/lostpassword.js:7 +msgid "" +"Your files are encrypted. If you haven't enabled the recovery key, there " +"will be no way to get your data back after your password is reset.<br />If " +"you are not sure what to do, please contact your administrator before you " +"continue. <br />Do you really want to continue?" +msgstr "" + +#: js/lostpassword.js:10 +msgid "I know what I'm doing" +msgstr "" + +#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 +msgid "Reset password" +msgstr "重設密碼" + +#: js/lostpassword.js:16 +msgid "Password can not be changed. Please contact your administrator." +msgstr "" + #: js/oc-dialogs.js:109 js/oc-dialogs.js:250 msgid "Yes" msgstr "是" @@ -510,43 +541,40 @@ msgstr "" msgid "The update was successful. Redirecting you to ownCloud now." msgstr "升級成功，正將您重新導向至 ownCloud 。" -#: lostpassword/controller.php:70 -#, php-format -msgid "%s password reset" -msgstr "%s 密碼重設" +#: lostpassword/controller/lostcontroller.php:110 +msgid "Couldn't reset password because the token is invalid" +msgstr "" + +#: lostpassword/controller/lostcontroller.php:136 +msgid "Couldn't send reset email. Please make sure your username is correct." +msgstr "" -#: lostpassword/controller.php:72 +#: lostpassword/controller/lostcontroller.php:151 msgid "" -"A problem has occurred whilst sending the email, please contact your " -"administrator." +"Couldn't send reset email because there is no email address for this " +"username. Please contact your administrator." msgstr "" +#: lostpassword/controller/lostcontroller.php:168 +#, php-format +msgid "%s password reset" +msgstr "%s 密碼重設" + #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "請至以下連結重設您的密碼： {link}" -#: lostpassword/templates/lostpassword.php:7 -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 "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被歸為垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。" - -#: lostpassword/templates/lostpassword.php:15 -msgid "Request failed!<br>Did you make sure your email/username was right?" -msgstr "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？" - -#: lostpassword/templates/lostpassword.php:18 +#: lostpassword/templates/lostpassword.php:6 msgid "You will receive a link to reset your password via Email." msgstr "重設密碼的連結將會寄到您的電子郵件信箱。" -#: lostpassword/templates/lostpassword.php:21 -#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51 +#: lostpassword/templates/lostpassword.php:8 +#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51 #: templates/installation.php:54 templates/login.php:31 templates/login.php:35 msgid "Username" msgstr "使用者名稱" -#: lostpassword/templates/lostpassword.php:27 +#: lostpassword/templates/lostpassword.php:13 msgid "" "Your files are encrypted. If you haven't enabled the recovery key, there " "will be no way to get your data back after your password is reset. If you " @@ -554,30 +582,21 @@ msgid "" "continue. Do you really want to continue?" msgstr "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？" -#: lostpassword/templates/lostpassword.php:29 +#: lostpassword/templates/lostpassword.php:15 msgid "Yes, I really want to reset my password now" msgstr "對，我現在想要重設我的密碼。" -#: lostpassword/templates/lostpassword.php:32 +#: lostpassword/templates/lostpassword.php:18 msgid "Reset" msgstr "重設" -#: lostpassword/templates/resetpassword.php:4 -msgid "Your password was reset" -msgstr "您的密碼已重設" - #: lostpassword/templates/resetpassword.php:5 -msgid "To login page" -msgstr "至登入頁面" - -#: lostpassword/templates/resetpassword.php:8 -#: lostpassword/templates/resetpassword.php:10 msgid "New password" msgstr "新密碼" -#: lostpassword/templates/resetpassword.php:13 -msgid "Reset password" -msgstr "重設密碼" +#: lostpassword/templates/resetpassword.php:6 +msgid "New Password" +msgstr "" #: setup/controller.php:140 #, php-format @@ -804,8 +823,8 @@ msgid "Please contact your administrator." msgstr "請聯絡系統管理員。" #: templates/login.php:50 -msgid "Lost your password?" -msgstr "忘記密碼？" +msgid "Forgot your password? Reset it!" +msgstr "" #: templates/login.php:55 msgid "remember" diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po index f04a441ed14..d92f02baf3a 100644 --- a/l10n/zh_TW/files_encryption.po +++ b/l10n/zh_TW/files_encryption.po @@ -4,16 +4,16 @@ # # Translators: # akong <akong@aspa.idv.tw>, 2013-2014 -# pellaeon <nfsmwlin@gmail.com>, 2013 +# Pellaeon Lin <nfsmwlin@gmail.com>, 2013 # Flymok <transifex@flymok.net>, 2013 -# Tommy Wu <wu.tommy@gmail.com>, 2014 +# wu.tommy <wu.tommy@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-04 01:54-0400\n" -"PO-Revision-Date: 2014-06-02 14:01+0000\n" -"Last-Translator: Tommy Wu <wu.tommy@gmail.com>\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" +"Last-Translator: I Robot\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" @@ -84,18 +84,18 @@ msgid "" "administrator" msgstr "未知錯誤請檢查您的系統設定或是聯絡您的管理員" -#: hooks/hooks.php:64 +#: hooks/hooks.php:66 msgid "Missing requirements." msgstr "遺失必要條件。" -#: hooks/hooks.php:65 +#: hooks/hooks.php:67 msgid "" "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL " "together with the PHP extension is enabled and configured properly. For now," " the encryption app has been disabled." msgstr "請確認已安裝 PHP 5.3.3 或是更新的版本以及 OpenSSL 也一併安裝在 PHP extension 裡面並啟用及設置完成。現在，加密功能是停用的。" -#: hooks/hooks.php:296 +#: hooks/hooks.php:300 msgid "Following users are not set up for encryption:" msgstr "以下的使用者無法設定加密:" @@ -108,12 +108,9 @@ msgid "Initial encryption running... Please try again later." msgstr "加密初始執行中...請晚點再試。" #: templates/invalid_private_key.php:8 -msgid "Go directly to your " -msgstr "直接到您的" - -#: templates/invalid_private_key.php:8 -msgid "personal settings" -msgstr "個人設定" +#, php-format +msgid "Go directly to your %spersonal settings%s." +msgstr "" #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po index cb09a9049bd..f5a4a22ef9b 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: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" +"POT-Creation-Date: 2014-06-14 01:54-0400\n" +"PO-Revision-Date: 2014-06-14 05:54+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,15 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: appinfo/app.php:35 js/app.js:34 +#: appinfo/app.php:32 js/app.js:34 msgid "Shared with you" msgstr "" -#: appinfo/app.php:44 js/app.js:53 +#: appinfo/app.php:41 js/app.js:53 msgid "Shared with others" msgstr "" -#: appinfo/app.php:53 js/app.js:72 +#: appinfo/app.php:50 js/app.js:72 msgid "Shared by link" msgstr "" @@ -42,18 +42,6 @@ msgstr "" msgid "You haven't shared any files by link yet." msgstr "" -#: js/settings-admin.js:10 -msgid "Could not load template" -msgstr "" - -#: js/settings-admin.js:45 -msgid "Saved" -msgstr "已儲存" - -#: js/settings-admin.js:64 templates/settings-admin.php:33 -msgid "Reset" -msgstr "重設" - #: js/share.js:60 msgid "Shared by {owner}" msgstr "由 {owner} 分享" @@ -118,19 +106,3 @@ msgstr "" #: templates/public.php:54 msgid "Direct link" msgstr "" - -#: templates/settings-admin.php:3 -msgid "Mail templates" -msgstr "" - -#: templates/settings-admin.php:8 -msgid "Theme" -msgstr "" - -#: templates/settings-admin.php:17 -msgid "Template" -msgstr "" - -#: templates/settings-admin.php:35 -msgid "Save" -msgstr "儲存" diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php index 0c5a21c1274..f81256785d8 100644 --- a/lib/l10n/cs_CZ.php +++ b/lib/l10n/cs_CZ.php @@ -61,7 +61,15 @@ $TRANSLATIONS = array( "You need to provide a password to create a public link, only protected links are allowed" => "Pro vytvoření veřejného odkazu je nutné zadat heslo, jsou povoleny pouze chráněné odkazy", "Sharing %s failed, because sharing with links is not allowed" => "Sdílení položky %s selhalo, protože sdílení pomocí linků není povoleno", "Share type %s is not valid for %s" => "Sdílení typu %s není korektní pro %s", +"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Nastavení oprávnění pro %s selhalo, protože jsou k tomu nutná vyšší oprávnění, než jaká byla povolena pro %s", "Setting permissions for %s failed, because the item was not found" => "Nastavení práv pro %s selhalo, protože položka nebyla nalezena", +"Sharing backend %s not found" => "Podpůrná vrstva sdílení %s nenalezena", +"Sharing backend for %s not found" => "Podpůrná vrstva sdílení pro %s nenalezena", +"Sharing %s failed, because the user %s is the original sharer" => "Sdílení položky %s selhalo, protože byla sdílena uživatelem %s jako první.", +"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Sdílení položky %s selhalo, protože jsou k tomu nutná vyšší oprávnění, než jaká byla %s povolena.", +"Sharing %s failed, because resharing is not allowed" => "Sdílení položky %s selhalo, protože sdílení dále není povoleno", +"Sharing %s failed, because the sharing backend for %s could not find its source" => "Sdílení položky %s selhalo, protože podpůrná vrstva sdílení nenalezla zdrojový %s", +"Sharing %s failed, because the file could not be found in the file cache" => "Sdílení položky %s selhalo, protože soubor nebyl nalezen v dočasném úložišti", "Could not find category \"%s\"" => "Nelze nalézt kategorii \"%s\"", "seconds ago" => "před pár sekundami", "_%n minute ago_::_%n minutes ago_" => array("před %n minutou","před %n minutami","před %n minutami"), diff --git a/lib/l10n/da.php b/lib/l10n/da.php index e5496b333e0..5ff35c188f8 100644 --- a/lib/l10n/da.php +++ b/lib/l10n/da.php @@ -61,6 +61,7 @@ $TRANSLATIONS = array( "last year" => "sidste år", "years ago" => "år siden", "A valid username must be provided" => "Et gyldigt brugernavn skal angives", -"A valid password must be provided" => "En gyldig adgangskode skal angives" +"A valid password must be provided" => "En gyldig adgangskode skal angives", +"The username is already being used" => "Brugernavnet er allerede i brug" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/private/db.php b/lib/private/db.php index 82affe293ed..8fd2ef1c6f7 100644 --- a/lib/private/db.php +++ b/lib/private/db.php @@ -57,40 +57,34 @@ class OC_DB { return true; } - // The global data we need - $name = OC_Config::getValue( "dbname", "owncloud" ); - $host = OC_Config::getValue( "dbhost", "" ); - $user = OC_Config::getValue( "dbuser", "" ); - $pass = OC_Config::getValue( "dbpassword", "" ); - $type = OC_Config::getValue( "dbtype", "sqlite" ); - if(strpos($host, ':')) { - list($host, $port)=explode(':', $host, 2); - } else { - $port=false; - } - + $type = OC_Config::getValue('dbtype', 'sqlite'); $factory = new \OC\DB\ConnectionFactory(); if (!$factory->isValidType($type)) { return false; } + $connectionParams = array( + 'user' => OC_Config::getValue('dbuser', ''), + 'password' => OC_Config::getValue('dbpassword', ''), + ); + $name = OC_Config::getValue('dbname', 'owncloud'); + if ($factory->normalizeType($type) === 'sqlite3') { $datadir = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data'); - $connectionParams = array( - 'user' => $user, - 'password' => $pass, - 'path' => $datadir.'/'.$name.'.db', - ); + $connectionParams['path'] = $datadir.'/'.$name.'.db'; } else { - $connectionParams = array( - 'user' => $user, - 'password' => $pass, - 'host' => $host, - 'dbname' => $name, - ); - if (!empty($port)) { - $connectionParams['port'] = $port; + $host = OC_Config::getValue('dbhost', ''); + if (strpos($host, ':')) { + // Host variable may carry a port or socket. + list($host, $portOrSocket) = explode(':', $host, 2); + if (ctype_digit($portOrSocket)) { + $connectionParams['host'] = $host; + $connectionParams['port'] = $portOrSocket; + } else { + $connectionParams['unix_socket'] = $portOrSocket; + } } + $connectionParams['dbname'] = $name; } $connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_'); diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php index 72ccfadc6e9..2a23c2141c1 100644 --- a/lib/private/preview/movies.php +++ b/lib/private/preview/movies.php @@ -41,14 +41,22 @@ if (!\OC_Util::runningOnWindows()) { public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { // TODO: use proc_open() and stream the source file ? - $absPath = \OC_Helper::tmpFile(); - $handle = $fileview->fopen($path, 'rb'); + $fileInfo = $fileview->getFileInfo($path); + $useFileDirectly = (!$fileInfo->isEncrypted() && !$fileInfo->isMounted()); - // we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB. - // in some cases 1MB was no enough to generate thumbnail - $firstmb = stream_get_contents($handle, 5242880); - file_put_contents($absPath, $firstmb); + if ($useFileDirectly) { + $absPath = $fileview->getLocalFile($path); + } else { + $absPath = \OC_Helper::tmpFile(); + + $handle = $fileview->fopen($path, 'rb'); + + // we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB. + // in some cases 1MB was no enough to generate thumbnail + $firstmb = stream_get_contents($handle, 5242880); + file_put_contents($absPath, $firstmb); + } $result = $this->generateThumbNail($maxX, $maxY, $absPath, 5); if ($result === false) { @@ -58,8 +66,9 @@ if (!\OC_Util::runningOnWindows()) { } } - unlink($absPath); - + if (!$useFileDirectly) { + unlink($absPath); + } return $result; } diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php index 32c079240a0..67762a81661 100644 --- a/settings/l10n/cs_CZ.php +++ b/settings/l10n/cs_CZ.php @@ -95,6 +95,8 @@ $TRANSLATIONS = array( "Setup Warning" => "Upozornění nastavení", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, protože rozhraní WebDAV se zdá nefunkční.", "Please double check the <a href=\"%s\">installation guides</a>." => "Zkontrolujte prosím znovu <a href=\"%s\">instalační příručku</a>.", +"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP je patrně nastaveno tak, aby odstraňovalo vnitřní části dokumentů. Toto bude mít za následek množsví nedostupných hlavních aplikací.", +"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.", "Database Performance Info" => "Informace o výkonu databáze", "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Je použita databáze SQLite. Pro větší instalace doporučujeme toto změnit. Pro migraci na jiný typ databáze lze použít příkaz: 'occ db:convert-type'", "Module 'fileinfo' missing" => "Schází modul 'fileinfo'", diff --git a/settings/l10n/da.php b/settings/l10n/da.php index 74b3da08865..227ad8c72da 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -4,12 +4,17 @@ $TRANSLATIONS = array( "test email settings" => "test email indstillinger", "Email sent" => "E-mail afsendt", "Encryption" => "Kryptering", +"Authentication method" => "Godkendelsesmetode", "Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store", "Authentication error" => "Adgangsfejl", "Your full name has been changed." => "Dit fulde navn er blevet ændret.", "Unable to change full name" => "Ikke i stand til at ændre dit fulde navn", "Group already exists" => "Gruppen findes allerede", "Unable to add group" => "Gruppen kan ikke oprettes", +"Files decrypted successfully" => "Filer dekrypteret med succes", +"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dine filer kunne ikke dekrypteres. Gennemse din owncloud log eller spørg din administrator", +"Couldn't decrypt your files, check your password and try again" => "Dine filer kunne ikke dekrypteres. Check din adgangskode og forsøg igen", +"Encryption keys deleted permanently" => "Krypteringsnøgle slettet permanent", "Email saved" => "Email adresse gemt", "Invalid email" => "Ugyldig email adresse", "Unable to delete group" => "Gruppen kan ikke slettes", @@ -47,11 +52,18 @@ $TRANSLATIONS = array( "Good password" => "Godt kodeord", "Strong password" => "Stærkt kodeord", "Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ", +"Delete encryption keys permanently." => "Slet krypteringsnøgler permanent.", +"Restore encryption keys." => "Genopret krypteringsnøgler.", +"Unable to delete {objName}" => "Kunne ikke slette {objName}", +"Error creating group" => "Fejl ved oprettelse af gruppe", +"A valid group name must be provided" => "Et gyldigt gruppenavn skal angives ", +"deleted {groupName}" => "slettede {groupName}", "undo" => "fortryd", "Groups" => "Grupper", "Group Admin" => "Gruppe Administrator", "Delete" => "Slet", "never" => "aldrig", +"deleted {userName}" => "slettede {userName}", "add group" => "Tilføj gruppe", "A valid username must be provided" => "Et gyldigt brugernavn skal angives", "Error creating user" => "Fejl ved oprettelse af bruger", @@ -74,6 +86,7 @@ $TRANSLATIONS = array( "Setup Warning" => "Opsætnings Advarsel", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.", "Please double check the <a href=\"%s\">installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.", +"Database Performance Info" => "Database Performance Oplysninger", "Module 'fileinfo' missing" => "Module 'fileinfo' mangler", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.", "Your PHP version is outdated" => "Din PHP-version er forældet", @@ -85,21 +98,29 @@ $TRANSLATIONS = array( "Internet connection not working" => "Internetforbindelse fungerer ikke", "This 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." => "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.", "Cron" => "Cron", +"Last cron was executed at %s." => "Seneste 'cron' blev kørt %s.", +"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.", +"Cron was not executed yet!" => "Cron har ikke kørt endnu!", "Execute one task with each page loaded" => "Udføre en opgave med hver side indlæst", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.", "Use systems cron service to call the cron.php file every 15 minutes." => "Brug systemets cron service til at kalde cron.php hvert 15. minut.", "Sharing" => "Deling", "Allow apps to use the Share API" => "Tillad apps til at bruge Share API", "Allow public uploads" => "Tillad offentlig upload", +"Set default expiration date" => "Vælg standard udløbsdato", "Expire after " => "Udløber efter", "days" => "dage", +"Enforce expiration date" => "Påtving udløbsdato", "Allow resharing" => "Tillad videredeling", +"Allow users to send mail notification for shared files" => "Tillad brugere at sende mail underretninger for delte filer", +"Exclude groups from sharing" => "Ekskluder grupper fra at dele", "Security" => "Sikkerhed", "Enforce HTTPS" => "Gennemtving HTTPS", "Forces the clients to connect to %s via an encrypted connection." => "Tving klienten til at forbinde til %s via en kryptetet forbindelse.", "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.", "Email Server" => "Email Server", "From address" => "Fra adresse", +"mail" => "mail", "Authentication required" => "Godkendelse påkrævet", "Server address" => "Serveradresse", "Port" => "Port", @@ -151,10 +172,13 @@ $TRANSLATIONS = array( "The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer", "Log-in password" => "Log-in kodeord", "Decrypt all Files" => "Dekrypter alle Filer ", +"Restore Encryption Keys" => "Genopret Krypteringsnøgler", +"Delete Encryption Keys" => "Slet Krypteringsnøgler", "Login Name" => "Loginnavn", "Create" => "Ny", "Admin Recovery Password" => "Administrator gendannelse kodeord", "Enter the recovery password in order to recover the users files during password change" => "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord", +"Add Group" => "Tilføj Gruppe", "Group" => "Gruppe", "Everyone" => "Alle", "Default Quota" => "Standard kvote", diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 0edbd5e1c00..1c2722d249f 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -122,8 +122,8 @@ $TRANSLATIONS = array( "Enforce password protection" => "Passwortschutz erzwingen", "Allow public uploads" => "Öffentliches Hochladen erlauben", "Set default expiration date" => "Setze Ablaufdatum", -"Expire after " => "Ablauf nach dem", -"days" => "Tage", +"Expire after " => "Ablauf nach ", +"days" => "Tagen", "Enforce expiration date" => "Ablaufdatum erzwingen", "Allow resharing" => "Erlaubt erneutes Teilen", "Restrict users to only share with users in their groups" => "c", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index 90eb229cc4c..5d9f1d08c4c 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -122,8 +122,8 @@ $TRANSLATIONS = array( "Enforce password protection" => "Passwortschutz erzwingen", "Allow public uploads" => "Öffentliches Hochladen erlauben", "Set default expiration date" => "Setze Ablaufdatum", -"Expire after " => "Ablauf nach dem", -"days" => "Tage", +"Expire after " => "Ablauf nach ", +"days" => "Tagen", "Enforce expiration date" => "Ablaufdatum erzwingen", "Allow resharing" => "Erlaube Weiterverteilen", "Restrict users to only share with users in their groups" => "Nutzer nur auf das Teilen in ihren Gruppen beschränken", diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php index f718186302f..4ae39d53011 100644 --- a/settings/l10n/fi_FI.php +++ b/settings/l10n/fi_FI.php @@ -177,7 +177,7 @@ $TRANSLATIONS = array( "Upload new" => "Lähetä uusi", "Select new from Files" => "Valitse uusi tiedostoista", "Remove image" => "Poista kuva", -"Either png or jpg. Ideally square but you will be able to crop it." => "Joko png- tai jpg-kuva. Mieluite neliö, voit kuitenkin rajata kuvaa.", +"Either png or jpg. Ideally square but you will be able to crop it." => "Joko png- tai jpg-kuva. Mieluiten neliö, voit kuitenkin rajata kuvaa.", "Your avatar is provided by your original account." => "Avatar-kuvasi pohjautuu alkuperäiseen tiliisi.", "Cancel" => "Peru", "Choose as profile image" => "Valitse profiilikuvaksi", diff --git a/settings/l10n/it.php b/settings/l10n/it.php index 885ef65a6ed..e836b7af278 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -62,13 +62,16 @@ $TRANSLATIONS = array( "Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.", "Delete encryption keys permanently." => "Elimina definitivamente le chiavi di cifratura.", "Restore encryption keys." => "Ripristina le chiavi di cifratura.", +"Unable to delete {objName}" => "Impossibile eliminare {objName}", "Error creating group" => "Errore durante la creazione del gruppo", "A valid group name must be provided" => "Deve essere fornito un nome valido per il gruppo", +"deleted {groupName}" => "{groupName} eliminato", "undo" => "annulla", "Groups" => "Gruppi", "Group Admin" => "Gruppi amministrati", "Delete" => "Elimina", "never" => "mai", +"deleted {userName}" => "{userName} eliminato", "add group" => "aggiungi gruppo", "A valid username must be provided" => "Deve essere fornito un nome utente valido", "Error creating user" => "Errore durante la creazione dell'utente", diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php index d20eedbe3a2..d9a8e0f56d5 100644 --- a/settings/l10n/ja.php +++ b/settings/l10n/ja.php @@ -62,13 +62,16 @@ $TRANSLATIONS = array( "Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。", "Delete encryption keys permanently." => "暗号化キーを永久に削除する。", "Restore encryption keys." => "暗号化キーを復元する。", +"Unable to delete {objName}" => "{objName} を削除できません", "Error creating group" => "グループの作成エラー", "A valid group name must be provided" => "有効なグループ名を指定する必要があります", +"deleted {groupName}" => "{groupName} を削除しました", "undo" => "元に戻す", "Groups" => "グループ", "Group Admin" => "グループ管理者", "Delete" => "削除", "never" => "無し", +"deleted {userName}" => "{userName} を削除しました", "add group" => "グループを追加", "A valid username must be provided" => "有効なユーザー名を指定する必要があります", "Error creating user" => "ユーザー作成エラー", diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index fe1bed6e058..506ddf4fac4 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -62,13 +62,16 @@ $TRANSLATIONS = array( "Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.", "Delete encryption keys permanently." => "Verwijder de encryptiesleutels permanent", "Restore encryption keys." => "Herstel de encryptiesleutels", +"Unable to delete {objName}" => "Kan {objName} niet verwijderen", "Error creating group" => "Fout bij aanmaken groep", "A valid group name must be provided" => "Er moet een geldige groepsnaam worden opgegeven", +"deleted {groupName}" => "verwijderd {groupName}", "undo" => "ongedaan maken", "Groups" => "Groepen", "Group Admin" => "Groep beheerder", "Delete" => "Verwijder", "never" => "geen", +"deleted {userName}" => "verwijderd {userName}", "add group" => "toevoegen groep", "A valid username must be provided" => "Er moet een geldige gebruikersnaam worden opgegeven", "Error creating user" => "Fout bij aanmaken gebruiker", diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php index 51cb5867273..df7ea1d45b3 100644 --- a/settings/l10n/pt_PT.php +++ b/settings/l10n/pt_PT.php @@ -62,11 +62,15 @@ $TRANSLATIONS = array( "Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.", "Delete encryption keys permanently." => "Excluir as chaves encriptadas de forma permanente.", "Restore encryption keys." => "Restaurar chaves encriptadas.", +"Error creating group" => "Erro ao criar grupo", +"A valid group name must be provided" => "Um nome válido do grupo tem de ser fornecido", +"deleted {groupName}" => "apagar {Nome do grupo}", "undo" => "desfazer", "Groups" => "Grupos", "Group Admin" => "Grupo Administrador", "Delete" => "Eliminar", "never" => "nunca", +"deleted {userName}" => "apagar{utilizador}", "add group" => "Adicionar grupo", "A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido", "Error creating user" => "Erro a criar utilizador", @@ -90,6 +94,7 @@ $TRANSLATIONS = array( "Setup Warning" => "Aviso de setup", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.", "Please double check the <a href=\"%s\">installation guides</a>." => "Por favor verifique o<a href='%s'>Guia de instalação</a>.", +"Database Performance Info" => "Informação sobre desempenho da Base de Dados", "Module 'fileinfo' missing" => "Falta o módulo 'fileinfo'", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.", "Your PHP version is outdated" => "A sua versão do PHP está ultrapassada", @@ -109,6 +114,7 @@ $TRANSLATIONS = array( "Use systems cron service to call the cron.php file every 15 minutes." => "Use o serviço cron do sistema para chamar o ficheiro cron.php a cada 15 minutos.", "Sharing" => "Partilha", "Allow apps to use the Share API" => "Permitir que os utilizadores usem a API de partilha", +"Allow users to share via link" => "Permitir que os utilizadores partilhem através do link", "Enforce password protection" => "Forçar protecção da palavra passe", "Allow public uploads" => "Permitir Envios Públicos", "Set default expiration date" => "Especificar a data padrão de expiração", @@ -187,7 +193,10 @@ $TRANSLATIONS = array( "Create" => "Criar", "Admin Recovery Password" => "Recuperar password de administrador", "Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha", +"Add Group" => "Adicionar grupo", "Group" => "Grupo", +"Everyone" => "Para todos", +"Admins" => "Administrador", "Default Quota" => "Quota por padrão", "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")", "Unlimited" => "Ilimitado", diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index 41363e00de5..9d11bb4ae0c 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -62,13 +62,16 @@ $TRANSLATIONS = array( "Decrypting files... Please wait, this can take some time." => "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.", "Delete encryption keys permanently." => "Şifreleme anahtarlarını kalıcı olarak sil.", "Restore encryption keys." => "Şifreleme anahtarlarını geri yükle.", +"Unable to delete {objName}" => "{objName} silinemiyor", "Error creating group" => "Grup oluşturulurken hata", "A valid group name must be provided" => "Geçerli bir grup adı mutlaka sağlanmalı", +"deleted {groupName}" => "{groupName} silindi", "undo" => "geri al", "Groups" => "Gruplar", "Group Admin" => "Grup Yöneticisi", "Delete" => "Sil", "never" => "hiçbir zaman", +"deleted {userName}" => "{userName} silindi", "add group" => "grup ekle", "A valid username must be provided" => "Geçerli bir kullanıcı adı mutlaka sağlanmalı", "Error creating user" => "Kullanıcı oluşturulurken hata", diff --git a/settings/templates/admin.php b/settings/templates/admin.php index ce33a804f54..5a00320313b 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -313,38 +313,34 @@ if (!$_['internetconnectionworking']) { <div class="section" id="security"> <h2><?php p($l->t('Security'));?></h2> - <table> - <tr> - <td id="enable"> - <input type="checkbox" name="forcessl" id="forcessl" - <?php if ($_['enforceHTTPSEnabled']) { - print_unescaped('checked="checked" '); - print_unescaped('value="false"'); - } else { - print_unescaped('value="true"'); - } - ?> - <?php if (!$_['isConnectedViaHTTPS']) p('disabled'); ?> /> - <label for="forcessl"><?php p($l->t('Enforce HTTPS'));?></label><br/> - <em><?php p($l->t( - 'Forces the clients to connect to %s via an encrypted connection.', - $theme->getName() - )); ?></em> - <?php if (!$_['isConnectedViaHTTPS']) { - print_unescaped("<br/><em>"); - p($l->t( - 'Please connect to your %s via HTTPS to enable or disable the SSL enforcement.', - $theme->getName() - )); - print_unescaped("</em>"); - } - ?> - </td> - </tr> - </table> + <p> + <input type="checkbox" name="forcessl" id="forcessl" + <?php if ($_['enforceHTTPSEnabled']) { + print_unescaped('checked="checked" '); + print_unescaped('value="false"'); + } else { + print_unescaped('value="true"'); + } + ?> + <?php if (!$_['isConnectedViaHTTPS']) p('disabled'); ?> /> + <label for="forcessl"><?php p($l->t('Enforce HTTPS'));?></label><br/> + <em><?php p($l->t( + 'Forces the clients to connect to %s via an encrypted connection.', + $theme->getName() + )); ?></em> + <?php if (!$_['isConnectedViaHTTPS']) { + print_unescaped("<br/><em>"); + p($l->t( + 'Please connect to your %s via HTTPS to enable or disable the SSL enforcement.', + $theme->getName() + )); + print_unescaped("</em>"); + } + ?> + </p> </div> -<div id="mail_settings" class="section"> +<div class="section"><form id="mail_settings"> <h2><?php p($l->t('Email Server'));?></h2> <p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p> @@ -424,7 +420,7 @@ if (!$_['internetconnectionworking']) { <em><?php p($l->t( 'Test email settings' )); ?></em> <input type="submit" name="sendtestemail" id="sendtestemail" value="<?php p($l->t( 'Send email' )); ?>"/> <span id="sendtestmail_msg" class="msg"></span> -</div> +</form></div> <div class="section"> <h2><?php p($l->t('Log'));?></h2> |