diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php index 99eb409a369..67a3414819b 100644 --- a/apps/files/l10n/ar.php +++ b/apps/files/l10n/ar.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "المجلد المؤقت غير موجود", "Failed to write to disk" => "خطأ في الكتابة على القرص الصلب", "Not enough storage available" => "لا يوجد مساحة تخزينية كافية", -"Upload failed" => "عملية الرفع فشلت", "Invalid directory." => "مسار غير صحيح.", "Files" => "الملفات", -"Unable to upload your file as it is a directory or has 0 bytes" => "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت", "Not enough space available" => "لا توجد مساحة كافية", "Upload cancelled." => "تم إلغاء عملية رفع الملفات .", "File upload is in progress. Leaving the page now will cancel the upload." => "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("","","","","",""), "{dirs} and {files}" => "{dirs} و {files}", "_Uploading %n file_::_Uploading %n files_" => array("","","","","",""), -"files uploading" => "يتم تحميل الملفات", "'.' is an invalid file name." => "\".\" اسم ملف غير صحيح.", "File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صحيح , الرموز '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها", diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php index 913875e863a..e7dafd1c43a 100644 --- a/apps/files/l10n/bg_BG.php +++ b/apps/files/l10n/bg_BG.php @@ -6,7 +6,6 @@ $TRANSLATIONS = array( "No file was uploaded" => "Фахлът не бе качен", "Missing a temporary folder" => "Липсва временна папка", "Failed to write to disk" => "Възникна проблем при запис в диска", -"Upload failed" => "Качването е неуспешно", "Invalid directory." => "Невалидна директория.", "Files" => "Файлове", "Upload cancelled." => "Качването е спряно.", diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php index 2265c232a14..66ac3a2165f 100644 --- a/apps/files/l10n/bn_BD.php +++ b/apps/files/l10n/bn_BD.php @@ -12,7 +12,6 @@ $TRANSLATIONS = array( "Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ", "Invalid directory." => "ভুল ডিরেক্টরি", "Files" => "ফাইল", -"Unable to upload your file as it is a directory or has 0 bytes" => "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট", "Not enough space available" => "যথেষ্ঠ পরিমাণ স্থান নেই", "Upload cancelled." => "আপলোড বাতিল করা হয়েছে।", "File upload is in progress. Leaving the page now will cancel the upload." => "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।", diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index eb724d19548..8fd72ac0a68 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta un fitxer temporal", "Failed to write to disk" => "Ha fallat en escriure al disc", "Not enough storage available" => "No hi ha prou espai disponible", -"Upload failed" => "La pujada ha fallat", "Invalid directory." => "Directori no vàlid.", "Files" => "Fitxers", -"Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes", "Not enough space available" => "No hi ha prou espai disponible", "Upload cancelled." => "La pujada s'ha cancel·lat.", "File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fitxer","%n fitxers"), "{dirs} and {files}" => "{dirs} i {files}", "_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"), -"files uploading" => "fitxers pujant", "'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.", "File name cannot be empty." => "El nom del fitxer no pot ser buit.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.", diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 691cc92f1ad..f67283ec6e8 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Chybí adresář pro dočasné soubory", "Failed to write to disk" => "Zápis na disk selhal", "Not enough storage available" => "Nedostatek dostupného úložného prostoru", -"Upload failed" => "Odesílání selhalo", "Invalid directory." => "Neplatný adresář", "Files" => "Soubory", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů", "Not enough space available" => "Nedostatek volného místa", "Upload cancelled." => "Odesílání zrušeno.", "File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"), "{dirs} and {files}" => "{dirs} a {files}", "_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"), -"files uploading" => "soubory se odesílají", "'.' is an invalid file name." => "'.' je neplatným názvem souboru.", "File name cannot be empty." => "Název souboru nemůže být prázdný řetězec.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.", diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php index 157f4f89a23..86e5f65e7b0 100644 --- a/apps/files/l10n/cy_GB.php +++ b/apps/files/l10n/cy_GB.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Plygell dros dro yn eisiau", "Failed to write to disk" => "Methwyd ysgrifennu i'r ddisg", "Not enough storage available" => "Dim digon o le storio ar gael", -"Upload failed" => "Methwyd llwytho i fyny", "Invalid directory." => "Cyfeiriadur annilys.", "Files" => "Ffeiliau", -"Unable to upload your file as it is a directory or has 0 bytes" => "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit", "Not enough space available" => "Dim digon o le ar gael", "Upload cancelled." => "Diddymwyd llwytho i fyny.", "File upload is in progress. Leaving the page now will cancel the upload." => "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.", @@ -33,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","","",""), "_%n file_::_%n files_" => array("","","",""), "_Uploading %n file_::_Uploading %n files_" => array("","","",""), -"files uploading" => "ffeiliau'n llwytho i fyny", "'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.", "File name cannot be empty." => "Does dim hawl cael enw ffeil gwag.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'.", diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php index aab12986ec1..c2a20931ba0 100644 --- a/apps/files/l10n/da.php +++ b/apps/files/l10n/da.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manglende midlertidig mappe.", "Failed to write to disk" => "Fejl ved skrivning til disk.", "Not enough storage available" => "Der er ikke nok plads til rådlighed", -"Upload failed" => "Upload fejlede", "Invalid directory." => "Ugyldig mappe.", "Files" => "Filer", -"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes.", "Not enough space available" => "ikke nok tilgængelig ledig plads ", "Upload cancelled." => "Upload afbrudt.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fil","%n filer"), "{dirs} and {files}" => "{dirs} og {files}", "_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"), -"files uploading" => "uploader filer", "'.' is an invalid file name." => "'.' er et ugyldigt filnavn.", "File name cannot be empty." => "Filnavnet kan ikke stå tomt.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 947d4f07461..64017b7dba6 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Kein temporärer Ordner vorhanden", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" => "Nicht genug Speicher vorhanden.", -"Upload failed" => "Hochladen fehlgeschlagen", "Invalid directory." => "Ungültiges Verzeichnis.", "Files" => "Dateien", -"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.", "Not enough space available" => "Nicht genug Speicherplatz verfügbar", "Upload cancelled." => "Upload abgebrochen.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "{dirs} and {files}" => "{dirs} und {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"), -"files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", "File name cannot be empty." => "Der Dateiname darf nicht leer sein.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.", diff --git a/apps/files/l10n/de_CH.php b/apps/files/l10n/de_CH.php index 2895135d17e..a7074a8b1cc 100644 --- a/apps/files/l10n/de_CH.php +++ b/apps/files/l10n/de_CH.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Kein temporärer Ordner vorhanden", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" => "Nicht genug Speicher vorhanden.", -"Upload failed" => "Hochladen fehlgeschlagen", "Invalid directory." => "Ungültiges Verzeichnis.", "Files" => "Dateien", -"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes gross ist.", "Not enough space available" => "Nicht genügend Speicherplatz verfügbar", "Upload cancelled." => "Upload abgebrochen.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","%n Ordner"), "_%n file_::_%n files_" => array("","%n Dateien"), "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"), -"files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", "File name cannot be empty." => "Der Dateiname darf nicht leer sein.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index db07ed7fadd..4f9da434455 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Kein temporärer Ordner vorhanden", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Not enough storage available" => "Nicht genug Speicher vorhanden.", -"Upload failed" => "Hochladen fehlgeschlagen", "Invalid directory." => "Ungültiges Verzeichnis.", "Files" => "Dateien", -"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.", "Not enough space available" => "Nicht genügend Speicherplatz verfügbar", "Upload cancelled." => "Upload abgebrochen.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n Datei","%n Dateien"), "{dirs} and {files}" => "{dirs} und {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"), -"files uploading" => "Dateien werden hoch geladen", "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.", "File name cannot be empty." => "Der Dateiname darf nicht leer sein.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.", diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index 8c89e5e1feb..37a61c6b956 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος", "Failed to write to disk" => "Αποτυχία εγγραφής στο δίσκο", "Not enough storage available" => "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος", -"Upload failed" => "Η μεταφόρτωση απέτυχε", "Invalid directory." => "Μη έγκυρος φάκελος.", "Files" => "Αρχεία", -"Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes", "Not enough space available" => "Δεν υπάρχει αρκετός διαθέσιμος χώρος", "Upload cancelled." => "Η αποστολή ακυρώθηκε.", "File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"), "_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"), "_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"), -"files uploading" => "αρχεία ανεβαίνουν", "'.' is an invalid file name." => "'.' είναι μη έγκυρο όνομα αρχείου.", "File name cannot be empty." => "Το όνομα αρχείου δεν μπορεί να είναι κενό.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.", diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php index a13399a8db3..e67719efba9 100644 --- a/apps/files/l10n/en_GB.php +++ b/apps/files/l10n/en_GB.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Missing a temporary folder", "Failed to write to disk" => "Failed to write to disk", "Not enough storage available" => "Not enough storage available", -"Upload failed" => "Upload failed", "Invalid directory." => "Invalid directory.", "Files" => "Files", -"Unable to upload your file as it is a directory or has 0 bytes" => "Unable to upload your file as it is a directory or has 0 bytes", "Not enough space available" => "Not enough space available", "Upload cancelled." => "Upload cancelled.", "File upload is in progress. Leaving the page now will cancel the upload." => "File upload is in progress. Leaving the page now will cancel the upload.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n file","%n files"), "{dirs} and {files}" => "{dirs} and {files}", "_Uploading %n file_::_Uploading %n files_" => array("Uploading %n file","Uploading %n files"), -"files uploading" => "files uploading", "'.' is an invalid file name." => "'.' is an invalid file name.", "File name cannot be empty." => "File name cannot be empty.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.", diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php index ad538f2f2a9..eb6e6ba2d39 100644 --- a/apps/files/l10n/eo.php +++ b/apps/files/l10n/eo.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Mankas provizora dosierujo.", "Failed to write to disk" => "Malsukcesis skribo al disko", "Not enough storage available" => "Ne haveblas sufiĉa memoro", -"Upload failed" => "Alŝuto malsukcesis", "Invalid directory." => "Nevalida dosierujo.", "Files" => "Dosieroj", -"Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn", "Not enough space available" => "Ne haveblas sufiĉa spaco", "Upload cancelled." => "La alŝuto nuliĝis.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.", @@ -34,7 +32,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), -"files uploading" => "dosieroj estas alŝutataj", "'.' is an invalid file name." => "'.' ne estas valida dosiernomo.", "File name cannot be empty." => "Dosiernomo devas ne malpleni.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.", diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index ce92ff8f187..90d760587d9 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta la carpeta temporal", "Failed to write to disk" => "Falló al escribir al disco", "Not enough storage available" => "No hay suficiente espacio disponible", -"Upload failed" => "Error en la subida", "Invalid directory." => "Directorio inválido.", "Files" => "Archivos", -"Unable to upload your file as it is a directory or has 0 bytes" => "Incapaz de subir su archivo, es un directorio o tiene 0 bytes", "Not enough space available" => "No hay suficiente espacio disponible", "Upload cancelled." => "Subida cancelada.", "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("","%n archivos"), "{dirs} and {files}" => "{dirs} y {files}", "_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"), -"files uploading" => "subiendo archivos", "'.' is an invalid file name." => "'.' no es un nombre de archivo válido.", "File name cannot be empty." => "El nombre de archivo no puede estar vacío.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ", diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index d9d10362630..be16f3f99ae 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta un directorio temporal", "Failed to write to disk" => "Error al escribir en el disco", "Not enough storage available" => "No hay suficiente almacenamiento", -"Upload failed" => "Error al subir el archivo", "Invalid directory." => "Directorio inválido.", "Files" => "Archivos", -"Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes", "Not enough space available" => "No hay suficiente espacio disponible", "Upload cancelled." => "La subida fue cancelada", "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n archivo","%n archivos"), "{dirs} and {files}" => "{carpetas} y {archivos}", "_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"), -"files uploading" => "Subiendo archivos", "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.", "File name cannot be empty." => "El nombre del archivo no puede quedar vacío.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.", diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 52ba1191706..9f674b27e63 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Ajutiste failide kaust puudub", "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus", "Not enough storage available" => "Saadaval pole piisavalt ruumi", -"Upload failed" => "Üleslaadimine ebaõnnestus", "Invalid directory." => "Vigane kaust.", "Files" => "Failid", -"Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti", "Not enough space available" => "Pole piisavalt ruumi", "Upload cancelled." => "Üleslaadimine tühistati.", "File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fail","%n faili"), "{dirs} and {files}" => "{dirs} ja {files}", "_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"), -"files uploading" => "faili üleslaadimisel", "'.' is an invalid file name." => "'.' on vigane failinimi.", "File name cannot be empty." => "Faili nimi ei saa olla tühi.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.", diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index 524be56af02..33ea47d5f04 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Aldi bateko karpeta falta da", "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan", "Not enough storage available" => "Ez dago behar aina leku erabilgarri,", -"Upload failed" => "igotzeak huts egin du", "Invalid directory." => "Baliogabeko karpeta.", "Files" => "Fitxategiak", -"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako", "Not enough space available" => "Ez dago leku nahikorik.", "Upload cancelled." => "Igoera ezeztatuta", "File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"), "_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"), "_Uploading %n file_::_Uploading %n files_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"), -"files uploading" => "fitxategiak igotzen", "'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.", "File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.", diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php index 24584f715b5..46d7cfe73ef 100644 --- a/apps/files/l10n/fa.php +++ b/apps/files/l10n/fa.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "یک پوشه موقت گم شده", "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود", "Not enough storage available" => "فضای کافی در دسترس نیست", -"Upload failed" => "بارگزاری ناموفق بود", "Invalid directory." => "فهرست راهنما نامعتبر می باشد.", "Files" => "پرونده‌ها", -"Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد", "Not enough space available" => "فضای کافی در دسترس نیست", "Upload cancelled." => "بار گذاری لغو شد", "File upload is in progress. Leaving the page now will cancel the upload." => "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "بارگذاری فایل ها", "'.' is an invalid file name." => "'.' یک نام پرونده نامعتبر است.", "File name cannot be empty." => "نام پرونده نمی تواند خالی باشد.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "نام نامعتبر ، '\\', '/', '<', '>', ':', '\"', '|', '?' و '*' مجاز نمی باشند.", diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index 1d29dbf79d2..ab443b28649 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Tilapäiskansio puuttuu", "Failed to write to disk" => "Levylle kirjoitus epäonnistui", "Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä", -"Upload failed" => "Lähetys epäonnistui", "Invalid directory." => "Virheellinen kansio.", "Files" => "Tiedostot", -"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio.", "Not enough space available" => "Tilaa ei ole riittävästi", "Upload cancelled." => "Lähetys peruttu.", "File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 2d538262a0a..d6470458083 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Absence de dossier temporaire.", "Failed to write to disk" => "Erreur d'écriture sur le disque", "Not enough storage available" => "Plus assez d'espace de stockage disponible", -"Upload failed" => "Échec de l'envoi", "Invalid directory." => "Dossier invalide.", "Files" => "Fichiers", -"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle", "Not enough space available" => "Espace disponible insuffisant", "Upload cancelled." => "Envoi annulé.", "File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fichier","%n fichiers"), "{dirs} and {files}" => "{dir} et {files}", "_Uploading %n file_::_Uploading %n files_" => array("Téléversement de %n fichier","Téléversement de %n fichiers"), -"files uploading" => "fichiers en cours d'envoi", "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.", "File name cannot be empty." => "Le nom de fichier ne peut être vide.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.", diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php index 01a6b54f842..0eba94f7d60 100644 --- a/apps/files/l10n/gl.php +++ b/apps/files/l10n/gl.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Falta o cartafol temporal", "Failed to write to disk" => "Produciuse un erro ao escribir no disco", "Not enough storage available" => "Non hai espazo de almacenamento abondo", -"Upload failed" => "Produciuse un fallou no envío", "Invalid directory." => "O directorio é incorrecto.", "Files" => "Ficheiros", -"Unable to upload your file as it is a directory or has 0 bytes" => "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes", "Not enough space available" => "O espazo dispoñíbel é insuficiente", "Upload cancelled." => "Envío cancelado.", "File upload is in progress. Leaving the page now will cancel the upload." => "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"), -"files uploading" => "ficheiros enviándose", "'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto", "File name cannot be empty." => "O nome de ficheiro non pode estar baleiro", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».", diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php index 40d7cc9c552..bc7ecdb0716 100644 --- a/apps/files/l10n/he.php +++ b/apps/files/l10n/he.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "תקיה זמנית חסרה", "Failed to write to disk" => "הכתיבה לכונן נכשלה", "Not enough storage available" => "אין די שטח פנוי באחסון", -"Upload failed" => "ההעלאה נכשלה", "Invalid directory." => "תיקייה שגויה.", "Files" => "קבצים", -"Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים", "Upload cancelled." => "ההעלאה בוטלה.", "File upload is in progress. Leaving the page now will cancel the upload." => "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.", "URL cannot be empty." => "קישור אינו יכול להיות ריק.", @@ -32,7 +30,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), -"files uploading" => "קבצים בהעלאה", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.", "Name" => "שם", "Size" => "גודל", diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php index 57f1ad9700b..60f1da84409 100644 --- a/apps/files/l10n/hr.php +++ b/apps/files/l10n/hr.php @@ -7,7 +7,6 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Nedostaje privremeni direktorij", "Failed to write to disk" => "Neuspjelo pisanje na disk", "Files" => "Datoteke", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij", "Upload cancelled." => "Slanje poništeno.", "File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.", "Error" => "Greška", @@ -21,7 +20,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), -"files uploading" => "datoteke se učitavaju", "Name" => "Ime", "Size" => "Veličina", "Modified" => "Zadnja promjena", diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index 66edbefbca5..5d313ff2488 100644 --- a/apps/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Hiányzik egy ideiglenes mappa", "Failed to write to disk" => "Nem sikerült a lemezre történő írás", "Not enough storage available" => "Nincs elég szabad hely.", -"Upload failed" => "A feltöltés nem sikerült", "Invalid directory." => "Érvénytelen mappa.", "Files" => "Fájlok", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű", "Not enough space available" => "Nincs elég szabad hely", "Upload cancelled." => "A feltöltést megszakítottuk.", "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.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), -"files uploading" => "fájl töltődik föl", "'.' is an invalid file name." => "'.' fájlnév érvénytelen.", "File name cannot be empty." => "A fájlnév nem lehet semmi.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'", diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php index ce7cfe5ef4c..c8b3194eb6b 100644 --- a/apps/files/l10n/id.php +++ b/apps/files/l10n/id.php @@ -13,7 +13,6 @@ $TRANSLATIONS = array( "Not enough storage available" => "Ruang penyimpanan tidak mencukupi", "Invalid directory." => "Direktori tidak valid.", "Files" => "Berkas", -"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte", "Not enough space available" => "Ruang penyimpanan tidak mencukupi", "Upload cancelled." => "Pengunggahan dibatalkan.", "File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.", @@ -32,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "berkas diunggah", "'.' is an invalid file name." => "'.' bukan nama berkas yang valid.", "File name cannot be empty." => "Nama berkas tidak boleh kosong.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.", diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php index 2cf195d0a11..ef493418206 100644 --- a/apps/files/l10n/is.php +++ b/apps/files/l10n/is.php @@ -12,7 +12,6 @@ $TRANSLATIONS = array( "Failed to write to disk" => "Tókst ekki að skrifa á disk", "Invalid directory." => "Ógild mappa.", "Files" => "Skrár", -"Unable to upload your file as it is a directory or has 0 bytes" => "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti.", "Not enough space available" => "Ekki nægt pláss tiltækt", "Upload cancelled." => "Hætt við innsendingu.", "File upload is in progress. Leaving the page now will cancel the upload." => "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index b0ec954d907..6eef9c4f69c 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manca una cartella temporanea", "Failed to write to disk" => "Scrittura su disco non riuscita", "Not enough storage available" => "Spazio di archiviazione insufficiente", -"Upload failed" => "Caricamento non riuscito", "Invalid directory." => "Cartella non valida.", "Files" => "File", -"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte", "Not enough space available" => "Spazio disponibile insufficiente", "Upload cancelled." => "Invio annullato", "File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n file","%n file"), "{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"), -"files uploading" => "caricamento file", "'.' is an invalid file name." => "'.' non è un nome file valido.", "File name cannot be empty." => "Il nome del file non può essere vuoto.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 5438cbb4976..5944b47434d 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "一時保存フォルダが見つかりません", "Failed to write to disk" => "ディスクへの書き込みに失敗しました", "Not enough storage available" => "ストレージに十分な空き容量がありません", -"Upload failed" => "アップロードに失敗", "Invalid directory." => "無効なディレクトリです。", "Files" => "ファイル", -"Unable to upload your file as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのファイルはアップロードできません", "Not enough space available" => "利用可能なスペースが十分にありません", "Upload cancelled." => "アップロードはキャンセルされました。", "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n個のファイル"), "{dirs} and {files}" => "{dirs} と {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"), -"files uploading" => "ファイルをアップロード中", "'.' is an invalid file name." => "'.' は無効なファイル名です。", "File name cannot be empty." => "ファイル名を空にすることはできません。", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。", diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php index 455e3211a55..b9313957714 100644 --- a/apps/files/l10n/ka_GE.php +++ b/apps/files/l10n/ka_GE.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "დროებითი საქაღალდე არ არსებობს", "Failed to write to disk" => "შეცდომა დისკზე ჩაწერისას", "Not enough storage available" => "საცავში საკმარისი ადგილი არ არის", -"Upload failed" => "ატვირთვა ვერ განხორციელდა", "Invalid directory." => "დაუშვებელი დირექტორია.", "Files" => "ფაილები", -"Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს", "Not enough space available" => "საკმარისი ადგილი არ არის", "Upload cancelled." => "ატვირთვა შეჩერებულ იქნა.", "File upload is in progress. Leaving the page now will cancel the upload." => "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას", @@ -33,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "ფაილები იტვირთება", "'.' is an invalid file name." => "'.' არის დაუშვებელი ფაილის სახელი.", "File name cannot be empty." => "ფაილის სახელი არ შეიძლება იყოს ცარიელი.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და '*' არ არის დაიშვებული.", diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php index e2b787e7f91..502acefcf3a 100644 --- a/apps/files/l10n/ko.php +++ b/apps/files/l10n/ko.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "임시 폴더가 없음", "Failed to write to disk" => "디스크에 쓰지 못했습니다", "Not enough storage available" => "저장소가 용량이 충분하지 않습니다.", -"Upload failed" => "업로드 실패", "Invalid directory." => "올바르지 않은 디렉터리입니다.", "Files" => "파일", -"Unable to upload your file as it is a directory or has 0 bytes" => "디렉터리 및 빈 파일은 업로드할 수 없습니다", "Not enough space available" => "여유 공간이 부족합니다", "Upload cancelled." => "업로드가 취소되었습니다.", "File upload is in progress. Leaving the page now will cancel the upload." => "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.", @@ -33,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "파일 업로드중", "'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.", "File name cannot be empty." => "파일 이름이 비어 있을 수 없습니다.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.", diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php index deefe9caa15..cd68b2b9ad2 100644 --- a/apps/files/l10n/lb.php +++ b/apps/files/l10n/lb.php @@ -7,7 +7,6 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Et feelt en temporären Dossier", "Failed to write to disk" => "Konnt net op den Disk schreiwen", "Files" => "Dateien", -"Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.", "Upload cancelled." => "Upload ofgebrach.", "File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.", "Error" => "Fehler", diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php index 83ed8e8688f..2b32a129d55 100644 --- a/apps/files/l10n/lt_LT.php +++ b/apps/files/l10n/lt_LT.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Nėra laikinojo katalogo", "Failed to write to disk" => "Nepavyko įrašyti į diską", "Not enough storage available" => "Nepakanka vietos serveryje", -"Upload failed" => "Nusiuntimas nepavyko", "Invalid directory." => "Neteisingas aplankas", "Files" => "Failai", -"Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas", "Not enough space available" => "Nepakanka vietos", "Upload cancelled." => "Įkėlimas atšauktas.", "File upload is in progress. Leaving the page now will cancel the upload." => "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n failas","%n failai","%n failų"), "{dirs} and {files}" => "{dirs} ir {files}", "_Uploading %n file_::_Uploading %n files_" => array("Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"), -"files uploading" => "įkeliami failai", "'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.", "File name cannot be empty." => "Failo pavadinimas negali būti tuščias.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.", diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php index d24aaca9e4c..cefaea62818 100644 --- a/apps/files/l10n/lv.php +++ b/apps/files/l10n/lv.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Trūkst pagaidu mapes", "Failed to write to disk" => "Neizdevās saglabāt diskā", "Not enough storage available" => "Nav pietiekami daudz vietas", -"Upload failed" => "Neizdevās augšupielādēt", "Invalid directory." => "Nederīga direktorija.", "Files" => "Datnes", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela", "Not enough space available" => "Nepietiek brīvas vietas", "Upload cancelled." => "Augšupielāde ir atcelta.", "File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"), "_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"), "_Uploading %n file_::_Uploading %n files_" => array("%n","Augšupielāde %n failu","Augšupielāde %n failus"), -"files uploading" => "fails augšupielādējas", "'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.", "File name cannot be empty." => "Datnes nosaukums nevar būt tukšs.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.", diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php index 7a9a8641f80..2306db6921a 100644 --- a/apps/files/l10n/mk.php +++ b/apps/files/l10n/mk.php @@ -9,7 +9,6 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Недостасува привремена папка", "Failed to write to disk" => "Неуспеав да запишам на диск", "Files" => "Датотеки", -"Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти", "Upload cancelled." => "Преземањето е прекинато.", "File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.", "URL cannot be empty." => "Адресата неможе да биде празна.", diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php index 59d0bbfb339..61bbf81cd8a 100644 --- a/apps/files/l10n/ms_MY.php +++ b/apps/files/l10n/ms_MY.php @@ -8,7 +8,6 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Direktori sementara hilang", "Failed to write to disk" => "Gagal untuk disimpan", "Files" => "Fail-fail", -"Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes", "Upload cancelled." => "Muatnaik dibatalkan.", "Error" => "Ralat", "Share" => "Kongsi", diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index 55ce978d2a2..8fda251a2bc 100644 --- a/apps/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Mangler midlertidig mappe", "Failed to write to disk" => "Klarte ikke å skrive til disk", "Not enough storage available" => "Ikke nok lagringsplass", -"Upload failed" => "Opplasting feilet", "Invalid directory." => "Ugyldig katalog.", "Files" => "Filer", -"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes", "Not enough space available" => "Ikke nok lagringsplass", "Upload cancelled." => "Opplasting avbrutt.", "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n mappe","%n mapper"), "_%n file_::_%n files_" => array("%n fil","%n filer"), "_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"), -"files uploading" => "filer lastes opp", "'.' is an invalid file name." => "'.' er et ugyldig filnavn.", "File name cannot be empty." => "Filnavn kan ikke være tomt.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.", diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 8e9454e7945..65ad5265237 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Er ontbreekt een tijdelijke map", "Failed to write to disk" => "Schrijven naar schijf mislukt", "Not enough storage available" => "Niet genoeg opslagruimte beschikbaar", -"Upload failed" => "Upload mislukt", "Invalid directory." => "Ongeldige directory.", "Files" => "Bestanden", -"Unable to upload your file as it is a directory or has 0 bytes" => "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is", "Not enough space available" => "Niet genoeg ruimte beschikbaar", "Upload cancelled." => "Uploaden geannuleerd.", "File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("","%n bestanden"), "{dirs} and {files}" => "{dirs} en {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"), -"files uploading" => "bestanden aan het uploaden", "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.", "File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.", diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index 58aafac27c4..04c47c31fbb 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manglar ei mellombels mappe", "Failed to write to disk" => "Klarte ikkje skriva til disk", "Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg", -"Upload failed" => "Feil ved opplasting", "Invalid directory." => "Ugyldig mappe.", "Files" => "Filer", -"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte", "Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg", "Upload cancelled." => "Opplasting avbroten.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fil","%n filer"), "{dirs} and {files}" => "{dirs} og {files}", "_Uploading %n file_::_Uploading %n files_" => array("Lastar opp %n fil","Lastar opp %n filer"), -"files uploading" => "filer lastar opp", "'.' is an invalid file name." => "«.» er eit ugyldig filnamn.", "File name cannot be empty." => "Filnamnet kan ikkje vera tomt.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.", diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php index 63e572059bf..a6d8f91458e 100644 --- a/apps/files/l10n/oc.php +++ b/apps/files/l10n/oc.php @@ -7,7 +7,6 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Un dorsièr temporari manca", "Failed to write to disk" => "L'escriptura sul disc a fracassat", "Files" => "Fichièrs", -"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet.", "Upload cancelled." => "Amontcargar anullat.", "File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ", "Error" => "Error", @@ -21,7 +20,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("",""), "_%n file_::_%n files_" => array("",""), "_Uploading %n file_::_Uploading %n files_" => array("",""), -"files uploading" => "fichièrs al amontcargar", "Name" => "Nom", "Size" => "Talha", "Modified" => "Modificat", diff --git a/apps/files/l10n/pa.php b/apps/files/l10n/pa.php index b28cb29622f..d8c50f2d1bc 100644 --- a/apps/files/l10n/pa.php +++ b/apps/files/l10n/pa.php @@ -1,6 +1,5 @@ "ਅੱਪਲੋਡ ਫੇਲ੍ਹ ਹੈ", "Files" => "ਫਾਇਲਾਂ", "Error" => "ਗਲਤੀ", "Share" => "ਸਾਂਝਾ ਕਰੋ", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index d8edf7173a8..3ad80975810 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Brak folderu tymczasowego", "Failed to write to disk" => "Błąd zapisu na dysk", "Not enough storage available" => "Za mało dostępnego miejsca", -"Upload failed" => "Wysyłanie nie powiodło się", "Invalid directory." => "Zła ścieżka.", "Files" => "Pliki", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów", "Not enough space available" => "Za mało miejsca", "Upload cancelled." => "Wczytywanie anulowane.", "File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n plik","%n pliki","%n plików"), "{dirs} and {files}" => "{katalogi} and {pliki}", "_Uploading %n file_::_Uploading %n files_" => array("Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"), -"files uploading" => "pliki wczytane", "'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.", "File name cannot be empty." => "Nazwa pliku nie może być pusta.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.", diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index f9915f251b4..e7370491b58 100644 --- a/apps/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Pasta temporária não encontrada", "Failed to write to disk" => "Falha ao escrever no disco", "Not enough storage available" => "Espaço de armazenamento insuficiente", -"Upload failed" => "Falha no envio", "Invalid directory." => "Diretório inválido.", "Files" => "Arquivos", -"Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes.", "Not enough space available" => "Espaço de armazenamento insuficiente", "Upload cancelled." => "Envio cancelado.", "File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n arquivo","%n arquivos"), "{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("Enviando %n arquivo","Enviando %n arquivos"), -"files uploading" => "enviando arquivos", "'.' is an invalid file name." => "'.' é um nome de arquivo inválido.", "File name cannot be empty." => "O nome do arquivo não pode estar vazio.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.", diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php index 33ec8cddce6..f6d61fc9873 100644 --- a/apps/files/l10n/pt_PT.php +++ b/apps/files/l10n/pt_PT.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Está a faltar a pasta temporária", "Failed to write to disk" => "Falhou a escrita no disco", "Not enough storage available" => "Não há espaço suficiente em disco", -"Upload failed" => "Carregamento falhou", "Invalid directory." => "Directório Inválido", "Files" => "Ficheiros", -"Unable to upload your file as it is a directory or has 0 bytes" => "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes", "Not enough space available" => "Espaço em disco insuficiente!", "Upload cancelled." => "Envio cancelado.", "File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"), "{dirs} and {files}" => "{dirs} e {files}", "_Uploading %n file_::_Uploading %n files_" => array("A carregar %n ficheiro","A carregar %n ficheiros"), -"files uploading" => "A enviar os ficheiros", "'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!", "File name cannot be empty." => "O nome do ficheiro não pode estar vazio.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.", diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php index 0a96eaa2479..481e070eacc 100644 --- a/apps/files/l10n/ro.php +++ b/apps/files/l10n/ro.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Lipsește un dosar temporar", "Failed to write to disk" => "Eroare la scrierea discului", "Not enough storage available" => "Nu este suficient spațiu disponibil", -"Upload failed" => "Încărcarea a eșuat", "Invalid directory." => "registru invalid.", "Files" => "Fișiere", -"Unable to upload your file as it is a directory or has 0 bytes" => "lista nu se poate incarca poate fi un fisier sau are 0 bytes", "Not enough space available" => "Nu este suficient spațiu disponibil", "Upload cancelled." => "Încărcare anulată.", "File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), -"files uploading" => "fișiere se încarcă", "'.' is an invalid file name." => "'.' este un nume invalid de fișier.", "File name cannot be empty." => "Numele fișierului nu poate rămâne gol.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.", diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 96f52a9045c..083df116f66 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Отсутствует временная папка", "Failed to write to disk" => "Ошибка записи на диск", "Not enough storage available" => "Недостаточно доступного места в хранилище", -"Upload failed" => "Ошибка загрузки", "Invalid directory." => "Неправильный каталог.", "Files" => "Файлы", -"Unable to upload your file as it is a directory or has 0 bytes" => "Файл не был загружен: его размер 0 байт либо это не файл, а директория.", "Not enough space available" => "Недостаточно свободного места", "Upload cancelled." => "Загрузка отменена.", "File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.", @@ -35,13 +33,14 @@ $TRANSLATIONS = array( "undo" => "отмена", "_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"), "_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"), +"{dirs} and {files}" => "{dirs} и {files}", "_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"), -"files uploading" => "файлы загружаются", "'.' is an invalid file name." => "'.' - неправильное имя файла.", "File name cannot be empty." => "Имя файла не может быть пустым.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.", "Your storage is full, files can not be updated or synced anymore!" => "Ваше дисковое пространство полностью заполнено, произведите очистку перед загрузкой новых файлов.", "Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти заполнено ({usedSpacePercent}%)", +"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрование было отключено, но ваши файлы все еще зашифрованы. Пожалуйста, зайдите на страницу персональных настроек для того, чтобы расшифровать ваши файлы.", "Your download is being prepared. This might take some time if the files are big." => "Загрузка началась. Это может потребовать много времени, если файл большого размера.", "Name" => "Имя", "Size" => "Размер", diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php index 1fd18d0c56f..7d24370a092 100644 --- a/apps/files/l10n/si_LK.php +++ b/apps/files/l10n/si_LK.php @@ -7,7 +7,6 @@ $TRANSLATIONS = array( "No file was uploaded" => "ගොනුවක් උඩුගත නොවුණි", "Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්", "Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි", -"Upload failed" => "උඩුගත කිරීම අසාර්ථකයි", "Files" => "ගොනු", "Upload cancelled." => "උඩුගත කිරීම අත් හරින්න ලදී", "File upload is in progress. Leaving the page now will cancel the upload." => "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත", diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php index b30f263d244..962ce7d7e9b 100644 --- a/apps/files/l10n/sk_SK.php +++ b/apps/files/l10n/sk_SK.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Chýba dočasný priečinok", "Failed to write to disk" => "Zápis na disk sa nepodaril", "Not enough storage available" => "Nedostatok dostupného úložného priestoru", -"Upload failed" => "Odoslanie bolo neúspešné", "Invalid directory." => "Neplatný priečinok.", "Files" => "Súbory", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov", "Not enough space available" => "Nie je k dispozícii dostatok miesta", "Upload cancelled." => "Odosielanie zrušené.", "File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"), "_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"), "_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"), -"files uploading" => "nahrávanie súborov", "'.' is an invalid file name." => "'.' je neplatné meno súboru.", "File name cannot be empty." => "Meno súboru nemôže byť prázdne", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.", diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index 08f789ff866..7190753eac9 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Manjka začasna mapa", "Failed to write to disk" => "Pisanje na disk je spodletelo", "Not enough storage available" => "Na voljo ni dovolj prostora", -"Upload failed" => "Pošiljanje je spodletelo", "Invalid directory." => "Neveljavna mapa.", "Files" => "Datoteke", -"Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov.", "Not enough space available" => "Na voljo ni dovolj prostora.", "Upload cancelled." => "Pošiljanje je preklicano.", "File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","","",""), "_%n file_::_%n files_" => array("","","",""), "_Uploading %n file_::_Uploading %n files_" => array("","","",""), -"files uploading" => "poteka pošiljanje datotek", "'.' is an invalid file name." => "'.' je neveljavno ime datoteke.", "File name cannot be empty." => "Ime datoteke ne sme biti prazno polje.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.", diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php index 3207e3a165c..ecc066a284c 100644 --- a/apps/files/l10n/sq.php +++ b/apps/files/l10n/sq.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Një dosje e përkohshme nuk u gjet", "Failed to write to disk" => "Ruajtja në disk dështoi", "Not enough storage available" => "Nuk ka mbetur hapësirë memorizimi e mjaftueshme", -"Upload failed" => "Ngarkimi dështoi", "Invalid directory." => "Dosje e pavlefshme.", "Files" => "Skedarët", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte", "Not enough space available" => "Nuk ka hapësirë memorizimi e mjaftueshme", "Upload cancelled." => "Ngarkimi u anulua.", "File upload is in progress. Leaving the page now will cancel the upload." => "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n skedar","%n skedarë"), "{dirs} and {files}" => "{dirs} dhe {files}", "_Uploading %n file_::_Uploading %n files_" => array("Po ngarkoj %n skedar","Po ngarkoj %n skedarë"), -"files uploading" => "po ngarkoj skedarët", "'.' is an invalid file name." => "'.' është emër i pavlefshëm.", "File name cannot be empty." => "Emri i skedarit nuk mund të jetë bosh.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Emër i pavlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.", diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php index 73f8ace5c81..fd3b2a2912f 100644 --- a/apps/files/l10n/sr.php +++ b/apps/files/l10n/sr.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Недостаје привремена фасцикла", "Failed to write to disk" => "Не могу да пишем на диск", "Not enough storage available" => "Нема довољно простора", -"Upload failed" => "Отпремање није успело", "Invalid directory." => "неисправна фасцикла.", "Files" => "Датотеке", -"Unable to upload your file as it is a directory or has 0 bytes" => "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова", "Not enough space available" => "Нема довољно простора", "Upload cancelled." => "Отпремање је прекинуто.", "File upload is in progress. Leaving the page now will cancel the upload." => "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.", @@ -33,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), -"files uploading" => "датотеке се отпремају", "'.' is an invalid file name." => "Датотека „.“ је неисправног имена.", "File name cannot be empty." => "Име датотеке не може бити празно.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.", diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php index 1965479fe66..8831d1a1bef 100644 --- a/apps/files/l10n/sr@latin.php +++ b/apps/files/l10n/sr@latin.php @@ -6,6 +6,8 @@ $TRANSLATIONS = array( "No file was uploaded" => "Nijedan fajl nije poslat", "Missing a temporary folder" => "Nedostaje privremena fascikla", "Files" => "Fajlovi", +"Error" => "Greška", +"Share" => "Podeli", "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), @@ -17,6 +19,7 @@ $TRANSLATIONS = array( "Save" => "Snimi", "Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!", "Download" => "Preuzmi", +"Unshare" => "Ukljoni deljenje", "Delete" => "Obriši", "Upload too large" => "Pošiljka je prevelika", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru." diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index fbbe1f15910..208dcd4ea12 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "En temporär mapp saknas", "Failed to write to disk" => "Misslyckades spara till disk", "Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt", -"Upload failed" => "Misslyckad uppladdning", "Invalid directory." => "Felaktig mapp.", "Files" => "Filer", -"Unable to upload your file as it is a directory or has 0 bytes" => "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes", "Not enough space available" => "Inte tillräckligt med utrymme tillgängligt", "Upload cancelled." => "Uppladdning avbruten.", "File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n fil","%n filer"), "{dirs} and {files}" => "{dirs} och {files}", "_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"), -"files uploading" => "filer laddas upp", "'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.", "File name cannot be empty." => "Filnamn kan inte vara tomt.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.", diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php index 154e0d6796e..f05990b94f0 100644 --- a/apps/files/l10n/ta_LK.php +++ b/apps/files/l10n/ta_LK.php @@ -7,9 +7,7 @@ $TRANSLATIONS = array( "No file was uploaded" => "எந்த கோப்பும் பதிவேற்றப்படவில்லை", "Missing a temporary folder" => "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை", "Failed to write to disk" => "வட்டில் எழுத முடியவில்லை", -"Upload failed" => "பதிவேற்றல் தோல்வியுற்றது", "Files" => "கோப்புகள்", -"Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை", "Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது", "File upload is in progress. Leaving the page now will cancel the upload." => "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.", "URL cannot be empty." => "URL வெறுமையாக இருக்கமுடியாது.", diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php index aa8cf4e9b50..37144ebc883 100644 --- a/apps/files/l10n/th_TH.php +++ b/apps/files/l10n/th_TH.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย", "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว", "Not enough storage available" => "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน", -"Upload failed" => "อัพโหลดล้มเหลว", "Invalid directory." => "ไดเร็กทอรี่ไม่ถูกต้อง", "Files" => "ไฟล์", -"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์", "Not enough space available" => "มีพื้นที่เหลือไม่เพียงพอ", "Upload cancelled." => "การอัพโหลดถูกยกเลิก", "File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก", @@ -32,7 +30,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "การอัพโหลดไฟล์", "'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง", "File name cannot be empty." => "ชื่อไฟล์ไม่สามารถเว้นว่างได้", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index dd089757d5f..8cb05e16ace 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Geçici dizin eksik", "Failed to write to disk" => "Diske yazılamadı", "Not enough storage available" => "Yeterli disk alanı yok", -"Upload failed" => "Yükleme başarısız", "Invalid directory." => "Geçersiz dizin.", "Files" => "Dosyalar", -"Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi", "Not enough space available" => "Yeterli disk alanı yok", "Upload cancelled." => "Yükleme iptal edildi.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n dizin","%n dizin"), "_%n file_::_%n files_" => array("%n dosya","%n dosya"), "_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"), -"files uploading" => "Dosyalar yükleniyor", "'.' is an invalid file name." => "'.' geçersiz dosya adı.", "File name cannot be empty." => "Dosya adı boş olamaz.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.", diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php index 920d077e4eb..a38ce706ef9 100644 --- a/apps/files/l10n/ug.php +++ b/apps/files/l10n/ug.php @@ -23,7 +23,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ", "Name" => "ئاتى", "Size" => "چوڭلۇقى", "Modified" => "ئۆزگەرتكەن", diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index bea1d930799..fac7cea529a 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -12,10 +12,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Відсутній тимчасовий каталог", "Failed to write to disk" => "Невдалося записати на диск", "Not enough storage available" => "Місця більше немає", -"Upload failed" => "Помилка завантаження", "Invalid directory." => "Невірний каталог.", "Files" => "Файли", -"Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт", "Not enough space available" => "Місця більше немає", "Upload cancelled." => "Завантаження перервано.", "File upload is in progress. Leaving the page now will cancel the upload." => "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.", @@ -34,7 +32,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), -"files uploading" => "файли завантажуються", "'.' is an invalid file name." => "'.' це невірне ім'я файлу.", "File name cannot be empty." => " Ім'я файлу не може бути порожнім.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.", diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php index b98a14f6d7b..2d63128aa26 100644 --- a/apps/files/l10n/vi.php +++ b/apps/files/l10n/vi.php @@ -11,10 +11,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Không tìm thấy thư mục tạm", "Failed to write to disk" => "Không thể ghi ", "Not enough storage available" => "Không đủ không gian lưu trữ", -"Upload failed" => "Tải lên thất bại", "Invalid directory." => "Thư mục không hợp lệ", "Files" => "Tập tin", -"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte", "Not enough space available" => "Không đủ chỗ trống cần thiết", "Upload cancelled." => "Hủy tải lên", "File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.", @@ -33,7 +31,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array(""), "_%n file_::_%n files_" => array(""), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "tệp tin đang được tải lên", "'.' is an invalid file name." => "'.' là một tên file không hợp lệ", "File name cannot be empty." => "Tên file không được rỗng", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.", diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index 59b09ad950b..b739b72ce7e 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "缺少临时目录", "Failed to write to disk" => "写入磁盘失败", "Not enough storage available" => "没有足够的存储空间", -"Upload failed" => "上传失败", "Invalid directory." => "无效文件夹。", "Files" => "文件", -"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传您的文件，文件夹或者空文件", "Not enough space available" => "没有足够可用空间", "Upload cancelled." => "上传已取消", "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。", @@ -36,7 +34,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("%n 文件夹"), "_%n file_::_%n files_" => array("%n个文件"), "_Uploading %n file_::_Uploading %n files_" => array(""), -"files uploading" => "文件上传中", "'.' is an invalid file name." => "'.' 是一个无效的文件名。", "File name cannot be empty." => "文件名不能为空。", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。", diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php index 21c929f81a6..214812d7ada 100644 --- a/apps/files/l10n/zh_TW.php +++ b/apps/files/l10n/zh_TW.php @@ -13,10 +13,8 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "找不到暫存資料夾", "Failed to write to disk" => "寫入硬碟失敗", "Not enough storage available" => "儲存空間不足", -"Upload failed" => "上傳失敗", "Invalid directory." => "無效的資料夾", "Files" => "檔案", -"Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案，因為它可能是一個目錄或檔案大小為0", "Not enough space available" => "沒有足夠的可用空間", "Upload cancelled." => "上傳已取消", "File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中，離開此頁面將會取消上傳。", @@ -37,7 +35,6 @@ $TRANSLATIONS = array( "_%n file_::_%n files_" => array("%n 個檔案"), "{dirs} and {files}" => "{dirs} 和 {files}", "_Uploading %n file_::_Uploading %n files_" => array("%n 個檔案正在上傳"), -"files uploading" => "檔案上傳中", "'.' is an invalid file name." => "'.' 是不合法的檔名", "File name cannot be empty." => "檔名不能為空", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法，不允許 \\ / < > : \" | ? * 字元", diff --git a/apps/files_trashbin/l10n/en_GB.php b/apps/files_trashbin/l10n/en_GB.php index bcfcfc86240..be9d8b9f520 100644 --- a/apps/files_trashbin/l10n/en_GB.php +++ b/apps/files_trashbin/l10n/en_GB.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Delete permanently" => "Delete permanently", "Name" => "Name", "Deleted" => "Deleted", -"_%n folder_::_%n folders_" => array("","%n folders"), -"_%n file_::_%n files_" => array("","%n files"), +"_%n folder_::_%n folders_" => array("%n folder","%n folders"), +"_%n file_::_%n files_" => array("%n file","%n files"), "restored" => "restored", "Nothing in here. Your trash bin is empty!" => "Nothing in here. Your recycle bin is empty!", "Restore" => "Restore", diff --git a/apps/files_trashbin/l10n/sr@latin.php b/apps/files_trashbin/l10n/sr@latin.php index 483d1e3ca2b..fa30afcf4bf 100644 --- a/apps/files_trashbin/l10n/sr@latin.php +++ b/apps/files_trashbin/l10n/sr@latin.php @@ -1,5 +1,6 @@ "Greška", "Name" => "Ime", "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php index f26e26f1e77..40cab1c5418 100644 --- a/apps/user_ldap/l10n/ru.php +++ b/apps/user_ldap/l10n/ru.php @@ -40,6 +40,7 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера.", "Backup (Replica) Port" => "Порт резервного сервера", "Disable Main Server" => "Отключение главного сервера", +"Only connect to the replica server." => "Только подключение к серверу реплик.", "Use TLS" => "Использовать TLS", "Do not use it additionally for LDAPS connections, it will fail." => "Не используйте совместно с безопасными подключениями (LDAPS), это не сработает.", "Case insensitve LDAP server (Windows)" => "Нечувствительный к регистру сервер LDAP (Windows)", @@ -48,11 +49,13 @@ $TRANSLATIONS = array( "in seconds. A change empties the cache." => "в секундах. Изменение очистит кэш.", "Directory Settings" => "Настройки каталога", "User Display Name Field" => "Поле отображаемого имени пользователя", +"The LDAP attribute to use to generate the user's display name." => "Атрибут LDAP, который используется для генерации отображаемого имени пользователя.", "Base User Tree" => "База пользовательского дерева", "One User Base DN per line" => "По одной базовому DN пользователей в строке.", "User Search Attributes" => "Поисковые атрибуты пользователя", "Optional; one attribute per line" => "Опционально; один атрибут на линию", "Group Display Name Field" => "Поле отображаемого имени группы", +"The LDAP attribute to use to generate the groups's display name." => "Атрибут LDAP, который используется для генерации отображаемого имени группы.", "Base Group Tree" => "База группового дерева", "One Group Base DN per line" => "По одной базовому DN групп в строке.", "Group Search Attributes" => "Атрибуты поиска для группы", diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php index 07db505ecf3..24fff94fc65 100644 --- a/apps/user_ldap/l10n/sr@latin.php +++ b/apps/user_ldap/l10n/sr@latin.php @@ -1,5 +1,6 @@ "Greška", "Password" => "Lozinka", "Help" => "Pomoć" ); diff --git a/core/l10n/ach.php b/core/l10n/ach.php index 25f1137e8cd..2cbbaa45ca7 100644 --- a/core/l10n/ach.php +++ b/core/l10n/ach.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n > 1);"; diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php index 41447055609..6a0bbc53ac9 100644 --- a/core/l10n/af_ZA.php +++ b/core/l10n/af_ZA.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Password" => "Wagwoord", "Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}", "You will receive a link to reset your password via Email." => "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.", diff --git a/core/l10n/ar.php b/core/l10n/ar.php index 17c3ab293c6..62a9580b12c 100644 --- a/core/l10n/ar.php +++ b/core/l10n/ar.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "نعم", "No" => "لا", "Ok" => "موافق", +"_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""), "The object type is not specified." => "نوع العنصر غير محدد.", "Error" => "خطأ", "The app name is not specified." => "اسم التطبيق غير محدد.", diff --git a/core/l10n/be.php b/core/l10n/be.php index 83f0d99a2e4..2481806bcb9 100644 --- a/core/l10n/be.php +++ b/core/l10n/be.php @@ -4,6 +4,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("","","",""), "_%n day ago_::_%n days ago_" => array("","","",""), "_%n month ago_::_%n months ago_" => array("","","",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","","",""), "Advanced" => "Дасведчаны", "Finish setup" => "Завяршыць ўстаноўку." ); diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php index 8afe42f206b..a4f1585420a 100644 --- a/core/l10n/bg_BG.php +++ b/core/l10n/bg_BG.php @@ -34,6 +34,7 @@ $TRANSLATIONS = array( "Yes" => "Да", "No" => "Не", "Ok" => "Добре", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "Грешка", "Share" => "Споделяне", "Share with" => "Споделено с", diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php index 5e65d681ec2..aaf982b9e52 100644 --- a/core/l10n/bn_BD.php +++ b/core/l10n/bn_BD.php @@ -42,6 +42,7 @@ $TRANSLATIONS = array( "Yes" => "হ্যাঁ", "No" => "না", "Ok" => "তথাস্তু", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।", "Error" => "সমস্যা", "The app name is not specified." => "অ্যাপের নামটি সুনির্দিষ্ট নয়।", diff --git a/core/l10n/bs.php b/core/l10n/bs.php index 885518f9136..ee8196e9741 100644 --- a/core/l10n/bs.php +++ b/core/l10n/bs.php @@ -4,6 +4,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("","",""), "_%n day ago_::_%n days ago_" => array("","",""), "_%n month ago_::_%n months ago_" => array("","",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "Share" => "Podijeli", "Add" => "Dodaj" ); diff --git a/core/l10n/ca.php b/core/l10n/ca.php index bc1960053a7..448fbae0ad8 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "D'acord", "Error loading message template: {error}" => "Error en carregar la plantilla de missatge: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "No s'ha especificat el tipus d'objecte.", "Error" => "Error", "The app name is not specified." => "No s'ha especificat el nom de l'aplicació.", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index aa5fd620c3e..9ee5dd471f1 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Ne", "Ok" => "Ok", "Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Není určen typ objektu.", "Error" => "Chyba", "The app name is not specified." => "Není určen název aplikace.", diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php index 1f6c50524b3..a8b1e894e70 100644 --- a/core/l10n/cy_GB.php +++ b/core/l10n/cy_GB.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "Ie", "No" => "Na", "Ok" => "Iawn", +"_{count} file conflict_::_{count} file conflicts_" => array("","","",""), "The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.", "Error" => "Gwall", "The app name is not specified." => "Nid yw enw'r pecyn wedi cael ei nodi.", diff --git a/core/l10n/da.php b/core/l10n/da.php index 3fd0fff94ef..0f7f8cfc63b 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Ja", "No" => "Nej", "Ok" => "OK", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Objekttypen er ikke angivet.", "Error" => "Fejl", "The app name is not specified." => "Den app navn er ikke angivet.", diff --git a/core/l10n/de.php b/core/l10n/de.php index 934e227f91f..302ebe2f2f9 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Nein", "Ok" => "OK", "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php index 93c8e33f3e2..ffcdde48d47 100644 --- a/core/l10n/de_AT.php +++ b/core/l10n/de_AT.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php index 5ac614b2575..7e2d4d9f152 100644 --- a/core/l10n/de_CH.php +++ b/core/l10n/de_CH.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Ja", "No" => "Nein", "Ok" => "OK", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 652ef737b68..30825d5b4bb 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Nein", "Ok" => "OK", "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Der Objekttyp ist nicht angegeben.", "Error" => "Fehler", "The app name is not specified." => "Der App-Name ist nicht angegeben.", diff --git a/core/l10n/el.php b/core/l10n/el.php index 6e0733b7060..929caad1dc7 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Ναι", "No" => "Όχι", "Ok" => "Οκ", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.", "Error" => "Σφάλμα", "The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.", diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php index 997d1f88c46..461a44dd235 100644 --- a/core/l10n/en@pirate.php +++ b/core/l10n/en@pirate.php @@ -4,6 +4,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Password" => "Passcode" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php index 2d588ab2431..05d945be6db 100644 --- a/core/l10n/en_GB.php +++ b/core/l10n/en_GB.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "OK", "Error loading message template: {error}" => "Error loading message template: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "The object type is not specified.", "Error" => "Error", "The app name is not specified." => "The app name is not specified.", @@ -100,7 +101,7 @@ $TRANSLATIONS = array( "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.
If you do not receive it within a reasonable amount of time, check your spam/junk folders.
If it is not there ask your local administrator ." => "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.
If it is not there ask your local administrator .", "Request failed!
Did you make sure your email/username was right?" => "Request failed!
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.", +"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", diff --git a/core/l10n/eo.php b/core/l10n/eo.php index 669f677d46d..d86c2bfacda 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Jes", "No" => "Ne", "Ok" => "Akcepti", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Ne indikiĝis tipo de la objekto.", "Error" => "Eraro", "The app name is not specified." => "Ne indikiĝis nomo de la aplikaĵo.", diff --git a/core/l10n/es.php b/core/l10n/es.php index a38050bccc2..b94e6b561da 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Sí", "No" => "No", "Ok" => "Aceptar", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "El tipo de objeto no está especificado.", "Error" => "Error", "The app name is not specified." => "El nombre de la aplicación no está especificado.", diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index 2c699266c51..e079d5bcff1 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Sí", "No" => "No", "Ok" => "Aceptar", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "El tipo de objeto no está especificado. ", "Error" => "Error", "The app name is not specified." => "El nombre de la App no está especificado.", diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php index 93c8e33f3e2..ffcdde48d47 100644 --- a/core/l10n/es_MX.php +++ b/core/l10n/es_MX.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index 48fc5adcbb0..233756a8358 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Ei", "Ok" => "Ok", "Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Objekti tüüp pole määratletud.", "Error" => "Viga", "The app name is not specified." => "Rakenduse nimi ole määratletud.", diff --git a/core/l10n/eu.php b/core/l10n/eu.php index 1c11caee9e8..77a1c18167b 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Bai", "No" => "Ez", "Ok" => "Ados", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Objetu mota ez dago zehaztuta.", "Error" => "Errorea", "The app name is not specified." => "App izena ez dago zehaztuta.", diff --git a/core/l10n/fa.php b/core/l10n/fa.php index b0423577b0c..ab5d3628a07 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "بله", "No" => "نه", "Ok" => "قبول", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "نوع شی تعیین نشده است.", "Error" => "خطا", "The app name is not specified." => "نام برنامه تعیین نشده است.", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index cb98a67b29d..d4a922924dc 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -52,6 +52,7 @@ $TRANSLATIONS = array( "Yes" => "Kyllä", "No" => "Ei", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "Virhe", "The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.", "The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 8b8b7c19f2a..aac4ef99e5d 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Erreur lors de l'ajout de %s aux favoris.", "No categories selected for deletion." => "Pas de catégorie sélectionnée pour la suppression.", "Error removing %s from favorites." => "Erreur lors de la suppression de %s des favoris.", +"No image or file provided" => "Aucune image ou fichier fourni", +"Unknown filetype" => "Type de fichier inconnu", +"Invalid image" => "Image invalide", "Sunday" => "Dimanche", "Monday" => "Lundi", "Tuesday" => "Mardi", @@ -48,9 +51,12 @@ $TRANSLATIONS = array( "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", "Choose" => "Choisir", +"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}", "Yes" => "Oui", "No" => "Non", "Ok" => "Ok", +"Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Le type d'objet n'est pas spécifié.", "Error" => "Erreur", "The app name is not specified." => "Le nom de l'application n'est pas spécifié.", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index ec137a4e04c..5212348872e 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Non", "Ok" => "Aceptar", "Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Non se especificou o tipo de obxecto.", "Error" => "Erro", "The app name is not specified." => "Non se especificou o nome do aplicativo.", diff --git a/core/l10n/he.php b/core/l10n/he.php index a10765c3a80..32dcde40a95 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "כן", "No" => "לא", "Ok" => "בסדר", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "סוג הפריט לא צוין.", "Error" => "שגיאה", "The app name is not specified." => "שם היישום לא צוין.", diff --git a/core/l10n/hi.php b/core/l10n/hi.php index e69f2ffcf53..e783ec88d17 100644 --- a/core/l10n/hi.php +++ b/core/l10n/hi.php @@ -27,6 +27,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "त्रुटि", "Share" => "साझा करें", "Share with" => "के साथ साझा", diff --git a/core/l10n/hr.php b/core/l10n/hr.php index 97fbfb8b97f..b53301583d1 100644 --- a/core/l10n/hr.php +++ b/core/l10n/hr.php @@ -37,6 +37,7 @@ $TRANSLATIONS = array( "Yes" => "Da", "No" => "Ne", "Ok" => "U redu", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "Error" => "Greška", "Share" => "Podijeli", "Error while sharing" => "Greška prilikom djeljenja", diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index 92e51d977ef..2c30fe68b7e 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Igen", "No" => "Nem", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Az objektum típusa nincs megadva.", "Error" => "Hiba", "The app name is not specified." => "Az alkalmazás neve nincs megadva.", diff --git a/core/l10n/hy.php b/core/l10n/hy.php index 9965d4731b0..d2b68819c72 100644 --- a/core/l10n/hy.php +++ b/core/l10n/hy.php @@ -22,6 +22,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ia.php b/core/l10n/ia.php index 0556d5d1295..9f530d47309 100644 --- a/core/l10n/ia.php +++ b/core/l10n/ia.php @@ -24,6 +24,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "Error", "Share" => "Compartir", "Password" => "Contrasigno", diff --git a/core/l10n/id.php b/core/l10n/id.php index 0f222918c95..d8006280918 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "Ya", "No" => "Tidak", "Ok" => "Oke", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "Tipe objek tidak ditentukan.", "Error" => "Galat", "The app name is not specified." => "Nama aplikasi tidak ditentukan.", diff --git a/core/l10n/is.php b/core/l10n/is.php index 8211421cf35..7aad8ea43ee 100644 --- a/core/l10n/is.php +++ b/core/l10n/is.php @@ -42,6 +42,7 @@ $TRANSLATIONS = array( "Yes" => "Já", "No" => "Nei", "Ok" => "Í lagi", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Tegund ekki tilgreind", "Error" => "Villa", "The app name is not specified." => "Nafn forrits ekki tilgreint", diff --git a/core/l10n/it.php b/core/l10n/it.php index 72fb2756d29..fa85f0ae94b 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -17,10 +17,10 @@ $TRANSLATIONS = array( "No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.", "Error removing %s from favorites." => "Errore durante la rimozione di %s dai preferiti.", "No image or file provided" => "Non è stata fornita alcun immagine o file", -"Unknown filetype" => "Tipo file sconosciuto", +"Unknown filetype" => "Tipo di file sconosciuto", "Invalid image" => "Immagine non valida", -"No temporary profile picture available, try again" => "Nessuna foto profilo temporanea disponibile, riprova", -"No crop data provided" => "Raccolta dati non prevista", +"No temporary profile picture available, try again" => "Nessuna foto di profilo temporanea disponibile, riprova", +"No crop data provided" => "Dati di ritaglio non forniti", "Sunday" => "Domenica", "Monday" => "Lunedì", "Tuesday" => "Martedì", @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "Ok", "Error loading message template: {error}" => "Errore durante il caricamento del modello di messaggio: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Il tipo di oggetto non è specificato.", "Error" => "Errore", "The app name is not specified." => "Il nome dell'applicazione non è specificato.", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 2416f23c8e9..8c36f965599 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -57,6 +57,7 @@ $TRANSLATIONS = array( "No" => "いいえ", "Ok" => "OK", "Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "オブジェクタイプが指定されていません。", "Error" => "エラー", "The app name is not specified." => "アプリ名がしていされていません。", diff --git a/core/l10n/ka.php b/core/l10n/ka.php index b6700f00f94..4805886c32c 100644 --- a/core/l10n/ka.php +++ b/core/l10n/ka.php @@ -7,6 +7,7 @@ $TRANSLATIONS = array( "yesterday" => "გუშინ", "_%n day ago_::_%n days ago_" => array(""), "_%n month ago_::_%n months ago_" => array(""), +"_{count} file conflict_::_{count} file conflicts_" => array(""), "Password" => "პაროლი", "Personal" => "პერსონა", "Users" => "მომხმარებლები", diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php index 15cacc8b218..42af86b2327 100644 --- a/core/l10n/ka_GE.php +++ b/core/l10n/ka_GE.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "კი", "No" => "არა", "Ok" => "დიახ", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.", "Error" => "შეცდომა", "The app name is not specified." => "აპლიკაციის სახელი არ არის მითითებული.", diff --git a/core/l10n/km.php b/core/l10n/km.php index 556cca20dac..dbedde7e637 100644 --- a/core/l10n/km.php +++ b/core/l10n/km.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array(""), "_%n hour ago_::_%n hours ago_" => array(""), "_%n day ago_::_%n days ago_" => array(""), -"_%n month ago_::_%n months ago_" => array("") +"_%n month ago_::_%n months ago_" => array(""), +"_{count} file conflict_::_{count} file conflicts_" => array("") ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/kn.php b/core/l10n/kn.php index 556cca20dac..dbedde7e637 100644 --- a/core/l10n/kn.php +++ b/core/l10n/kn.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array(""), "_%n hour ago_::_%n hours ago_" => array(""), "_%n day ago_::_%n days ago_" => array(""), -"_%n month ago_::_%n months ago_" => array("") +"_%n month ago_::_%n months ago_" => array(""), +"_{count} file conflict_::_{count} file conflicts_" => array("") ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/ko.php b/core/l10n/ko.php index 0265f38dc07..3c0ca5f4ff5 100644 --- a/core/l10n/ko.php +++ b/core/l10n/ko.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "예", "No" => "아니요", "Ok" => "승락", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "객체 유형이 지정되지 않았습니다.", "Error" => "오류", "The app name is not specified." => "앱 이름이 지정되지 않았습니다.", diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php index 5ce6ce9c821..2feb6db2723 100644 --- a/core/l10n/ku_IQ.php +++ b/core/l10n/ku_IQ.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), "_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "هه‌ڵه", "Share" => "هاوبەشی کردن", "Password" => "وشەی تێپەربو", diff --git a/core/l10n/lb.php b/core/l10n/lb.php index 6a0b41b6679..c82f88d66de 100644 --- a/core/l10n/lb.php +++ b/core/l10n/lb.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Jo", "No" => "Nee", "Ok" => "OK", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Den Typ vum Object ass net uginn.", "Error" => "Feeler", "The app name is not specified." => "Den Numm vun der App ass net uginn.", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 1fbcf891064..630d66ce679 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Ne", "Ok" => "Gerai", "Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Objekto tipas nenurodytas.", "Error" => "Klaida", "The app name is not specified." => "Nenurodytas programos pavadinimas.", diff --git a/core/l10n/lv.php b/core/l10n/lv.php index 465a497e880..48bb7b5381d 100644 --- a/core/l10n/lv.php +++ b/core/l10n/lv.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Jā", "No" => "Nē", "Ok" => "Labi", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Nav norādīts objekta tips.", "Error" => "Kļūda", "The app name is not specified." => "Nav norādīts lietotnes nosaukums.", diff --git a/core/l10n/mk.php b/core/l10n/mk.php index 6a8ec50061c..4caabfa7efd 100644 --- a/core/l10n/mk.php +++ b/core/l10n/mk.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "Yes" => "Да", "No" => "Не", "Ok" => "Во ред", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Не е специфициран типот на објект.", "Error" => "Грешка", "The app name is not specified." => "Името на апликацијата не е специфицирано.", diff --git a/core/l10n/ml_IN.php b/core/l10n/ml_IN.php index 93c8e33f3e2..ffcdde48d47 100644 --- a/core/l10n/ml_IN.php +++ b/core/l10n/ml_IN.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php index fc3698d58d1..f6517f9e513 100644 --- a/core/l10n/ms_MY.php +++ b/core/l10n/ms_MY.php @@ -29,6 +29,7 @@ $TRANSLATIONS = array( "Yes" => "Ya", "No" => "Tidak", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "Error" => "Ralat", "Share" => "Kongsi", "Password" => "Kata laluan", diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php index 1016ec5f512..672067508fd 100644 --- a/core/l10n/my_MM.php +++ b/core/l10n/my_MM.php @@ -28,6 +28,7 @@ $TRANSLATIONS = array( "Yes" => "ဟုတ်", "No" => "မဟုတ်ဘူး", "Ok" => "အိုကေ", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "Password" => "စကားဝှက်", "Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်", "Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်", diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index 132b65daab2..5e08668feb4 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -40,6 +40,7 @@ $TRANSLATIONS = array( "Yes" => "Ja", "No" => "Nei", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "Feil", "Shared" => "Delt", "Share" => "Del", diff --git a/core/l10n/ne.php b/core/l10n/ne.php index 93c8e33f3e2..ffcdde48d47 100644 --- a/core/l10n/ne.php +++ b/core/l10n/ne.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/nl.php b/core/l10n/nl.php index be0b93f33cc..a7e9cc53012 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Nee", "Ok" => "Ok", "Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Het object type is niet gespecificeerd.", "Error" => "Fout", "The app name is not specified." => "De app naam is niet gespecificeerd.", diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index 86c46471a14..3b6566f40af 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Ja", "No" => "Nei", "Ok" => "Greitt", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Objekttypen er ikkje spesifisert.", "Error" => "Feil", "The app name is not specified." => "Programnamnet er ikkje spesifisert.", diff --git a/core/l10n/nqo.php b/core/l10n/nqo.php index 556cca20dac..dbedde7e637 100644 --- a/core/l10n/nqo.php +++ b/core/l10n/nqo.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array(""), "_%n hour ago_::_%n hours ago_" => array(""), "_%n day ago_::_%n days ago_" => array(""), -"_%n month ago_::_%n months ago_" => array("") +"_%n month ago_::_%n months ago_" => array(""), +"_{count} file conflict_::_{count} file conflicts_" => array("") ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/l10n/oc.php b/core/l10n/oc.php index 0ca3cc427a0..2de644e00ae 100644 --- a/core/l10n/oc.php +++ b/core/l10n/oc.php @@ -38,6 +38,7 @@ $TRANSLATIONS = array( "Yes" => "Òc", "No" => "Non", "Ok" => "D'accòrdi", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "Error", "Share" => "Parteja", "Error while sharing" => "Error al partejar", diff --git a/core/l10n/pa.php b/core/l10n/pa.php index d51c26da8e1..5fc13bd1f77 100644 --- a/core/l10n/pa.php +++ b/core/l10n/pa.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "Yes" => "ਹਾਂ", "No" => "ਨਹੀਂ", "Ok" => "ਠੀਕ ਹੈ", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "ਗਲ", "Share" => "ਸਾਂਝਾ ਕਰੋ", "Password" => "ਪਾਸਵਰ", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index deb4b4c81c8..dc6e8d365b8 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Tak", "No" => "Nie", "Ok" => "OK", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Nie określono typu obiektu.", "Error" => "Błąd", "The app name is not specified." => "Nie określono nazwy aplikacji.", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index b25927ef237..5f22193d0d5 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "Não", "Ok" => "Ok", "Error loading message template: {error}" => "Erro no carregamento de modelo de mensagem: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "O tipo de objeto não foi especificado.", "Error" => "Erro", "The app name is not specified." => "O nome do app não foi especificado.", diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index 4554b64d405..f2dcf4ffd38 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -16,6 +16,10 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Erro a adicionar %s aos favoritos", "No categories selected for deletion." => "Nenhuma categoria seleccionada para eliminar.", "Error removing %s from favorites." => "Erro a remover %s dos favoritos.", +"No image or file provided" => "Não foi selecionado nenhum ficheiro para importar", +"Unknown filetype" => "Ficheiro desconhecido", +"Invalid image" => "Imagem inválida", +"No temporary profile picture available, try again" => "Foto temporária de perfil indisponível, tente novamente", "Sunday" => "Domingo", "Monday" => "Segunda", "Tuesday" => "Terça", @@ -51,6 +55,8 @@ $TRANSLATIONS = array( "Yes" => "Sim", "No" => "Não", "Ok" => "Ok", +"Error loading message template: {error}" => "Erro ao carregar o template: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "O tipo de objecto não foi especificado", "Error" => "Erro", "The app name is not specified." => "O nome da aplicação não foi especificado", diff --git a/core/l10n/ro.php b/core/l10n/ro.php index 8b274cb1409..5b0f5e6538d 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Da", "No" => "Nu", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Tipul obiectului nu este specificat.", "Error" => "Eroare", "The app name is not specified." => "Numele aplicației nu este specificat.", diff --git a/core/l10n/ru.php b/core/l10n/ru.php index 0fe2e860917..973f5f38bb7 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -2,6 +2,9 @@ $TRANSLATIONS = array( "%s shared »%s« with you" => "%s поделился »%s« с вами", "group" => "группа", +"Updated database" => "База данных обновлена", +"Updating filecache, this may take really long..." => "Обновление файлового кэша, это может занять некоторое время...", +"Updated filecache" => "Обновлен файловый кэш", "Category type not provided." => "Тип категории не предоставлен", "No category to add?" => "Нет категорий для добавления?", "This category already exists: %s" => "Эта категория уже существует: %s", @@ -10,6 +13,8 @@ $TRANSLATIONS = array( "Error adding %s to favorites." => "Ошибка добавления %s в избранное", "No categories selected for deletion." => "Нет категорий для удаления.", "Error removing %s from favorites." => "Ошибка удаления %s из избранного", +"Unknown filetype" => "Неизвестный тип файла", +"Invalid image" => "Изображение повреждено", "Sunday" => "Воскресенье", "Monday" => "Понедельник", "Tuesday" => "Вторник", @@ -45,6 +50,7 @@ $TRANSLATIONS = array( "Yes" => "Да", "No" => "Нет", "Ok" => "Ок", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Тип объекта не указан", "Error" => "Ошибка", "The app name is not specified." => "Имя приложения не указано", @@ -118,8 +124,8 @@ $TRANSLATIONS = array( "Data folder" => "Директория с данными", "Configure the database" => "Настройка базы данных", "will be used" => "будет использовано", -"Database user" => "Имя пользователя для базы данных", -"Database password" => "Пароль для базы данных", +"Database user" => "Пользователь базы данных", +"Database password" => "Пароль базы данных", "Database name" => "Название базы данных", "Database tablespace" => "Табличое пространство базы данных", "Database host" => "Хост базы данных", diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php index 184566b5f1c..6752352e344 100644 --- a/core/l10n/si_LK.php +++ b/core/l10n/si_LK.php @@ -37,6 +37,7 @@ $TRANSLATIONS = array( "Yes" => "ඔව්", "No" => "එපා", "Ok" => "හරි", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "දෝෂයක්", "Share" => "බෙදා හදා ගන්න", "Share with" => "බෙදාගන්න", diff --git a/core/l10n/sk.php b/core/l10n/sk.php index 7285020288b..50c3ecaf664 100644 --- a/core/l10n/sk.php +++ b/core/l10n/sk.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("","",""), "_%n hour ago_::_%n hours ago_" => array("","",""), "_%n day ago_::_%n days ago_" => array("","",""), -"_%n month ago_::_%n months ago_" => array("","","") +"_%n month ago_::_%n months ago_" => array("","",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","","") ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index f36445950a1..55451d45362 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Áno", "No" => "Nie", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Nešpecifikovaný typ objektu.", "Error" => "Chyba", "The app name is not specified." => "Nešpecifikované meno aplikácie.", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index e88b7a6fb5a..71a653dc627 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Yes" => "Da", "No" => "Ne", "Ok" => "V redu", +"_{count} file conflict_::_{count} file conflicts_" => array("","","",""), "The object type is not specified." => "Vrsta predmeta ni podana.", "Error" => "Napaka", "The app name is not specified." => "Ime programa ni podano.", diff --git a/core/l10n/sq.php b/core/l10n/sq.php index c8462573ffa..a3c9e5ed6e9 100644 --- a/core/l10n/sq.php +++ b/core/l10n/sq.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Po", "No" => "Jo", "Ok" => "Në rregull", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Nuk është specifikuar tipi i objektit.", "Error" => "Veprim i gabuar", "The app name is not specified." => "Nuk është specifikuar emri i app-it.", diff --git a/core/l10n/sr.php b/core/l10n/sr.php index 89c13c49254..fcf01301c71 100644 --- a/core/l10n/sr.php +++ b/core/l10n/sr.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "Yes" => "Да", "No" => "Не", "Ok" => "У реду", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Врста објекта није подешена.", "Error" => "Грешка", "The app name is not specified." => "Име програма није унето.", diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php index 62ed061ca06..756fdae939f 100644 --- a/core/l10n/sr@latin.php +++ b/core/l10n/sr@latin.php @@ -1,5 +1,13 @@ "Tip kategorije nije zadan.", +"No category to add?" => "Bez dodavanja kategorije?", +"This category already exists: %s" => "Kategorija već postoji: %s", +"Object type not provided." => "Tip objekta nije zadan.", +"%s ID not provided." => "%s ID nije zadan.", +"Error adding %s to favorites." => "Greška u dodavanju %s u omiljeno.", +"No categories selected for deletion." => "Kategorije za brisanje nisu izabrane.", +"Error removing %s from favorites." => "Greška u uklanjanju %s iz omiljeno.", "Sunday" => "Nedelja", "Monday" => "Ponedeljak", "Tuesday" => "Utorak", @@ -20,15 +28,65 @@ $TRANSLATIONS = array( "November" => "Novembar", "December" => "Decembar", "Settings" => "Podešavanja", +"seconds ago" => "Pre par sekundi", "_%n minute ago_::_%n minutes ago_" => array("","",""), "_%n hour ago_::_%n hours ago_" => array("","",""), +"today" => "Danas", +"yesterday" => "juče", "_%n day ago_::_%n days ago_" => array("","",""), +"last month" => "prošlog meseca", "_%n month ago_::_%n months ago_" => array("","",""), +"months ago" => "pre nekoliko meseci", +"last year" => "prošle godine", +"years ago" => "pre nekoliko godina", +"Choose" => "Izaberi", +"Yes" => "Da", +"No" => "Ne", +"Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"The object type is not specified." => "Tip objekta nije zadan.", +"Error" => "Greška", +"The app name is not specified." => "Ime aplikacije nije precizirano.", +"The required file {file} is not installed!" => "Potreban fajl {file} nije instaliran!", +"Shared" => "Deljeno", +"Share" => "Podeli", +"Error while sharing" => "Greška pri deljenju", +"Error while unsharing" => "Greška u uklanjanju deljenja", +"Error while changing permissions" => "Greška u promeni dozvola", +"Shared with you and the group {group} by {owner}" => "{owner} podelio sa Vama i grupom {group} ", +"Shared with you by {owner}" => "Sa vama podelio {owner}", +"Share with" => "Podeli sa", +"Share with link" => "Podeli koristei link", +"Password protect" => "Zaštita lozinkom", "Password" => "Lozinka", +"Email link to person" => "Pošalji link e-mailom", +"Send" => "Pošalji", +"Set expiration date" => "Datum isteka", +"Expiration date" => "Datum isteka", +"Share via email:" => "Deli putem e-maila", +"No people found" => "Nema pronađenih ljudi", +"Resharing is not allowed" => "Dalje deljenje nije dozvoljeno", +"Shared in {item} with {user}" => "Deljeno u {item} sa {user}", +"Unshare" => "Ukljoni deljenje", +"can edit" => "dozvoljene izmene", +"access control" => "kontrola pristupa", +"create" => "napravi", +"update" => "ažuriranje", +"delete" => "brisanje", +"share" => "deljenje", +"Password protected" => "Zaštćeno lozinkom", +"Error unsetting expiration date" => "Greška u uklanjanju datuma isteka", +"Error setting expiration date" => "Greška u postavljanju datuma isteka", +"Sending ..." => "Slanje...", +"Email sent" => "Email poslat", +"The update was unsuccessful. Please report this issue to the ownCloud community." => "Ažuriranje nije uspelo. Molimo obavestite ownCloud zajednicu.", +"The update was successful. Redirecting you to ownCloud now." => "Ažuriranje je uspelo. Prosleđivanje na ownCloud.", +"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", "Request reset" => "Zahtevaj resetovanje", "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", @@ -36,18 +94,28 @@ $TRANSLATIONS = array( "Apps" => "Programi", "Admin" => "Adninistracija", "Help" => "Pomoć", +"Access forbidden" => "Pristup zabranjen", "Cloud not found" => "Oblak nije nađen", +"Edit categories" => "Izmena kategorija", +"Add" => "Dodaj", +"Security Warning" => "Bezbednosno upozorenje", +"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Vaša PHP verzija je ranjiva na ", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nije dostupan generator slučajnog broja, molimo omogućite PHP OpenSSL ekstenziju.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez generatora slučajnog broja napadač može predvideti token za reset lozinke i preuzeti Vaš nalog.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.", "Create an admin account" => "Napravi administrativni nalog", "Advanced" => "Napredno", -"Data folder" => "Facikla podataka", +"Data folder" => "Fascikla podataka", "Configure the database" => "Podešavanje baze", "will be used" => "će biti korišćen", "Database user" => "Korisnik baze", "Database password" => "Lozinka baze", "Database name" => "Ime baze", +"Database tablespace" => "tablespace baze", "Database host" => "Domaćin baze", "Finish setup" => "Završi podešavanje", "Log out" => "Odjava", +"Automatic logon rejected!" => "Automatsko logovanje odbijeno!", "Lost your password?" => "Izgubili ste lozinku?", "remember" => "upamti" ); diff --git a/core/l10n/sv.php b/core/l10n/sv.php index b358fdc8a97..6d7cfa2dfcb 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Ja", "No" => "Nej", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Objekttypen är inte specificerad.", "Error" => "Fel", "The app name is not specified." => " Namnet på appen är inte specificerad.", diff --git a/core/l10n/sw_KE.php b/core/l10n/sw_KE.php index 93c8e33f3e2..ffcdde48d47 100644 --- a/core/l10n/sw_KE.php +++ b/core/l10n/sw_KE.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "_%n minute ago_::_%n minutes ago_" => array("",""), "_%n hour ago_::_%n hours ago_" => array("",""), "_%n day ago_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") +"_%n month ago_::_%n months ago_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("","") ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php index a1a286275eb..4dcb6188180 100644 --- a/core/l10n/ta_LK.php +++ b/core/l10n/ta_LK.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "Yes" => "ஆம்", "No" => "இல்லை", "Ok" => "சரி", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.", "Error" => "வழு", "The app name is not specified." => "செயலி பெயர் குறிப்பிடப்படவில்லை.", diff --git a/core/l10n/te.php b/core/l10n/te.php index 2e2bb8f8fe8..880c29bc2a1 100644 --- a/core/l10n/te.php +++ b/core/l10n/te.php @@ -35,6 +35,7 @@ $TRANSLATIONS = array( "Yes" => "అవును", "No" => "కాదు", "Ok" => "సరే", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "పొరపాటు", "Password" => "సంకేతపదం", "Send" => "పంపించు", diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php index 90fec245c95..1069ce9d8c5 100644 --- a/core/l10n/th_TH.php +++ b/core/l10n/th_TH.php @@ -43,6 +43,7 @@ $TRANSLATIONS = array( "Yes" => "ตกลง", "No" => "ไม่ตกลง", "Ok" => "ตกลง", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ", "Error" => "ข้อผิดพลาด", "The app name is not specified." => "ชื่อของแอปยังไม่ได้รับการระบุชื่อ", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index a4c80638d82..b3777e94bdc 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "Evet", "No" => "Hayır", "Ok" => "Tamam", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "Nesne türü belirtilmemiş.", "Error" => "Hata", "The app name is not specified." => "uygulama adı belirtilmedi.", diff --git a/core/l10n/ug.php b/core/l10n/ug.php index e77718233de..6298df31354 100644 --- a/core/l10n/ug.php +++ b/core/l10n/ug.php @@ -30,6 +30,7 @@ $TRANSLATIONS = array( "Yes" => "ھەئە", "No" => "ياق", "Ok" => "جەزملە", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "Error" => "خاتالىق", "Share" => "ھەمبەھىر", "Share with" => "ھەمبەھىر", diff --git a/core/l10n/uk.php b/core/l10n/uk.php index 8e74855dd08..71b1c8ba26e 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "Так", "No" => "Ні", "Ok" => "Ok", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), "The object type is not specified." => "Не визначено тип об'єкту.", "Error" => "Помилка", "The app name is not specified." => "Не визначено ім'я програми.", diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php index 96871a54d0b..5bb9255fe52 100644 --- a/core/l10n/ur_PK.php +++ b/core/l10n/ur_PK.php @@ -23,6 +23,7 @@ $TRANSLATIONS = array( "Yes" => "ہاں", "No" => "نہیں", "Ok" => "اوکے", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "Error" => "ایرر", "Error while sharing" => "شئیرنگ کے دوران ایرر", "Error while unsharing" => "شئیرنگ ختم کرنے کے دوران ایرر", diff --git a/core/l10n/vi.php b/core/l10n/vi.php index 1ccf03c0aaa..91f756e2663 100644 --- a/core/l10n/vi.php +++ b/core/l10n/vi.php @@ -44,6 +44,7 @@ $TRANSLATIONS = array( "Yes" => "Có", "No" => "Không", "Ok" => "Đồng ý", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "Loại đối tượng không được chỉ định.", "Error" => "Lỗi", "The app name is not specified." => "Tên ứng dụng không được chỉ định.", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index ce61618111a..471aa735c48 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "是", "No" => "否", "Ok" => "好", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "未指定对象类型。", "Error" => "错误", "The app name is not specified." => "未指定应用名称。", diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php index 8bfa1f58616..f8e9cc21762 100644 --- a/core/l10n/zh_HK.php +++ b/core/l10n/zh_HK.php @@ -31,6 +31,7 @@ $TRANSLATIONS = array( "Yes" => "Yes", "No" => "No", "Ok" => "OK", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "Error" => "錯誤", "Shared" => "已分享", "Share" => "分享", diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index a6e2588e0d7..0a9a9db7331 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -51,6 +51,7 @@ $TRANSLATIONS = array( "Yes" => "是", "No" => "否", "Ok" => "好", +"_{count} file conflict_::_{count} file conflicts_" => array(""), "The object type is not specified." => "未指定物件類型。", "Error" => "錯誤", "The app name is not specified." => "沒有指定 app 名稱。", diff --git a/l10n/ach/core.po b/l10n/ach/core.po index f61d3994eea..070293766e8 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ach/files.po b/l10n/ach/files.po index 1edc94cfa5f..b8a81660f4d 100644 --- a/l10n/ach/files.po +++ b/l10n/ach/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:39-0400\n" -"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po index 583ddc75694..591268ad387 100644 --- a/l10n/ach/settings.po +++ b/l10n/ach/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po index 67360d8c107..ba46eb4cfa6 100644 --- a/l10n/af_ZA/core.po +++ b/l10n/af_ZA/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "Instellings" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po index e02365d6370..1a0f6c3fbf7 100644 --- a/l10n/af_ZA/files.po +++ b/l10n/af_ZA/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po index ee1052086e9..1a474f8b038 100644 --- a/l10n/af_ZA/settings.po +++ b/l10n/af_ZA/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ar/core.po b/l10n/ar/core.po index 362057faca7..fd75a547f8b 100644 --- a/l10n/ar/core.po +++ b/l10n/ar/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,11 +190,11 @@ msgstr "كانون الاول" msgid "Settings" msgstr "إعدادات" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "منذ ثواني" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -204,7 +204,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -214,15 +214,15 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "اليوم" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "يوم أمس" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -232,11 +232,11 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "الشهر الماضي" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -246,15 +246,15 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "شهر مضى" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "السنةالماضية" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "سنة مضت" @@ -282,6 +282,50 @@ msgstr "موافق" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ar/files.po b/l10n/ar/files.po index 565d98c14c1..5e431360f96 100644 --- a/l10n/ar/files.po +++ b/l10n/ar/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: ibrahim_9090 \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "خطأ في الكتابة على القرص الصلب" msgid "Not enough storage available" msgstr "لا يوجد مساحة تخزينية كافية" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "عملية الرفع فشلت" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "مسار غير صحيح." @@ -87,76 +91,80 @@ msgstr "مسار غير صحيح." msgid "Files" msgstr "الملفات" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "لا توجد مساحة كافية" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "تم إلغاء عملية رفع الملفات ." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "عنوان ال URL لا يجوز أن يكون فارغا." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "تسمية ملف غير صالحة. استخدام الاسم \"shared\" محجوز بواسطة ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "خطأ" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "شارك" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "حذف بشكل دائم" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "إعادة تسميه" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "قيد الانتظار" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} موجود مسبقا" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "استبدال" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "اقترح إسم" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "إلغاء" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "استبدل {new_name} بـ {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "تراجع" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" @@ -166,7 +174,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" @@ -176,11 +184,11 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} و {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -190,53 +198,53 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "يتم تحميل الملفات" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "\".\" اسم ملف غير صحيح." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "اسم الملف لا يجوز أن يكون فارغا" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "اسم غير صحيح , الرموز '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "مساحتك التخزينية امتلأت تقريبا " -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "اسم" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "حجم" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "معدل" @@ -245,7 +253,7 @@ msgstr "معدل" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "رفع" @@ -281,65 +289,65 @@ msgstr "الحد الأقصى المسموح به لملفات ZIP" msgid "Save" msgstr "حفظ" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "جديد" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "ملف" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "مجلد" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "من رابط" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "حذف الملفات" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "إلغاء رفع الملفات" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "لا تملك صلاحيات الكتابة هنا." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "تحميل" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "إلغاء مشاركة" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "إلغاء" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "حجم الترفيع أعلى من المسموح" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "يرجى الانتظار , جاري فحص الملفات ." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "الفحص الحالي" diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po index d047380c94d..42761603ac6 100644 --- a/l10n/ar/settings.po +++ b/l10n/ar/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/be/core.po b/l10n/be/core.po index 7e415d6b9d2..9b8d51d2575 100644 --- a/l10n/be/core.po +++ b/l10n/be/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,11 +190,11 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -202,7 +202,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -210,15 +210,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -226,11 +226,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -238,15 +238,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -274,6 +274,48 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/be/files.po b/l10n/be/files.po index ef6881506f8..ebc97c0f97e 100644 --- a/l10n/be/files.po +++ b/l10n/be/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,76 +90,80 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" @@ -163,7 +171,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" @@ -171,11 +179,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -183,53 +191,53 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -238,7 +246,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -274,65 +282,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/be/settings.po b/l10n/be/settings.po index 211f77281ba..28e5d3884cb 100644 --- a/l10n/be/settings.po +++ b/l10n/be/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po index fa51807332d..4237a779982 100644 --- a/l10n/bg_BG/core.po +++ b/l10n/bg_BG/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "Декември" msgid "Settings" msgstr "Настройки" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "преди секунди" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "днес" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "вчера" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "последният месец" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "последната година" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "последните години" @@ -266,6 +266,46 @@ msgstr "Добре" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po index 69c221b386c..58667fa74a8 100644 --- a/l10n/bg_BG/files.po +++ b/l10n/bg_BG/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Възникна проблем при запис в диска" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Качването е неуспешно" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Невалидна директория." @@ -86,144 +90,148 @@ msgstr "Невалидна директория." msgid "Files" msgstr "Файлове" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Качването е спряно." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Грешка" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Споделяне" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Изтриване завинаги" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Преименуване" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Чакащо" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "препокриване" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "отказ" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "възтановяване" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Име" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Размер" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Променено" @@ -232,7 +240,7 @@ msgstr "Променено" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Качване" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "Запис" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ново" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Текстов файл" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Папка" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Спри качването" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Няма нищо тук. Качете нещо." -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Изтегляне" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Изтриване" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Файлът който сте избрали за качване е прекалено голям" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Файловете се претърсват, изчакайте." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po index 24ca5a353c2..215c0067174 100644 --- a/l10n/bg_BG/settings.po +++ b/l10n/bg_BG/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po index d42a8ce0459..9c545be3823 100644 --- a/l10n/bn_BD/core.po +++ b/l10n/bn_BD/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "ডিসেম্বর" msgid "Settings" msgstr "নিয়ামকসমূহ" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "সেকেন্ড পূর্বে" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "আজ" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "গতকাল" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "গত মাস" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "মাস পূর্বে" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "গত বছর" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "বছর পূর্বে" @@ -266,6 +266,46 @@ msgstr "তথাস্তু" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po index e2785070c36..10ce6739f11 100644 --- a/l10n/bn_BD/files.po +++ b/l10n/bn_BD/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "ডিস্কে লিখতে ব্যর্থ" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "ভুল ডিরেক্টরি" @@ -86,144 +90,148 @@ msgstr "ভুল ডিরেক্টরি" msgid "Files" msgstr "ফাইল" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "যথেষ্ঠ পরিমাণ স্থান নেই" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "আপলোড বাতিল করা হয়েছে।" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL ফাঁকা রাখা যাবে না।" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "সমস্যা" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "ভাগাভাগি কর" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "পূনঃনামকরণ" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "মুলতুবি" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} টি বিদ্যমান" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "প্রতিস্থাপন" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "নাম সুপারিশ করুন" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "বাতিল" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "ক্রিয়া প্রত্যাহার" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "টি একটি অননুমোদিত নাম।" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "ফাইলের নামটি ফাঁকা রাখা যাবে না।" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "নামটি সঠিক নয়, '\\', '/', '<', '>', ':', '\"', '|', '?' এবং '*' অনুমোদিত নয়।" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "রাম" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "আকার" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "পরিবর্তিত" @@ -232,7 +240,7 @@ msgstr "পরিবর্তিত" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "আপলোড" @@ -268,65 +276,65 @@ msgstr "ZIP ফাইলের ইনপুটের সর্বোচ্চ msgid "Save" msgstr "সংরক্ষণ" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "নতুন" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "টেক্সট ফাইল" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "ফোল্ডার" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr " লিংক থেকে" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "আপলোড বাতিল কর" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "এখানে কিছুই নেই। কিছু আপলোড করুন !" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "ডাউনলোড" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "ভাগাভাগি বাতিল " -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "মুছে" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "আপলোডের আকারটি অনেক বড়" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন " -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "বর্তমান স্ক্যানিং" diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po index e40fc9e7161..b36011a8a59 100644 --- a/l10n/bn_BD/settings.po +++ b/l10n/bn_BD/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/bs/core.po b/l10n/bs/core.po index b8e1e43613a..5b4df12a3c8 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,59 +190,59 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -270,6 +270,47 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/bs/files.po b/l10n/bs/files.po index 6c304b92899..f825923a72b 100644 --- a/l10n/bs/files.po +++ b/l10n/bs/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,147 +90,151 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Podijeli" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Ime" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Veličina" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -235,7 +243,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -271,65 +279,65 @@ msgstr "" msgid "Save" msgstr "Spasi" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Fasikla" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po index 00340035350..87fe921d452 100644 --- a/l10n/bs/settings.po +++ b/l10n/bs/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ca/core.po b/l10n/ca/core.po index 6295fd0d36a..b9bcb7573d3 100644 --- a/l10n/ca/core.po +++ b/l10n/ca/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:31+0000\n" -"Last-Translator: rogerc\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -192,55 +192,55 @@ msgstr "Desembre" msgid "Settings" msgstr "Configuració" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segons enrere" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "fa %n minut" msgstr[1] "fa %n minuts" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "fa %n hora" msgstr[1] "fa %n hores" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "avui" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ahir" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "fa %n dies" msgstr[1] "fa %n dies" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "el mes passat" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "fa %n mes" msgstr[1] "fa %n mesos" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "mesos enrere" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "l'any passat" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "anys enrere" @@ -268,6 +268,46 @@ msgstr "D'acord" msgid "Error loading message template: {error}" msgstr "Error en carregar la plantilla de missatge: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ca/files.po b/l10n/ca/files.po index ca6a5240892..173aeb30aca 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: rogerc\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,11 +76,15 @@ msgstr "Ha fallat en escriure al disc" msgid "Not enough storage available" msgstr "No hi ha prou espai disponible" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "La pujada ha fallat" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Directori no vàlid." @@ -88,144 +92,148 @@ msgstr "Directori no vàlid." msgid "Files" msgstr "Fitxers" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "No hi ha prou espai disponible" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "La pujada s'ha cancel·lat." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "La URL no pot ser buida" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Comparteix" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Esborra permanentment" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Reanomena" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendent" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} ja existeix" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "substitueix" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugereix un nom" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancel·la" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "s'ha substituït {old_name} per {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "desfés" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n carpeta" msgstr[1] "%n carpetes" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fitxer" msgstr[1] "%n fitxers" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} i {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Pujant %n fitxer" msgstr[1] "Pujant %n fitxers" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fitxers pujant" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' és un nom no vàlid per un fitxer." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "El nom del fitxer no pot ser buit." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nom" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Mida" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificat" @@ -234,7 +242,7 @@ msgstr "Modificat" msgid "%s could not be renamed" msgstr "%s no es pot canviar el nom" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Puja" @@ -270,65 +278,65 @@ msgstr "Mida màxima d'entrada per fitxers ZIP" msgid "Save" msgstr "Desa" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nou" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Fitxer de text" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Carpeta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Des d'enllaç" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Fitxers esborrats" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancel·la la pujada" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "No teniu permisos d'escriptura aquí." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Res per aquí. Pugeu alguna cosa!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Baixa" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Deixa de compartir" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Esborra" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "La pujada és massa gran" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "S'estan escanejant els fitxers, espereu" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Actualment escanejant" diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po index 27282ac4a97..0aafc8549f8 100644 --- a/l10n/ca/settings.po +++ b/l10n/ca/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index 9f985c26dfc..038c8c297c0 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 18:20+0000\n" -"Last-Translator: pstast \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -195,59 +195,59 @@ msgstr "Prosinec" msgid "Settings" msgstr "Nastavení" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "před pár vteřinami" -#: js/js.js:854 +#: js/js.js:867 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:855 +#: js/js.js:868 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:856 +#: js/js.js:869 msgid "today" msgstr "dnes" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "včera" -#: js/js.js:858 +#: js/js.js:871 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:859 +#: js/js.js:872 msgid "last month" msgstr "minulý měsíc" -#: js/js.js:860 +#: js/js.js:873 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:861 +#: js/js.js:874 msgid "months ago" msgstr "před měsíci" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "minulý rok" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "před lety" @@ -275,6 +275,47 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "Chyba při nahrávání šablony zprávy: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 92e790b8785..7ce4b330521 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: pstast \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -78,11 +78,15 @@ msgstr "Zápis na disk selhal" msgid "Not enough storage available" msgstr "Nedostatek dostupného úložného prostoru" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Odesílání selhalo" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Neplatný adresář" @@ -90,147 +94,151 @@ msgstr "Neplatný adresář" msgid "Files" msgstr "Soubory" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nedostatek volného místa" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Odesílání zrušeno." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL nemůže být prázdná." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Chyba" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Sdílet" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Trvale odstranit" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Přejmenovat" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Nevyřízené" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} již existuje" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "nahradit" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "navrhnout název" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "zrušit" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "nahrazeno {new_name} s {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "vrátit zpět" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n složka" msgstr[1] "%n složky" msgstr[2] "%n složek" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n soubor" msgstr[1] "%n soubory" msgstr[2] "%n souborů" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} a {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Nahrávám %n soubor" msgstr[1] "Nahrávám %n soubory" msgstr[2] "Nahrávám %n souborů" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "soubory se odesílají" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' je neplatným názvem souboru." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Název souboru nemůže být prázdný řetězec." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Název" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Velikost" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Upraveno" @@ -239,7 +247,7 @@ msgstr "Upraveno" msgid "%s could not be renamed" msgstr "%s nemůže být přejmenován" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Odeslat" @@ -275,65 +283,65 @@ msgstr "Maximální velikost vstupu pro ZIP soubory" msgid "Save" msgstr "Uložit" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nový" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textový soubor" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Složka" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Z odkazu" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Odstraněné soubory" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Zrušit odesílání" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nemáte zde práva zápisu." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Žádný obsah. Nahrajte něco." -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Stáhnout" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Zrušit sdílení" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Smazat" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Odesílaný soubor je příliš velký" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Soubory se prohledávají, prosím čekejte." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Aktuální prohledávání" diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index 971650d2c96..b979460916a 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -90,36 +90,32 @@ msgstr "Nelze aktualizovat aplikaci." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Nesprávné heslo" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Nebyl uveden uživatel" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn." -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Změna hesla se nezdařila" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po index fbafa1ed11d..986f5a871aa 100644 --- a/l10n/cy_GB/core.po +++ b/l10n/cy_GB/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,11 +191,11 @@ msgstr "Rhagfyr" msgid "Settings" msgstr "Gosodiadau" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "eiliad yn ôl" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -203,7 +203,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -211,15 +211,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "heddiw" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ddoe" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -227,11 +227,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "mis diwethaf" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -239,15 +239,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "misoedd yn ôl" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "y llynedd" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "blwyddyn yn ôl" @@ -275,6 +275,48 @@ msgstr "Iawn" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po index aa667889430..e2d27216bbb 100644 --- a/l10n/cy_GB/files.po +++ b/l10n/cy_GB/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Methwyd ysgrifennu i'r ddisg" msgid "Not enough storage available" msgstr "Dim digon o le storio ar gael" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Methwyd llwytho i fyny" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Cyfeiriadur annilys." @@ -86,76 +90,80 @@ msgstr "Cyfeiriadur annilys." msgid "Files" msgstr "Ffeiliau" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Dim digon o le ar gael" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Diddymwyd llwytho i fyny." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Does dim hawl cael URL gwag." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Gwall" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Rhannu" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Dileu'n barhaol" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Ailenwi" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "I ddod" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} yn bodoli'n barod" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "amnewid" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "awgrymu enw" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "diddymu" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "newidiwyd {new_name} yn lle {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "dadwneud" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" @@ -163,7 +171,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" @@ -171,11 +179,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -183,53 +191,53 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "ffeiliau'n llwytho i fyny" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "Mae '.' yn enw ffeil annilys." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Does dim hawl cael enw ffeil gwag." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Enw" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Maint" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Addaswyd" @@ -238,7 +246,7 @@ msgstr "Addaswyd" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Llwytho i fyny" @@ -274,65 +282,65 @@ msgstr "Maint mewnbynnu mwyaf ffeiliau ZIP" msgid "Save" msgstr "Cadw" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Newydd" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Ffeil destun" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Plygell" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Dolen o" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Ffeiliau ddilewyd" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Diddymu llwytho i fyny" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nid oes gennych hawliau ysgrifennu fan hyn." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Llwytho i lawr" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Dad-rannu" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Dileu" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Maint llwytho i fyny'n rhy fawr" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Arhoswch, mae ffeiliau'n cael eu sganio." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Sganio cyfredol" diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po index 93b67e8505f..6a1d7704d0f 100644 --- a/l10n/cy_GB/settings.po +++ b/l10n/cy_GB/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/da/core.po b/l10n/da/core.po index 534ae03e955..e1bdb36d528 100644 --- a/l10n/da/core.po +++ b/l10n/da/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -194,55 +194,55 @@ msgstr "December" msgid "Settings" msgstr "Indstillinger" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekunder siden" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut siden" msgstr[1] "%n minutter siden" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n time siden" msgstr[1] "%n timer siden" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "i dag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "i går" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dag siden" msgstr[1] "%n dage siden" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "sidste måned" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n måned siden" msgstr[1] "%n måneder siden" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "måneder siden" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "sidste år" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "år siden" @@ -270,6 +270,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/da/files.po b/l10n/da/files.po index 81e48316bec..b6cf95c8d9c 100644 --- a/l10n/da/files.po +++ b/l10n/da/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Sappe\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Fejl ved skrivning til disk." msgid "Not enough storage available" msgstr "Der er ikke nok plads til rådlighed" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Upload fejlede" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ugyldig mappe." @@ -89,144 +93,148 @@ msgstr "Ugyldig mappe." msgid "Files" msgstr "Filer" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "ikke nok tilgængelig ledig plads " -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload afbrudt." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URLen kan ikke være tom." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fejl" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Del" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Slet permanent" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Omdøb" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Afventer" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} eksisterer allerede" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "erstat" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "foreslå navn" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "fortryd" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "erstattede {new_name} med {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "fortryd" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mappe" msgstr[1] "%n mapper" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fil" msgstr[1] "%n filer" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} og {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Uploader %n fil" msgstr[1] "Uploader %n filer" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "uploader filer" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' er et ugyldigt filnavn." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Filnavnet kan ikke stå tomt." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. " -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Navn" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Størrelse" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Ændret" @@ -235,7 +243,7 @@ msgstr "Ændret" msgid "%s could not be renamed" msgstr "%s kunne ikke omdøbes" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Upload" @@ -271,65 +279,65 @@ msgstr "Maksimal størrelse på ZIP filer" msgid "Save" msgstr "Gem" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ny" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstfil" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mappe" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Fra link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Slettede filer" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Fortryd upload" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Du har ikke skriverettigheder her." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Her er tomt. Upload noget!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Download" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Fjern deling" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Slet" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload er for stor" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Filerne bliver indlæst, vent venligst." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Indlæser" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index 44feb2e8445..accacfac32a 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -112,11 +112,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/de/core.po b/l10n/de/core.po index 46627cf2e0f..0f23d0cd3fb 100644 --- a/l10n/de/core.po +++ b/l10n/de/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -198,55 +198,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Einstellungen" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "Heute" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "Gestern" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "Vor Monaten" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "Vor Jahren" @@ -274,6 +274,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/de/files.po b/l10n/de/files.po index 3e0c024b6cb..01786015647 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,11 +80,15 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Not enough storage available" msgstr "Nicht genug Speicher vorhanden." -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Hochladen fehlgeschlagen" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." @@ -92,144 +96,148 @@ msgstr "Ungültiges Verzeichnis." msgid "Files" msgstr "Dateien" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nicht genug Speicherplatz verfügbar" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fehler" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Teilen" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Endgültig löschen" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} ersetzt durch {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n Ordner" msgstr[1] "%n Ordner" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n Datei" msgstr[1] "%n Dateien" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} und {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hochgeladen" msgstr[1] "%n Dateien werden hochgeladen" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "Dateien werden hoch geladen" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ist kein gültiger Dateiname." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Der Dateiname darf nicht leer sein." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Dein Speicher ist fast voll ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind deine Dateien nach wie vor verschlüsselt. Bitte gehe zu deinen persönlichen Einstellungen, um deine Dateien zu entschlüsseln." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Name" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Größe" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Geändert" @@ -238,7 +246,7 @@ msgstr "Geändert" msgid "%s could not be renamed" msgstr "%s konnte nicht umbenannt werden" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Hochladen" @@ -274,65 +282,65 @@ msgstr "Maximale Größe für ZIP-Dateien" msgid "Save" msgstr "Speichern" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Neu" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textdatei" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Ordner" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Von einem Link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Gelöschte Dateien" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Upload abbrechen" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Du hast hier keine Schreib-Berechtigung." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Alles leer. Lade etwas hoch!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Herunterladen" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Freigabe aufheben" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Löschen" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Der Upload ist zu groß" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Scanne" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 312f288f6dc..4cf53d6658d 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -91,36 +91,32 @@ msgstr "Die App konnte nicht aktualisiert werden." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Falsches Passwort" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Keinen Benutzer übermittelt" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert." -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Passwort konnte nicht geändert werden" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po index 6812c21bb5a..0c8f3a25ae2 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -267,6 +267,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po index d3f9d2d4218..7c47140c843 100644 --- a/l10n/de_AT/files.po +++ b/l10n/de_AT/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po index d78892f1640..c39c070ed50 100644 --- a/l10n/de_AT/settings.po +++ b/l10n/de_AT/settings.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# I Robot , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" @@ -216,7 +213,7 @@ msgstr "" #: personal.php:45 personal.php:46 msgid "__language_name__" -msgstr "" +msgstr "Deutsch (Österreich)" #: templates/admin.php:15 msgid "Security Warning" diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po index 827bc1f7a69..cef773ced76 100644 --- a/l10n/de_CH/core.po +++ b/l10n/de_CH/core.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -199,55 +199,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Einstellungen" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "Heute" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "Gestern" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "Vor Monaten" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "Vor Jahren" @@ -275,6 +275,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po index bd65b087c35..0d4817bb295 100644 --- a/l10n/de_CH/files.po +++ b/l10n/de_CH/files.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -83,11 +83,15 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Not enough storage available" msgstr "Nicht genug Speicher vorhanden." -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Hochladen fehlgeschlagen" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." @@ -95,144 +99,148 @@ msgstr "Ungültiges Verzeichnis." msgid "Files" msgstr "Dateien" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes gross ist." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nicht genügend Speicherplatz verfügbar" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fehler" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Teilen" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Endgültig löschen" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} wurde ersetzt durch {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "%n Ordner" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "%n Dateien" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hochgeladen" msgstr[1] "%n Dateien werden hochgeladen" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "Dateien werden hoch geladen" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ist kein gültiger Dateiname." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Der Dateiname darf nicht leer sein." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Name" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Grösse" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Geändert" @@ -241,7 +249,7 @@ msgstr "Geändert" msgid "%s could not be renamed" msgstr "%s konnte nicht umbenannt werden" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Hochladen" @@ -277,65 +285,65 @@ msgstr "Maximale Grösse für ZIP-Dateien" msgid "Save" msgstr "Speichern" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Neu" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textdatei" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Ordner" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Von einem Link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Gelöschte Dateien" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Upload abbrechen" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Sie haben hier keine Schreib-Berechtigungen." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Alles leer. Laden Sie etwas hoch!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Herunterladen" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Freigabe aufheben" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Löschen" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Der Upload ist zu gross" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Scanne" diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po index d1623c88a23..745b7eec826 100644 --- a/l10n/de_CH/settings.po +++ b/l10n/de_CH/settings.po @@ -7,6 +7,7 @@ # a.tangemann , 2013 # FlorianScholz , 2013 # FlorianScholz , 2013 +# I Robot , 2013 # kabum , 2013 # Mario Siegmann , 2013 # Mirodin , 2013 @@ -15,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -117,11 +118,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" @@ -224,7 +221,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden" #: personal.php:45 personal.php:46 msgid "__language_name__" -msgstr "Deutsch (Förmlich: Sie)" +msgstr "Deutsch (Schweiz)" #: templates/admin.php:15 msgid "Security Warning" diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po index 522345b9263..a9bc9abea06 100644 --- a/l10n/de_DE/core.po +++ b/l10n/de_DE/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -198,55 +198,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Einstellungen" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "Gerade eben" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Vor %n Minute" msgstr[1] "Vor %n Minuten" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Vor %n Stunde" msgstr[1] "Vor %n Stunden" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "Heute" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "Gestern" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Vor %n Tag" msgstr[1] "Vor %n Tagen" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "Letzten Monat" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Vor %n Monat" msgstr[1] "Vor %n Monaten" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "Vor Monaten" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "Letztes Jahr" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "Vor Jahren" @@ -274,6 +274,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index e236b674b77..9e4d2a24388 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Mario Siegmann \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,11 +83,15 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Not enough storage available" msgstr "Nicht genug Speicher vorhanden." -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Hochladen fehlgeschlagen" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." @@ -95,144 +99,148 @@ msgstr "Ungültiges Verzeichnis." msgid "Files" msgstr "Dateien" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nicht genügend Speicherplatz verfügbar" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fehler" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Teilen" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Endgültig löschen" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ausstehend" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} existiert bereits" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Namen vorschlagen" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "abbrechen" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} wurde ersetzt durch {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "rückgängig machen" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n Ordner" msgstr[1] "%n Ordner" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n Datei" msgstr[1] "%n Dateien" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} und {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n Datei wird hoch geladen" msgstr[1] "%n Dateien werden hoch geladen" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "Dateien werden hoch geladen" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ist kein gültiger Dateiname." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Der Dateiname darf nicht leer sein." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Name" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Größe" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Geändert" @@ -241,7 +249,7 @@ msgstr "Geändert" msgid "%s could not be renamed" msgstr "%s konnte nicht umbenannt werden" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Hochladen" @@ -277,65 +285,65 @@ msgstr "Maximale Größe für ZIP-Dateien" msgid "Save" msgstr "Speichern" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Neu" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textdatei" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Ordner" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Von einem Link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Gelöschte Dateien" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Upload abbrechen" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Sie haben hier keine Schreib-Berechtigungen." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Alles leer. Laden Sie etwas hoch!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Herunterladen" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Freigabe aufheben" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Löschen" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Der Upload ist zu groß" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Scanne" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index bbcb8220fa1..3a889bcbca6 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -93,36 +93,32 @@ msgstr "Die App konnte nicht aktualisiert werden." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Falsches Passwort" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Keinen Benutzer übermittelt" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert." -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Passwort konnte nicht geändert werden" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/el/core.po b/l10n/el/core.po index f9d610d2032..c045d09efeb 100644 --- a/l10n/el/core.po +++ b/l10n/el/core.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -197,55 +197,55 @@ msgstr "Δεκέμβριος" msgid "Settings" msgstr "Ρυθμίσεις" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "δευτερόλεπτα πριν" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "σήμερα" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "χτες" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "τελευταίο μήνα" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "μήνες πριν" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "τελευταίο χρόνο" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "χρόνια πριν" @@ -273,6 +273,46 @@ msgstr "Οκ" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/el/files.po b/l10n/el/files.po index 24da73a436f..f6b7bcf82a4 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Αποτυχία εγγραφής στο δίσκο" msgid "Not enough storage available" msgstr "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Η μεταφόρτωση απέτυχε" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Μη έγκυρος φάκελος." @@ -89,144 +93,148 @@ msgstr "Μη έγκυρος φάκελος." msgid "Files" msgstr "Αρχεία" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Η αποστολή ακυρώθηκε." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Η URL δεν μπορεί να είναι κενή." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Σφάλμα" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Διαμοιρασμός" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Μόνιμη διαγραφή" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Μετονομασία" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Εκκρεμεί" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} υπάρχει ήδη" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "αντικατέστησε" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "συνιστώμενο όνομα" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ακύρωση" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "αντικαταστάθηκε το {new_name} με {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "αναίρεση" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n φάκελος" msgstr[1] "%n φάκελοι" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n αρχείο" msgstr[1] "%n αρχεία" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Ανέβασμα %n αρχείου" msgstr[1] "Ανέβασμα %n αρχείων" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "αρχεία ανεβαίνουν" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' είναι μη έγκυρο όνομα αρχείου." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Το όνομα αρχείου δεν μπορεί να είναι κενό." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Όνομα" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Μέγεθος" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Τροποποιήθηκε" @@ -235,7 +243,7 @@ msgstr "Τροποποιήθηκε" msgid "%s could not be renamed" msgstr "Αδυναμία μετονομασίας του %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Μεταφόρτωση" @@ -271,65 +279,65 @@ msgstr "Μέγιστο μέγεθος για αρχεία ZIP" msgid "Save" msgstr "Αποθήκευση" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Νέο" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Αρχείο κειμένου" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Φάκελος" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Από σύνδεσμο" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Διαγραμμένα αρχεία" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Ακύρωση αποστολής" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Δεν έχετε δικαιώματα εγγραφής εδώ." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Λήψη" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Σταμάτημα διαμοιρασμού" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Διαγραφή" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Πολύ μεγάλο αρχείο προς αποστολή" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Τρέχουσα ανίχνευση" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index 7b975e813ed..1e84a673d35 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -115,11 +115,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po index 14e0eb573ca..8f786dfe211 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -267,6 +267,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po index 5874adaf38d..ea57ff8382a 100644 --- a/l10n/en@pirate/files.po +++ b/l10n/en@pirate/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "Download" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po index 34070d5228f..df5539ce0c6 100644 --- a/l10n/en@pirate/settings.po +++ b/l10n/en@pirate/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po index e6d3d657379..7e5c1ed0791 100644 --- a/l10n/en_GB/core.po +++ b/l10n/en_GB/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 13:30+0000\n" -"Last-Translator: mnestis \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "December" msgid "Settings" msgstr "Settings" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "seconds ago" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minute ago" msgstr[1] "%n minutes ago" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n hour ago" msgstr[1] "%n hours ago" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "today" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "yesterday" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n day ago" msgstr[1] "%n days ago" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "last month" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n month ago" msgstr[1] "%n months ago" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "months ago" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "last year" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "years ago" @@ -267,6 +267,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "Error loading message template: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." @@ -449,7 +489,7 @@ msgstr "Request failed!
Did you make sure your email/username was correct?" #: lostpassword/templates/lostpassword.php:15 msgid "You will receive a link to reset your password via Email." -msgstr "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:18 templates/installation.php:51 #: templates/login.php:19 diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po index ee07f5bbe41..fe7922ffe9a 100644 --- a/l10n/en_GB/files.po +++ b/l10n/en_GB/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: mnestis \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Failed to write to disk" msgid "Not enough storage available" msgstr "Not enough storage available" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Invalid directory." @@ -87,144 +91,148 @@ msgstr "Invalid directory." msgid "Files" msgstr "Files" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Not enough space available" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload cancelled." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "File upload is in progress. Leaving the page now will cancel the upload." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL cannot be empty." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Share" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Delete permanently" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Rename" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pending" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} already exists" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "replace" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "suggest name" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancel" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "replaced {new_name} with {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "undo" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n folder" msgstr[1] "%n folders" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n file" msgstr[1] "%n files" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} and {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Uploading %n file" msgstr[1] "Uploading %n files" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "files uploading" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' is an invalid file name." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "File name cannot be empty." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Your storage is full, files can not be updated or synced anymore!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Your storage is almost full ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Your download is being prepared. This might take some time if the files are big." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Name" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Size" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modified" @@ -233,7 +241,7 @@ msgstr "Modified" msgid "%s could not be renamed" msgstr "%s could not be renamed" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Upload" @@ -269,65 +277,65 @@ msgstr "Maximum input size for ZIP files" msgid "Save" msgstr "Save" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "New" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Text file" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Folder" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "From link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Deleted files" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancel upload" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "You don’t have write permission here." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nothing in here. Upload something!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Download" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Unshare" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Delete" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload too large" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "The files you are trying to upload exceed the maximum size for file uploads on this server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Files are being scanned, please wait." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Current scanning" diff --git a/l10n/en_GB/files_external.po b/l10n/en_GB/files_external.po index fc51da0a011..6190c958520 100644 --- a/l10n/en_GB/files_external.po +++ b/l10n/en_GB/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-29 17:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-18 16:45+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po index 99cac4331f6..a0f4b32037f 100644 --- a/l10n/en_GB/files_sharing.po +++ b/l10n/en_GB/files_sharing.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:01+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-18 16:46+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po index ae821adafa1..6b87c1ddd49 100644 --- a/l10n/en_GB/files_trashbin.po +++ b/l10n/en_GB/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-29 17:10+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-18 16:48+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -44,24 +44,24 @@ msgstr "delete file permanently" msgid "Delete permanently" msgstr "Delete permanently" -#: js/trash.js:184 templates/index.php:17 +#: js/trash.js:190 templates/index.php:21 msgid "Name" msgstr "Name" -#: js/trash.js:185 templates/index.php:27 +#: js/trash.js:191 templates/index.php:31 msgid "Deleted" msgstr "Deleted" -#: js/trash.js:193 +#: js/trash.js:199 msgid "%n folder" msgid_plural "%n folders" -msgstr[0] "" +msgstr[0] "%n folder" msgstr[1] "%n folders" -#: js/trash.js:199 +#: js/trash.js:205 msgid "%n file" msgid_plural "%n files" -msgstr[0] "" +msgstr[0] "%n file" msgstr[1] "%n files" #: lib/trash.php:814 lib/trash.php:816 @@ -72,11 +72,11 @@ msgstr "restored" msgid "Nothing in here. Your trash bin is empty!" msgstr "Nothing in here. Your recycle bin is empty!" -#: templates/index.php:20 templates/index.php:22 +#: templates/index.php:24 templates/index.php:26 msgid "Restore" msgstr "Restore" -#: templates/index.php:30 templates/index.php:31 +#: templates/index.php:34 templates/index.php:35 msgid "Delete" msgstr "Delete" diff --git a/l10n/en_GB/files_versions.po b/l10n/en_GB/files_versions.po index e727185fa79..cc791b517d3 100644 --- a/l10n/en_GB/files_versions.po +++ b/l10n/en_GB/files_versions.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-29 17:10+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-18 16:49+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po index 27be15c7521..bcc1f4f64a0 100644 --- a/l10n/en_GB/settings.po +++ b/l10n/en_GB/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -87,36 +87,32 @@ msgstr "Couldn't update app." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Incorrect password" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "No user supplied" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Please provide an admin recovery password, otherwise all user data will be lost" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Incorrect admin recovery password. Please check the password and try again." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Back-end doesn't support password change, but the user's encryption key was successfully updated." -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Unable to change password" #: js/apps.js:43 msgid "Update to {appversion}" @@ -255,7 +251,7 @@ msgstr "Module 'fileinfo' missing" msgid "" "The PHP module 'fileinfo' is missing. We strongly recommend to enable this " "module to get best results with mime-type detection." -msgstr "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." +msgstr "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection." #: templates/admin.php:58 msgid "Locale not working" @@ -393,7 +389,7 @@ msgid "" "licensed under the AGPL." -msgstr "Developed by the ownCloud community, the source code is licensed under the AGPL." +msgstr "Developed by the ownCloud community, the source code is licensed under the AGPL." #: templates/apps.php:13 msgid "Add your App" diff --git a/l10n/en_GB/user_webdavauth.po b/l10n/en_GB/user_webdavauth.po index 210787a40fa..7688c63036a 100644 --- a/l10n/en_GB/user_webdavauth.po +++ b/l10n/en_GB/user_webdavauth.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:32-0400\n" -"PO-Revision-Date: 2013-08-29 16:40+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-18 16:43+0000\n" "Last-Translator: mnestis \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/eo/core.po b/l10n/eo/core.po index b3f65dc4fbc..8c3e0433831 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "Decembro" msgid "Settings" msgstr "Agordo" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekundoj antaŭe" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hodiaŭ" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "hieraŭ" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "lastamonate" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "monatoj antaŭe" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "lastajare" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "jaroj antaŭe" @@ -268,6 +268,46 @@ msgstr "Akcepti" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/eo/files.po b/l10n/eo/files.po index 74589468882..0f9a143e22a 100644 --- a/l10n/eo/files.po +++ b/l10n/eo/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Malsukcesis skribo al disko" msgid "Not enough storage available" msgstr "Ne haveblas sufiĉa memoro" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Alŝuto malsukcesis" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Nevalida dosierujo." @@ -87,144 +91,148 @@ msgstr "Nevalida dosierujo." msgid "Files" msgstr "Dosieroj" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ne haveblas sufiĉa spaco" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "La alŝuto nuliĝis." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL ne povas esti malplena." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Eraro" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Kunhavigi" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Forigi por ĉiam" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Alinomigi" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Traktotaj" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} jam ekzistas" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "anstataŭigi" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugesti nomon" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "nuligi" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "anstataŭiĝis {new_name} per {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "malfari" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "dosieroj estas alŝutataj" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ne estas valida dosiernomo." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Dosiernomo devas ne malpleni." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Via memoro preskaŭ plenas ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nomo" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Grando" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modifita" @@ -233,7 +241,7 @@ msgstr "Modifita" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Alŝuti" @@ -269,65 +277,65 @@ msgstr "Maksimuma enirgrando por ZIP-dosieroj" msgid "Save" msgstr "Konservi" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nova" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstodosiero" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dosierujo" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "El ligilo" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Forigitaj dosieroj" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Nuligi alŝuton" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Vi ne havas permeson skribi ĉi tie." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nenio estas ĉi tie. Alŝutu ion!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Elŝuti" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Malkunhavigi" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Forigi" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Alŝuto tro larĝa" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Dosieroj estas skanataj, bonvolu atendi." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Nuna skano" diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po index f773f8e97ae..d049887b7b2 100644 --- a/l10n/eo/settings.po +++ b/l10n/eo/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/es/core.po b/l10n/es/core.po index 8b73e83c205..1e83ffd6681 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -200,55 +200,55 @@ msgstr "Diciembre" msgid "Settings" msgstr "Ajustes" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segundos antes" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Hace %n minuto" msgstr[1] "Hace %n minutos" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Hace %n hora" msgstr[1] "Hace %n horas" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hoy" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ayer" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Hace %n día" msgstr[1] "Hace %n días" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "el mes pasado" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Hace %n mes" msgstr[1] "Hace %n meses" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "meses antes" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "el año pasado" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "años antes" @@ -276,6 +276,46 @@ msgstr "Aceptar" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/es/files.po b/l10n/es/files.po index e68841cb875..a4058e8958c 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-13 23:50+0000\n" -"Last-Translator: Korrosivo \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -80,11 +80,15 @@ msgstr "Falló al escribir al disco" msgid "Not enough storage available" msgstr "No hay suficiente espacio disponible" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Error en la subida" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Directorio inválido." @@ -92,144 +96,148 @@ msgstr "Directorio inválido." msgid "Files" msgstr "Archivos" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Incapaz de subir su archivo, es un directorio o tiene 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "No hay suficiente espacio disponible" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Subida cancelada." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "La URL no puede estar vacía." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nombre de carpeta invalido. El uso de \"Shared\" está reservado por ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Compartir" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Eliminar permanentemente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Renombrar" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendiente" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} ya existe" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "reemplazar" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugerir nombre" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "reemplazado {new_name} con {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "deshacer" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "%n carpetas" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "%n archivos" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} y {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Subiendo %n archivo" msgstr[1] "Subiendo %n archivos" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "subiendo archivos" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' no es un nombre de archivo válido." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "El nombre de archivo no puede estar vacío." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos " -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nombre" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamaño" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificado" @@ -238,7 +246,7 @@ msgstr "Modificado" msgid "%s could not be renamed" msgstr "%s no se pudo renombrar" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Subir" @@ -274,65 +282,65 @@ msgstr "Tamaño máximo para archivos ZIP de entrada" msgid "Save" msgstr "Guardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nuevo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Archivo de texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Carpeta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Desde enlace" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Archivos eliminados" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancelar subida" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "No tiene permisos de escritura aquí." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "No hay nada aquí. ¡Suba algo!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Descargar" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Dejar de compartir" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Eliminar" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Subida demasido grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Los archivos están siendo escaneados, por favor espere." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Escaneo actual" diff --git a/l10n/es/settings.po b/l10n/es/settings.po index e93338b73e9..f11743ea954 100644 --- a/l10n/es/settings.po +++ b/l10n/es/settings.po @@ -4,6 +4,7 @@ # # Translators: # Art O. Pal , 2013 +# asaez , 2013 # eadeprado , 2013 # ggam , 2013 # pablomillaquen , 2013 @@ -15,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -104,12 +105,12 @@ msgstr "" msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Por favor facilite una contraseña de recuperación de administrador, sino se perderán todos los datos de usuario" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo." #: changepassword/controller.php:87 msgid "" @@ -117,13 +118,9 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "No se ha podido cambiar la contraseña" #: js/apps.js:43 msgid "Update to {appversion}" @@ -171,7 +168,7 @@ msgstr "Actualizado" #: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Seleccionar una imagen de perfil" #: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." @@ -505,15 +502,15 @@ msgstr "Foto del perfil" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Subir nuevo" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Seleccionar nuevo desde Ficheros" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Borrar imagen" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." @@ -525,7 +522,7 @@ msgstr "Abortar" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Seleccionar como imagen de perfil" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index 570b13d5cca..dd3a48b0d1e 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "diciembre" msgid "Settings" msgstr "Configuración" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "Hace %n minuto" msgstr[1] "Hace %n minutos" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "Hace %n hora" msgstr[1] "Hace %n horas" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hoy" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ayer" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "Hace %n día" msgstr[1] "Hace %n días" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "el mes pasado" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "Hace %n mes" msgstr[1] "Hace %n meses" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "meses atrás" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "el año pasado" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "años atrás" @@ -267,6 +267,46 @@ msgstr "Aceptar" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index 68680594d18..f502ba71685 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: cnngimenez\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,11 +78,15 @@ msgstr "Error al escribir en el disco" msgid "Not enough storage available" msgstr "No hay suficiente almacenamiento" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Error al subir el archivo" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Directorio inválido." @@ -90,144 +94,148 @@ msgstr "Directorio inválido." msgid "Files" msgstr "Archivos" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "No hay suficiente espacio disponible" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "La subida fue cancelada" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "La URL no puede estar vacía" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nombre de directorio inválido. El uso de \"Shared\" está reservado por ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Compartir" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Borrar permanentemente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Cambiar nombre" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendientes" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} ya existe" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "reemplazar" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugerir nombre" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "se reemplazó {new_name} con {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "deshacer" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n carpeta" msgstr[1] "%n carpetas" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n archivo" msgstr[1] "%n archivos" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{carpetas} y {archivos}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Subiendo %n archivo" msgstr[1] "Subiendo %n archivos" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "Subiendo archivos" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' es un nombre de archivo inválido." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "El nombre del archivo no puede quedar vacío." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nombre" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamaño" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificado" @@ -236,7 +244,7 @@ msgstr "Modificado" msgid "%s could not be renamed" msgstr "No se pudo renombrar %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Subir" @@ -272,65 +280,65 @@ msgstr "Tamaño máximo para archivos ZIP de entrada" msgid "Save" msgstr "Guardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nuevo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Archivo de texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Carpeta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Desde enlace" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Archivos borrados" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancelar subida" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "No tenés permisos de escritura acá." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "No hay nada. ¡Subí contenido!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Descargar" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Dejar de compartir" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Borrar" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "El tamaño del archivo que querés subir es demasiado grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los archivos que intentás subir sobrepasan el tamaño máximo " -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Se están escaneando los archivos, por favor esperá." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Escaneo actual" diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po index 512b5a949f4..faf86eb4603 100644 --- a/l10n/es_AR/settings.po +++ b/l10n/es_AR/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -112,11 +112,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po index 9a6e9cbb095..d351beb1b75 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po index 0e1dc47804e..7405f7a77b6 100644 --- a/l10n/es_MX/files.po +++ b/l10n/es_MX/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:39-0400\n" -"PO-Revision-Date: 2013-09-07 07:27+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po index c0dcfcc0d5b..7b7e92dc23d 100644 --- a/l10n/es_MX/settings.po +++ b/l10n/es_MX/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po index eb1f23ddad0..b94690c975e 100644 --- a/l10n/et_EE/core.po +++ b/l10n/et_EE/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 08:20+0000\n" -"Last-Translator: pisike.sipelgas \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "Detsember" msgid "Settings" msgstr "Seaded" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekundit tagasi" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut tagasi" msgstr[1] "%n minutit tagasi" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n tund tagasi" msgstr[1] "%n tundi tagasi" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "täna" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "eile" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n päev tagasi" msgstr[1] "%n päeva tagasi" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "viimasel kuul" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n kuu tagasi" msgstr[1] "%n kuud tagasi" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "kuu tagasi" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "viimasel aastal" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "aastat tagasi" @@ -268,6 +268,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "Viga sõnumi malli laadimisel: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index 943c2186c0c..52bcf2de8f0 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: pisike.sipelgas \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -76,11 +76,15 @@ msgstr "Kettale kirjutamine ebaõnnestus" msgid "Not enough storage available" msgstr "Saadaval pole piisavalt ruumi" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Üleslaadimine ebaõnnestus" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Vigane kaust." @@ -88,144 +92,148 @@ msgstr "Vigane kaust." msgid "Files" msgstr "Failid" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Pole piisavalt ruumi" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Üleslaadimine tühistati." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL ei saa olla tühi." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Viga" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Jaga" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Kustuta jäädavalt" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Nimeta ümber" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ootel" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} on juba olemas" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "asenda" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "soovita nime" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "loobu" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "asendas nime {old_name} nimega {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "tagasi" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n kataloog" msgstr[1] "%n kataloogi" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fail" msgstr[1] "%n faili" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} ja {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laadin üles %n faili" msgstr[1] "Laadin üles %n faili" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "faili üleslaadimisel" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' on vigane failinimi." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Faili nimi ei saa olla tühi." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. " -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nimi" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Suurus" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Muudetud" @@ -234,7 +242,7 @@ msgstr "Muudetud" msgid "%s could not be renamed" msgstr "%s ümbernimetamine ebaõnnestus" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Lae üles" @@ -270,65 +278,65 @@ msgstr "Maksimaalne ZIP-faili sisestatava faili suurus" msgid "Save" msgstr "Salvesta" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Uus" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstifail" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Kaust" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Allikast" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Kustutatud failid" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Tühista üleslaadimine" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Siin puudvad sul kirjutamisõigused." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Siin pole midagi. Lae midagi üles!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Lae alla" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Lõpeta jagamine" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Kustuta" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Üleslaadimine on liiga suur" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Faile skannitakse, palun oota." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Praegune skannimine" diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index fce1cc2fbc0..72d666a7d0b 100644 --- a/l10n/et_EE/settings.po +++ b/l10n/et_EE/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -88,36 +88,32 @@ msgstr "Rakenduse uuendamine ebaõnnestus." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Vale parool" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Kasutajat ei sisestatud" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt." -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Ei suuda parooli muuta" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/eu/core.po b/l10n/eu/core.po index 6c943bef9ee..ccac1c7de4a 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "Abendua" msgid "Settings" msgstr "Ezarpenak" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segundu" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "orain dela minutu %n" msgstr[1] "orain dela %n minutu" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "orain dela ordu %n" msgstr[1] "orain dela %n ordu" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "gaur" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "atzo" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "orain dela egun %n" msgstr[1] "orain dela %n egun" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "joan den hilabetean" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "orain dela hilabete %n" msgstr[1] "orain dela %n hilabete" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "hilabete" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "joan den urtean" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "urte" @@ -268,6 +268,46 @@ msgstr "Ados" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/eu/files.po b/l10n/eu/files.po index d48f767a56a..46b992abc37 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -76,11 +76,15 @@ msgstr "Errore bat izan da diskoan idazterakoan" msgid "Not enough storage available" msgstr "Ez dago behar aina leku erabilgarri," -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "igotzeak huts egin du" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Baliogabeko karpeta." @@ -88,144 +92,148 @@ msgstr "Baliogabeko karpeta." msgid "Files" msgstr "Fitxategiak" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ez dago leku nahikorik." -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Igoera ezeztatuta" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URLa ezin da hutsik egon." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Errorea" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Elkarbanatu" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Ezabatu betirako" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Berrizendatu" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Zain" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} dagoeneko existitzen da" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ordeztu" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "aholkatu izena" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ezeztatu" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr " {new_name}-k {old_name} ordezkatu du" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "desegin" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "karpeta %n" msgstr[1] "%n karpeta" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "fitxategi %n" msgstr[1] "%n fitxategi" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Fitxategi %n igotzen" msgstr[1] "%n fitxategi igotzen" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fitxategiak igotzen" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ez da fitxategi izen baliogarria." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Fitxategi izena ezin da hutsa izan." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. " -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Izena" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamaina" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Aldatuta" @@ -234,7 +242,7 @@ msgstr "Aldatuta" msgid "%s could not be renamed" msgstr "%s ezin da berrizendatu" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Igo" @@ -270,65 +278,65 @@ msgstr "ZIP fitxategien gehienezko tamaina" msgid "Save" msgstr "Gorde" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Berria" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Testu fitxategia" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Karpeta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Estekatik" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Ezabatutako fitxategiak" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Ezeztatu igoera" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Ez duzu hemen idazteko baimenik." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ez dago ezer. Igo zerbait!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Deskargatu" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Ez elkarbanatu" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Ezabatu" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Igoera handiegia da" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Orain eskaneatzen ari da" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index fd516826967..fc5007d8579 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/fa/core.po b/l10n/fa/core.po index c0dfd2514b8..a4e9885b054 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,51 +191,51 @@ msgstr "دسامبر" msgid "Settings" msgstr "تنظیمات" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "ثانیه‌ها پیش" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "امروز" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "دیروز" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "ماه قبل" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "ماه‌های قبل" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "سال قبل" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "سال‌های قبل" @@ -263,6 +263,45 @@ msgstr "قبول" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/fa/files.po b/l10n/fa/files.po index 4c7fbe5528e..b6b078cb364 100644 --- a/l10n/fa/files.po +++ b/l10n/fa/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود" msgid "Not enough storage available" msgstr "فضای کافی در دسترس نیست" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "بارگزاری ناموفق بود" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "فهرست راهنما نامعتبر می باشد." @@ -87,141 +91,145 @@ msgstr "فهرست راهنما نامعتبر می باشد." msgid "Files" msgstr "پرونده‌ها" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "فضای کافی در دسترس نیست" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "بار گذاری لغو شد" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. " -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL نمی تواند خالی باشد." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "خطا" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "اشتراک‌گذاری" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "حذف قطعی" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "تغییرنام" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "در انتظار" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{نام _جدید} در حال حاضر وجود دارد." -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "جایگزین" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "پیشنهاد نام" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "لغو" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد." -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "بازگشت" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "بارگذاری فایل ها" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' یک نام پرونده نامعتبر است." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "نام پرونده نمی تواند خالی باشد." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "نام نامعتبر ، '\\', '/', '<', '>', ':', '\"', '|', '?' و '*' مجاز نمی باشند." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "نام" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "اندازه" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "تاریخ" @@ -230,7 +238,7 @@ msgstr "تاریخ" msgid "%s could not be renamed" msgstr "%s نمیتواند تغییر نام دهد." -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "بارگزاری" @@ -266,65 +274,65 @@ msgstr "حداکثرمقدار برای بار گزاری پرونده های ف msgid "Save" msgstr "ذخیره" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "جدید" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "فایل متنی" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "پوشه" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "از پیوند" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "فایل های حذف شده" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "متوقف کردن بار گذاری" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "شما اجازه ی نوشتن در اینجا را ندارید" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "اینجا هیچ چیز نیست." -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "دانلود" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "لغو اشتراک" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "حذف" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "بازرسی کنونی" diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po index 587c70ba4a9..7a3f31a7195 100644 --- a/l10n/fa/settings.po +++ b/l10n/fa/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po index 499d8b2d8d6..6eecad24ce9 100644 --- a/l10n/fi_FI/core.po +++ b/l10n/fi_FI/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: Jiri Grönroos \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "joulukuu" msgid "Settings" msgstr "Asetukset" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekuntia sitten" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuutti sitten" msgstr[1] "%n minuuttia sitten" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n tunti sitten" msgstr[1] "%n tuntia sitten" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "tänään" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "eilen" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n päivä sitten" msgstr[1] "%n päivää sitten" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "viime kuussa" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n kuukausi sitten" msgstr[1] "%n kuukautta sitten" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "kuukautta sitten" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "viime vuonna" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "vuotta sitten" @@ -268,6 +268,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index 34fe35c6ce9..cc0dfaf5c1f 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Jiri Grönroos \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Levylle kirjoitus epäonnistui" msgid "Not enough storage available" msgstr "Tallennustilaa ei ole riittävästi käytettävissä" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Lähetys epäonnistui" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Virheellinen kansio." @@ -87,144 +91,148 @@ msgstr "Virheellinen kansio." msgid "Files" msgstr "Tiedostot" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Tilaa ei ole riittävästi" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Lähetys peruttu." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Verkko-osoite ei voi olla tyhjä" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Virhe" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Jaa" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Poista pysyvästi" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Nimeä uudelleen" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Odottaa" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} on jo olemassa" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "korvaa" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "ehdota nimeä" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "peru" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "kumoa" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n kansio" msgstr[1] "%n kansiota" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n tiedosto" msgstr[1] "%n tiedostoa" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} ja {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Lähetetään %n tiedosto" msgstr[1] "Lähetetään %n tiedostoa" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' on virheellinen nimi tiedostolle." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Tiedoston nimi ei voi olla tyhjä." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nimi" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Koko" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Muokattu" @@ -233,7 +241,7 @@ msgstr "Muokattu" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Lähetä" @@ -269,65 +277,65 @@ msgstr "ZIP-tiedostojen enimmäiskoko" msgid "Save" msgstr "Tallenna" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Uusi" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstitiedosto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Kansio" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Linkistä" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Poistetut tiedostot" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Peru lähetys" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Tunnuksellasi ei ole kirjoitusoikeuksia tänne." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Lataa" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Peru jakaminen" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Poista" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Lähetettävä tiedosto on liian suuri" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Tiedostoja tarkistetaan, odota hetki." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Tämänhetkinen tutkinta" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index 60eda83c46b..2b9b270367a 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -87,7 +87,7 @@ msgstr "Sovelluksen päivitys epäonnistui." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Väärä salasana" #: changepassword/controller.php:42 msgid "No user supplied" @@ -110,13 +110,9 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Salasanan vaihto ei onnistunut" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index 7ba9214216e..011e6dbd15a 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -6,14 +6,15 @@ # Adalberto Rodrigues , 2013 # Christophe Lherieau , 2013 # msoko , 2013 +# ogre_sympathique , 2013 # plachance , 2013 # red0ne , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -97,15 +98,15 @@ msgstr "Erreur lors de la suppression de %s des favoris." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Aucune image ou fichier fourni" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Type de fichier inconnu" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Image invalide" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" @@ -195,55 +196,55 @@ msgstr "décembre" msgid "Settings" msgstr "Paramètres" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "il y a quelques secondes" -#: js/js.js:854 +#: js/js.js:867 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:855 +#: js/js.js:868 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:856 +#: js/js.js:869 msgid "today" msgstr "aujourd'hui" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "hier" -#: js/js.js:858 +#: js/js.js:871 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:859 +#: js/js.js:872 msgid "last month" msgstr "le mois dernier" -#: js/js.js:860 +#: js/js.js:873 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:861 +#: js/js.js:874 msgid "months ago" msgstr "il y a plusieurs mois" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "l'année dernière" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "il y a plusieurs années" @@ -253,7 +254,7 @@ msgstr "Choisir" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" -msgstr "" +msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}" #: js/oc-dialogs.js:172 msgid "Yes" @@ -269,6 +270,46 @@ msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" +msgstr "Erreur de chargement du modèle de message : {error}" + +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" msgstr "" #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 diff --git a/l10n/fr/files.po b/l10n/fr/files.po index f3e3767ce8b..fcbbbad254e 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: ogre_sympathique \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -78,11 +78,15 @@ msgstr "Erreur d'écriture sur le disque" msgid "Not enough storage available" msgstr "Plus assez d'espace de stockage disponible" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Échec de l'envoi" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Dossier invalide." @@ -90,144 +94,148 @@ msgstr "Dossier invalide." msgid "Files" msgstr "Fichiers" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Espace disponible insuffisant" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Envoi annulé." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "L'URL ne peut-être vide" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Erreur" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Partager" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Supprimer de façon définitive" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Renommer" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "En attente" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} existe déjà" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "remplacer" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Suggérer un nom" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "annuler" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} a été remplacé par {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "annuler" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n dossier" msgstr[1] "%n dossiers" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fichier" msgstr[1] "%n fichiers" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dir} et {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Téléversement de %n fichier" msgstr[1] "Téléversement de %n fichiers" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fichiers en cours d'envoi" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' n'est pas un nom de fichier valide." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Le nom de fichier ne peut être vide." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nom" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Taille" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modifié" @@ -236,7 +244,7 @@ msgstr "Modifié" msgid "%s could not be renamed" msgstr "%s ne peut être renommé" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Envoyer" @@ -272,65 +280,65 @@ msgstr "Taille maximale pour les fichiers ZIP" msgid "Save" msgstr "Sauvegarder" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nouveau" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Fichier texte" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dossier" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Depuis le lien" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Fichiers supprimés" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Annuler l'envoi" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Vous n'avez pas le droit d'écriture ici." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Télécharger" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Ne plus partager" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Supprimer" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Téléversement trop volumineux" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Les fichiers sont en cours d'analyse, veuillez patienter." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Analyse en cours" diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po index 547f24c0230..792ec310105 100644 --- a/l10n/fr/lib.po +++ b/l10n/fr/lib.po @@ -5,13 +5,14 @@ # Translators: # Christophe Lherieau , 2013 # Cyril Glapa , 2013 +# ogre_sympathique , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-19 13:10+0000\n" +"Last-Translator: ogre_sympathique \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" @@ -57,15 +58,15 @@ msgstr "Echec de la mise à niveau \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "" +msgstr "Les images de profil personnalisées ne fonctionnent pas encore avec le système de chiffrement." #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Type de fichier inconnu" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Image invalide" #: defaults.php:35 msgid "web services under your control" @@ -166,15 +167,15 @@ msgstr "Erreur d'authentification" msgid "Token expired. Please reload page." msgstr "La session a expiré. Veuillez recharger la page." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Fichiers" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Texte" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Images" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index 49cfd880244..529e2e8c356 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -7,13 +7,14 @@ # Christophe Lherieau , 2013 # lyly95, 2013 # Mystyle , 2013 +# ogre_sympathique , 2013 # red0ne , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -91,11 +92,11 @@ msgstr "Impossible de mettre à jour l'application" #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Mot de passe incorrect" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Aucun utilisateur fourni" #: changepassword/controller.php:74 msgid "" @@ -114,13 +115,9 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Impossible de modifier le mot de passe" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/gl/core.po b/l10n/gl/core.po index a4c485ede18..25a8ee333ff 100644 --- a/l10n/gl/core.po +++ b/l10n/gl/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: mbouzada \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "decembro" msgid "Settings" msgstr "Axustes" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "hai %n minuto" msgstr[1] "hai %n minutos" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "hai %n hora" msgstr[1] "hai %n horas" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hoxe" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "onte" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "hai %n día" msgstr[1] "hai %n días" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "último mes" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "hai %n mes" msgstr[1] "hai %n meses" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "meses atrás" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "último ano" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "anos atrás" @@ -267,6 +267,46 @@ msgstr "Aceptar" msgid "Error loading message template: {error}" msgstr "Produciuse un erro ao cargar o modelo da mensaxe: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/gl/files.po b/l10n/gl/files.po index f1ef8190bbc..45a9129ab2d 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: mbouzada \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Produciuse un erro ao escribir no disco" msgid "Not enough storage available" msgstr "Non hai espazo de almacenamento abondo" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Produciuse un fallou no envío" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "O directorio é incorrecto." @@ -87,144 +91,148 @@ msgstr "O directorio é incorrecto." msgid "Files" msgstr "Ficheiros" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "O espazo dispoñíbel é insuficiente" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Envío cancelado." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "O URL non pode quedar baleiro." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Erro" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Compartir" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Eliminar permanentemente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Renomear" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendentes" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "Xa existe un {new_name}" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "substituír" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "suxerir nome" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "substituír {new_name} por {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "desfacer" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n cartafol" msgstr[1] "%n cartafoles" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n ficheiro" msgstr[1] "%n ficheiros" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} e {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Cargando %n ficheiro" msgstr[1] "Cargando %n ficheiros" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "ficheiros enviándose" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "«.» é un nome de ficheiro incorrecto" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "O nome de ficheiro non pode estar baleiro" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*»." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nome" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamaño" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificado" @@ -233,7 +241,7 @@ msgstr "Modificado" msgid "%s could not be renamed" msgstr "%s non pode cambiar de nome" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Enviar" @@ -269,65 +277,65 @@ msgstr "Tamaño máximo de descarga para os ficheiros ZIP" msgid "Save" msgstr "Gardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Novo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Ficheiro de texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Cartafol" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Desde a ligazón" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Ficheiros eliminados" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancelar o envío" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Non ten permisos para escribir aquí." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Aquí non hai nada. Envíe algo." -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Descargar" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Deixar de compartir" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Eliminar" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Envío demasiado grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Estanse analizando os ficheiros. Agarde." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Análise actual" diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po index df5d5ec7294..8533d9c17c6 100644 --- a/l10n/gl/settings.po +++ b/l10n/gl/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -87,36 +87,32 @@ msgstr "Non foi posíbel actualizar o aplicativo." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Contrasinal incorrecto" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Non subministrado polo usuario" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente." -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Non é posíbel cambiar o contrasinal" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/he/core.po b/l10n/he/core.po index ecb35c7ac73..1f7da9c0253 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "דצמבר" msgid "Settings" msgstr "הגדרות" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "שניות" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "לפני %n דקה" msgstr[1] "לפני %n דקות" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "לפני %n שעה" msgstr[1] "לפני %n שעות" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "היום" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "אתמול" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "לפני %n יום" msgstr[1] "לפני %n ימים" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "חודש שעבר" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "לפני %n חודש" msgstr[1] "לפני %n חודשים" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "חודשים" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "שנה שעברה" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "שנים" @@ -268,6 +268,46 @@ msgstr "בסדר" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/he/files.po b/l10n/he/files.po index 653e107a6e2..15a0138955b 100644 --- a/l10n/he/files.po +++ b/l10n/he/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "הכתיבה לכונן נכשלה" msgid "Not enough storage available" msgstr "אין די שטח פנוי באחסון" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "ההעלאה נכשלה" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "תיקייה שגויה." @@ -87,144 +91,148 @@ msgstr "תיקייה שגויה." msgid "Files" msgstr "קבצים" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "ההעלאה בוטלה." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "קישור אינו יכול להיות ריק." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "שגיאה" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "שתף" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "מחק לצמיתות" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "שינוי שם" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "ממתין" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} כבר קיים" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "החלפה" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "הצעת שם" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ביטול" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} הוחלף ב־{old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "ביטול" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "קבצים בהעלאה" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "שם" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "גודל" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "זמן שינוי" @@ -233,7 +241,7 @@ msgstr "זמן שינוי" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "העלאה" @@ -269,65 +277,65 @@ msgstr "גודל הקלט המרבי לקובצי ZIP" msgid "Save" msgstr "שמירה" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "חדש" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "קובץ טקסט" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "תיקייה" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "מקישור" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "ביטול ההעלאה" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "הורדה" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "הסר שיתוף" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "מחיקה" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "העלאה גדולה מידי" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "הקבצים נסרקים, נא להמתין." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "הסריקה הנוכחית" diff --git a/l10n/he/settings.po b/l10n/he/settings.po index 275d36704f8..25d1901bcce 100644 --- a/l10n/he/settings.po +++ b/l10n/he/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/hi/core.po b/l10n/hi/core.po index 31d7caf5d3e..834b2c48eba 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 15:30+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "दिसम्बर" msgid "Settings" msgstr "सेटिंग्स" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -268,6 +268,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/hi/files.po b/l10n/hi/files.po index 1be595e8e63..f6fcb10b392 100644 --- a/l10n/hi/files.po +++ b/l10n/hi/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:46-0400\n" -"PO-Revision-Date: 2013-09-17 13:14+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:40 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:53 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:91 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:206 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:280 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:285 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:317 js/file-upload.js:333 js/files.js:528 js/files.js:566 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "त्रुटि" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "साझा करें" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:710 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:417 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:534 js/filelist.js:600 js/files.js:597 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:535 js/filelist.js:601 js/files.js:603 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:542 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:698 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:763 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:322 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:579 templates/index.php:61 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:580 templates/index.php:73 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:581 templates/index.php:75 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po index f54504cd727..fc8e5837c9c 100644 --- a/l10n/hi/settings.po +++ b/l10n/hi/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/hr/core.po b/l10n/hr/core.po index d8b8a3018c3..583405240bb 100644 --- a/l10n/hr/core.po +++ b/l10n/hr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,59 +190,59 @@ msgstr "Prosinac" msgid "Settings" msgstr "Postavke" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekundi prije" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "danas" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "jučer" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "prošli mjesec" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "mjeseci" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "prošlu godinu" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "godina" @@ -270,6 +270,47 @@ msgstr "U redu" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/hr/files.po b/l10n/hr/files.po index fad167ba7b8..3eab0bfde87 100644 --- a/l10n/hr/files.po +++ b/l10n/hr/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Neuspjelo pisanje na disk" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,147 +90,151 @@ msgstr "" msgid "Files" msgstr "Datoteke" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Slanje poništeno." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Greška" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Podijeli" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Promjeni ime" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "U tijeku" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "zamjeni" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "predloži ime" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "odustani" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "vrati" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "datoteke se učitavaju" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Ime" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Veličina" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Zadnja promjena" @@ -235,7 +243,7 @@ msgstr "Zadnja promjena" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Učitaj" @@ -271,65 +279,65 @@ msgstr "Maksimalna veličina za ZIP datoteke" msgid "Save" msgstr "Snimi" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "novo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "tekstualna datoteka" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "mapa" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Prekini upload" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nema ničega u ovoj mapi. Pošalji nešto!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Preuzimanje" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Makni djeljenje" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Obriši" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Prijenos je preobiman" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Datoteke se skeniraju, molimo pričekajte." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Trenutno skeniranje" diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po index db3bfe8145c..aec94bb5dfb 100644 --- a/l10n/hr/settings.po +++ b/l10n/hr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po index 18378d4b15d..9a7ab1014f3 100644 --- a/l10n/hu_HU/core.po +++ b/l10n/hu_HU/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "december" msgid "Settings" msgstr "Beállítások" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "pár másodperce" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "ma" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "tegnap" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "múlt hónapban" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "több hónapja" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "tavaly" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "több éve" @@ -268,6 +268,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index 7843881e215..51bd0806da3 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Nem sikerült a lemezre történő írás" msgid "Not enough storage available" msgstr "Nincs elég szabad hely." -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "A feltöltés nem sikerült" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Érvénytelen mappa." @@ -87,144 +91,148 @@ msgstr "Érvénytelen mappa." msgid "Files" msgstr "Fájlok" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nincs elég szabad hely" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "A feltöltést megszakítottuk." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Az URL nem lehet semmi." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Hiba" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Megosztás" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Végleges törlés" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Átnevezés" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Folyamatban" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} már létezik" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "írjuk fölül" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "legyen más neve" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "mégse" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} fájlt kicseréltük ezzel: {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "visszavonás" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fájl töltődik föl" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' fájlnév érvénytelen." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "A fájlnév nem lehet semmi." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "A tároló majdnem tele van ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Név" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Méret" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Módosítva" @@ -233,7 +241,7 @@ msgstr "Módosítva" msgid "%s could not be renamed" msgstr "%s átnevezése nem sikerült" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Feltöltés" @@ -269,65 +277,65 @@ msgstr "ZIP-fájlok maximális kiindulási mérete" msgid "Save" msgstr "Mentés" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Új" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Szövegfájl" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mappa" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Feltöltés linkről" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Törölt fájlok" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "A feltöltés megszakítása" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Itt nincs írásjoga." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Itt nincs semmi. Töltsön fel valamit!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Letöltés" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "A megosztás visszavonása" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Törlés" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "A feltöltés túl nagy" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "A fájllista ellenőrzése zajlik, kis türelmet!" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Ellenőrzés alatt" diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po index 7643899f6d9..7ef4a07d1ae 100644 --- a/l10n/hu_HU/settings.po +++ b/l10n/hu_HU/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -112,11 +112,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/hy/core.po b/l10n/hy/core.po index 3200bbb8534..cfc83cf7733 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "Դեկտեմբեր" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/hy/files.po b/l10n/hy/files.po index 6c477202b4d..46e6544393b 100644 --- a/l10n/hy/files.po +++ b/l10n/hy/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "Պահպանել" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "Բեռնել" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Ջնջել" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po index faf9956c067..ecc4b3e2788 100644 --- a/l10n/hy/settings.po +++ b/l10n/hy/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ia/core.po b/l10n/ia/core.po index 51ad0cc856f..5a048cfc144 100644 --- a/l10n/ia/core.po +++ b/l10n/ia/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "Decembre" msgid "Settings" msgstr "Configurationes" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ia/files.po b/l10n/ia/files.po index 391f76c987c..5244ffda625 100644 --- a/l10n/ia/files.po +++ b/l10n/ia/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "Files" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Compartir" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nomine" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Dimension" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificate" @@ -232,7 +240,7 @@ msgstr "Modificate" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Incargar" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "Salveguardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nove" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "File de texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dossier" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nihil hic. Incarga alcun cosa!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Discargar" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Deler" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Incargamento troppo longe" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po index b88c80f02cb..3097b240fc6 100644 --- a/l10n/ia/settings.po +++ b/l10n/ia/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/id/core.po b/l10n/id/core.po index 6330d1f9d2e..355807ff032 100644 --- a/l10n/id/core.po +++ b/l10n/id/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "Desember" msgid "Settings" msgstr "Setelan" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "beberapa detik yang lalu" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hari ini" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "kemarin" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "bulan kemarin" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "beberapa bulan lalu" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "tahun kemarin" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "beberapa tahun lalu" @@ -262,6 +262,45 @@ msgstr "Oke" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/id/files.po b/l10n/id/files.po index 2ce822890c6..dc0c2272b6b 100644 --- a/l10n/id/files.po +++ b/l10n/id/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Gagal menulis ke disk" msgid "Not enough storage available" msgstr "Ruang penyimpanan tidak mencukupi" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Direktori tidak valid." @@ -86,141 +90,145 @@ msgstr "Direktori tidak valid." msgid "Files" msgstr "Berkas" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ruang penyimpanan tidak mencukupi" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Pengunggahan dibatalkan." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL tidak boleh kosong" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Galat" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Bagikan" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Hapus secara permanen" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Ubah nama" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Menunggu" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} sudah ada" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ganti" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sarankan nama" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "batalkan" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "mengganti {new_name} dengan {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "urungkan" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "berkas diunggah" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' bukan nama berkas yang valid." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Nama berkas tidak boleh kosong." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nama" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Ukuran" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Dimodifikasi" @@ -229,7 +237,7 @@ msgstr "Dimodifikasi" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Unggah" @@ -265,65 +273,65 @@ msgstr "Ukuran masukan maksimum untuk berkas ZIP" msgid "Save" msgstr "Simpan" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Baru" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Berkas teks" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Folder" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Dari tautan" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Berkas yang dihapus" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Batal pengunggahan" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Anda tidak memiliki izin menulis di sini." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Unduh" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Batalkan berbagi" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Hapus" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Yang diunggah terlalu besar" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Berkas sedang dipindai, silakan tunggu." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Yang sedang dipindai" diff --git a/l10n/id/settings.po b/l10n/id/settings.po index 260df1998ac..7f2ef31f552 100644 --- a/l10n/id/settings.po +++ b/l10n/id/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/is/core.po b/l10n/is/core.po index a9ac3082288..e4e28667bae 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "Desember" msgid "Settings" msgstr "Stillingar" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sek." -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "í dag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "í gær" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "síðasta mánuði" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "mánuðir síðan" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "síðasta ári" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "einhverjum árum" @@ -267,6 +267,46 @@ msgstr "Í lagi" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/is/files.po b/l10n/is/files.po index b5561e49004..e53fa55a725 100644 --- a/l10n/is/files.po +++ b/l10n/is/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Tókst ekki að skrifa á disk" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ógild mappa." @@ -86,144 +90,148 @@ msgstr "Ógild mappa." msgid "Files" msgstr "Skrár" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ekki nægt pláss tiltækt" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Hætt við innsendingu." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Vefslóð má ekki vera tóm." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Villa" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Deila" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Endurskýra" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Bíður" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} er þegar til" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "yfirskrifa" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "stinga upp á nafni" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "hætta við" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "yfirskrifaði {new_name} með {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "afturkalla" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' er ekki leyfilegt nafn." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Nafn skráar má ekki vera tómt" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nafn" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Stærð" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Breytt" @@ -232,7 +240,7 @@ msgstr "Breytt" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Senda inn" @@ -268,65 +276,65 @@ msgstr "Hámarks inntaksstærð fyrir ZIP skrár" msgid "Save" msgstr "Vista" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nýtt" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Texta skrá" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mappa" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Af tengli" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Hætta við innsendingu" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ekkert hér. Settu eitthvað inn!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Niðurhal" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Hætta deilingu" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Eyða" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Innsend skrá er of stór" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Verið er að skima skrár, vinsamlegast hinkraðu." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Er að skima" diff --git a/l10n/is/settings.po b/l10n/is/settings.po index 033cdb62333..928b1480018 100644 --- a/l10n/is/settings.po +++ b/l10n/is/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/it/core.po b/l10n/it/core.po index ab95d67cc34..4189836997f 100644 --- a/l10n/it/core.po +++ b/l10n/it/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 22:30+0000\n" -"Last-Translator: polxmod \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -99,7 +99,7 @@ msgstr "Non è stata fornita alcun immagine o file" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "Tipo file sconosciuto" +msgstr "Tipo di file sconosciuto" #: avatar/controller.php:85 msgid "Invalid image" @@ -107,11 +107,11 @@ msgstr "Immagine non valida" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "Nessuna foto profilo temporanea disponibile, riprova" +msgstr "Nessuna foto di profilo temporanea disponibile, riprova" #: avatar/controller.php:135 msgid "No crop data provided" -msgstr "Raccolta dati non prevista" +msgstr "Dati di ritaglio non forniti" #: js/config.php:32 msgid "Sunday" @@ -193,55 +193,55 @@ msgstr "Dicembre" msgid "Settings" msgstr "Impostazioni" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "secondi fa" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuto fa" msgstr[1] "%n minuti fa" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n ora fa" msgstr[1] "%n ore fa" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "oggi" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ieri" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n giorno fa" msgstr[1] "%n giorni fa" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "mese scorso" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n mese fa" msgstr[1] "%n mesi fa" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "mesi fa" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "anno scorso" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "anni fa" @@ -269,6 +269,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "Errore durante il caricamento del modello di messaggio: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/it/files.po b/l10n/it/files.po index b97ed259366..cde611190ef 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Vincenzo Reale \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -76,11 +76,15 @@ msgstr "Scrittura su disco non riuscita" msgid "Not enough storage available" msgstr "Spazio di archiviazione insufficiente" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Caricamento non riuscito" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Cartella non valida." @@ -88,144 +92,148 @@ msgstr "Cartella non valida." msgid "Files" msgstr "File" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Spazio disponibile insufficiente" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Invio annullato" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "L'URL non può essere vuoto." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Errore" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Condividi" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Elimina definitivamente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Rinomina" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "In corso" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} esiste già" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "sostituisci" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "suggerisci nome" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "annulla" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "sostituito {new_name} con {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "annulla" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n cartella" msgstr[1] "%n cartelle" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n file" msgstr[1] "%n file" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} e {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Caricamento di %n file in corso" msgstr[1] "Caricamento di %n file in corso" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "caricamento file" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' non è un nome file valido." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Il nome del file non può essere vuoto." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nome" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Dimensione" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificato" @@ -234,7 +242,7 @@ msgstr "Modificato" msgid "%s could not be renamed" msgstr "%s non può essere rinominato" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Carica" @@ -270,65 +278,65 @@ msgstr "Dimensione massima per i file ZIP" msgid "Save" msgstr "Salva" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nuovo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "File di testo" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Cartella" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Da collegamento" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "File eliminati" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Annulla invio" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Qui non hai i permessi di scrittura." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Non c'è niente qui. Carica qualcosa!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Scarica" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Rimuovi condivisione" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Elimina" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Caricamento troppo grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Scansione dei file in corso, attendi" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Scansione corrente" diff --git a/l10n/it/lib.po b/l10n/it/lib.po index 8c5f8ced5fc..27b7c76e85e 100644 --- a/l10n/it/lib.po +++ b/l10n/it/lib.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 22:30+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-19 05:50+0000\n" "Last-Translator: Vincenzo Reale \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -58,11 +58,11 @@ msgstr "Aggiornamento non riuscito \"%s\"." #: avatar.php:56 msgid "Custom profile pictures don't work with encryption yet" -msgstr "Le immagini personalizzate del profilo non funzionano ancora con la cifratura." +msgstr "Le immagini personalizzate del profilo non funzionano ancora con la cifratura" #: avatar.php:64 msgid "Unknown filetype" -msgstr "Tipo file sconosciuto" +msgstr "Tipo di file sconosciuto" #: avatar.php:69 msgid "Invalid image" @@ -167,15 +167,15 @@ msgstr "Errore di autenticazione" msgid "Token expired. Please reload page." msgstr "Token scaduto. Ricarica la pagina." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "File" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Testo" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Immagini" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index 6988cc5e5f1..0e5f28a4d15 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -90,36 +90,32 @@ msgstr "Impossibile aggiornate l'applicazione." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Password errata" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Non è stato fornito alcun utente" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi." #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Password amministrativa di ripristino errata. Controlla la password e prova ancora." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente." -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Impossibile cambiare la password" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po index d6343899dc2..f72301efcb2 100644 --- a/l10n/ja_JP/core.po +++ b/l10n/ja_JP/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 05:50+0000\n" -"Last-Translator: Daisuke Deguchi \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -194,51 +194,51 @@ msgstr "12月" msgid "Settings" msgstr "設定" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "数秒前" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分前" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 時間後" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "今日" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "昨日" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n 日後" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "一月前" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n カ月後" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "月前" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "一年前" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "年前" @@ -266,6 +266,45 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "メッセージテンプレートの読み込みエラー: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index bcb42ff87e3..b712c8b95a9 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/files.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: tt yn \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -79,11 +79,15 @@ msgstr "ディスクへの書き込みに失敗しました" msgid "Not enough storage available" msgstr "ストレージに十分な空き容量がありません" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "アップロードに失敗" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "無効なディレクトリです。" @@ -91,141 +95,145 @@ msgstr "無効なディレクトリです。" msgid "Files" msgstr "ファイル" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "ディレクトリもしくは0バイトのファイルはアップロードできません" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "利用可能なスペースが十分にありません" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "アップロードはキャンセルされました。" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URLは空にできません。" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "エラー" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "共有" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "完全に削除する" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "名前の変更" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "中断" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} はすでに存在しています" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "置き換え" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "推奨名称" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "キャンセル" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{old_name} を {new_name} に置換" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "元に戻す" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n個のフォルダ" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n個のファイル" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} と {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n 個のファイルをアップロード中" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "ファイルをアップロード中" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' は無効なファイル名です。" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "ファイル名を空にすることはできません。" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "名前" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "サイズ" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "変更" @@ -234,7 +242,7 @@ msgstr "変更" msgid "%s could not be renamed" msgstr "%sの名前を変更できませんでした" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "アップロード" @@ -270,65 +278,65 @@ msgstr "ZIPファイルへの最大入力サイズ" msgid "Save" msgstr "保存" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "新規作成" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "テキストファイル" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "フォルダ" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "リンク" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "削除ファイル" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "アップロードをキャンセル" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "あなたには書き込み権限がありません。" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "ここには何もありません。何かアップロードしてください。" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "ダウンロード" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "共有解除" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "削除" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "アップロードには大きすぎます。" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "ファイルをスキャンしています、しばらくお待ちください。" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "スキャン中" diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po index cc0e31052f0..c9851b54dea 100644 --- a/l10n/ja_JP/settings.po +++ b/l10n/ja_JP/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -112,11 +112,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ka/core.po b/l10n/ka/core.po index 90fa5a82e67..e6a62126ccc 100644 --- a/l10n/ka/core.po +++ b/l10n/ka/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -190,51 +190,51 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "წამის წინ" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "დღეს" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "გუშინ" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ka/files.po b/l10n/ka/files.po index 8189ecec470..84143c9cd2a 100644 --- a/l10n/ka/files.po +++ b/l10n/ka/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "ფაილები" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "გადმოწერა" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po index 139784572dd..86e902ed4f4 100644 --- a/l10n/ka/settings.po +++ b/l10n/ka/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n" "MIME-Version: 1.0\n" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po index 64a9519691b..247c6892b0a 100644 --- a/l10n/ka_GE/core.po +++ b/l10n/ka_GE/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "დეკემბერი" msgid "Settings" msgstr "პარამეტრები" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "წამის წინ" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "დღეს" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "გუშინ" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "გასულ თვეში" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "თვის წინ" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "ბოლო წელს" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "წლის წინ" @@ -262,6 +262,45 @@ msgstr "დიახ" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po index 56fff63712a..a9e38b7176a 100644 --- a/l10n/ka_GE/files.po +++ b/l10n/ka_GE/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "შეცდომა დისკზე ჩაწერისას" msgid "Not enough storage available" msgstr "საცავში საკმარისი ადგილი არ არის" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "ატვირთვა ვერ განხორციელდა" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "დაუშვებელი დირექტორია." @@ -86,141 +90,145 @@ msgstr "დაუშვებელი დირექტორია." msgid "Files" msgstr "ფაილები" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "საკმარისი ადგილი არ არის" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "ატვირთვა შეჩერებულ იქნა." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL არ შეიძლება იყოს ცარიელი." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "შეცდომა" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "გაზიარება" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "სრულად წაშლა" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "გადარქმევა" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "მოცდის რეჟიმში" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} უკვე არსებობს" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "შეცვლა" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "სახელის შემოთავაზება" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "უარყოფა" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} შეცვლილია {old_name}–ით" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "დაბრუნება" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "ფაილები იტვირთება" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' არის დაუშვებელი ფაილის სახელი." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "ფაილის სახელი არ შეიძლება იყოს ცარიელი." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და '*' არ არის დაიშვებული." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "სახელი" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "ზომა" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "შეცვლილია" @@ -229,7 +237,7 @@ msgstr "შეცვლილია" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "ატვირთვა" @@ -265,65 +273,65 @@ msgstr "ZIP ფაილების მაქსიმუმ დასაშვ msgid "Save" msgstr "შენახვა" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "ახალი" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "ტექსტური ფაილი" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "საქაღალდე" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "მისამართიდან" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "წაშლილი ფაილები" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "ატვირთვის გაუქმება" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "თქვენ არ გაქვთ ჩაწერის უფლება აქ." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "აქ არაფერი არ არის. ატვირთე რამე!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "ჩამოტვირთვა" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "გაუზიარებადი" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "წაშლა" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "ასატვირთი ფაილი ძალიან დიდია" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "მიმდინარე სკანირება" diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po index 1b89539f148..fc613d4b9ee 100644 --- a/l10n/ka_GE/settings.po +++ b/l10n/ka_GE/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/km/core.po b/l10n/km/core.po index 1ae42ef89fb..437612ba9d9 100644 --- a/l10n/km/core.po +++ b/l10n/km/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/km/files.po b/l10n/km/files.po index 286dded35fb..a6b9b1775e1 100644 --- a/l10n/km/files.po +++ b/l10n/km/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-12 11:11+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/km/settings.po b/l10n/km/settings.po index bf3b7985905..c46c22d8be3 100644 --- a/l10n/km/settings.po +++ b/l10n/km/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/kn/core.po b/l10n/kn/core.po index 3ee58ec5314..c5dd4fc62ea 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/kn/files.po b/l10n/kn/files.po index 59f02ce2c4f..3297285e0e5 100644 --- a/l10n/kn/files.po +++ b/l10n/kn/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po index d2cde9a8833..21659f91a5b 100644 --- a/l10n/kn/settings.po +++ b/l10n/kn/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ko/core.po b/l10n/ko/core.po index f1c6f8bdfc4..b545b194b2e 100644 --- a/l10n/ko/core.po +++ b/l10n/ko/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,51 +192,51 @@ msgstr "12월" msgid "Settings" msgstr "설정" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "초 전" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n분 전 " -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n시간 전 " -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "오늘" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "어제" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n일 전 " -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "지난 달" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n달 전 " -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "개월 전" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "작년" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "년 전" @@ -264,6 +264,45 @@ msgstr "승락" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ko/files.po b/l10n/ko/files.po index 1ab0e4053ab..b2497ad3499 100644 --- a/l10n/ko/files.po +++ b/l10n/ko/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -76,11 +76,15 @@ msgstr "디스크에 쓰지 못했습니다" msgid "Not enough storage available" msgstr "저장소가 용량이 충분하지 않습니다." -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "업로드 실패" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "올바르지 않은 디렉터리입니다." @@ -88,141 +92,145 @@ msgstr "올바르지 않은 디렉터리입니다." msgid "Files" msgstr "파일" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "디렉터리 및 빈 파일은 업로드할 수 없습니다" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "여유 공간이 부족합니다" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "업로드가 취소되었습니다." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL을 입력해야 합니다." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "오류" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "공유" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "영원히 삭제" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "이름 바꾸기" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "대기 중" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name}이(가) 이미 존재함" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "바꾸기" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "이름 제안" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "취소" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{old_name}이(가) {new_name}(으)로 대체됨" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "되돌리기" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "파일 업로드중" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' 는 올바르지 않은 파일 이름 입니다." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "파일 이름이 비어 있을 수 없습니다." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "이름" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "크기" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "수정됨" @@ -231,7 +239,7 @@ msgstr "수정됨" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "업로드" @@ -267,65 +275,65 @@ msgstr "ZIP 파일 최대 크기" msgid "Save" msgstr "저장" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "새로 만들기" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "텍스트 파일" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "폴더" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "링크에서" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "파일 삭제됨" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "업로드 취소" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "당신은 여기에 쓰기를 할 수 있는 권한이 없습니다." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "내용이 없습니다. 업로드할 수 있습니다!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "다운로드" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "공유 해제" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "삭제" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "업로드한 파일이 너무 큼" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "파일을 검색하고 있습니다. 기다려 주십시오." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "현재 검색" diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po index 2633c90f1f2..8b3678ceec6 100644 --- a/l10n/ko/settings.po +++ b/l10n/ko/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po index b1c2c88c0dd..e29ae2d8757 100644 --- a/l10n/ku_IQ/core.po +++ b/l10n/ku_IQ/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "ده‌ستكاری" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po index 99b5793ea0d..9bb3b4faa5f 100644 --- a/l10n/ku_IQ/files.po +++ b/l10n/ku_IQ/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "هه‌ڵه" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "هاوبەشی کردن" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "ناو" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "بارکردن" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "پاشکه‌وتکردن" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "بوخچه" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "داگرتن" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po index ac9ed942628..6ea9fd128b0 100644 --- a/l10n/ku_IQ/settings.po +++ b/l10n/ku_IQ/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/lb/core.po b/l10n/lb/core.po index d3769f82671..d0e584ef604 100644 --- a/l10n/lb/core.po +++ b/l10n/lb/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "Dezember" msgid "Settings" msgstr "Astellungen" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "Sekonnen hir" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "haut" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "gëschter" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "leschte Mount" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "Méint hir" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "Lescht Joer" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "Joren hir" @@ -267,6 +267,46 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/lb/files.po b/l10n/lb/files.po index 94e9d242643..40727c4472d 100644 --- a/l10n/lb/files.po +++ b/l10n/lb/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Konnt net op den Disk schreiwen" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "Dateien" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Upload ofgebrach." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fehler" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Deelen" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ersetzen" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ofbriechen" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "réckgängeg man" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Numm" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Gréisst" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Geännert" @@ -232,7 +240,7 @@ msgstr "Geännert" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Eroplueden" @@ -268,65 +276,65 @@ msgstr "Maximal Gréisst fir ZIP Fichieren" msgid "Save" msgstr "Späicheren" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nei" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Text Fichier" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dossier" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Upload ofbriechen" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Hei ass näischt. Lued eppes rop!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Download" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Net méi deelen" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Läschen" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload ze grouss" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Fichieren gi gescannt, war weg." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Momentane Scan" diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po index 33639b80d3c..d09ca81058c 100644 --- a/l10n/lb/settings.po +++ b/l10n/lb/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po index 6c51d43a5d0..87de0d1aaac 100644 --- a/l10n/lt_LT/core.po +++ b/l10n/lt_LT/core.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 14:50+0000\n" -"Last-Translator: Liudas Ališauskas \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -194,59 +194,59 @@ msgstr "Gruodis" msgid "Settings" msgstr "Nustatymai" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "prieš sekundę" -#: js/js.js:854 +#: js/js.js:867 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:855 +#: js/js.js:868 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:856 +#: js/js.js:869 msgid "today" msgstr "šiandien" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "vakar" -#: js/js.js:858 +#: js/js.js:871 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:859 +#: js/js.js:872 msgid "last month" msgstr "praeitą mėnesį" -#: js/js.js:860 +#: js/js.js:873 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:861 +#: js/js.js:874 msgid "months ago" msgstr "prieš mėnesį" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "praeitais metais" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "prieš metus" @@ -274,6 +274,47 @@ msgstr "Gerai" msgid "Error loading message template: {error}" msgstr "Klaida įkeliant žinutės ruošinį: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po index 13c09972ea5..da69b0a419b 100644 --- a/l10n/lt_LT/files.po +++ b/l10n/lt_LT/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Liudas Ališauskas \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,11 +76,15 @@ msgstr "Nepavyko įrašyti į diską" msgid "Not enough storage available" msgstr "Nepakanka vietos serveryje" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Nusiuntimas nepavyko" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Neteisingas aplankas" @@ -88,147 +92,151 @@ msgstr "Neteisingas aplankas" msgid "Files" msgstr "Failai" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nepakanka vietos" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Įkėlimas atšauktas." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL negali būti tuščias." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Klaida" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Dalintis" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Ištrinti negrįžtamai" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Pervadinti" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Laukiantis" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} jau egzistuoja" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "pakeisti" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "pasiūlyti pavadinimą" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "atšaukti" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "pakeiskite {new_name} į {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "anuliuoti" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n aplankas" msgstr[1] "%n aplankai" msgstr[2] "%n aplankų" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n failas" msgstr[1] "%n failai" msgstr[2] "%n failų" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} ir {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Įkeliamas %n failas" msgstr[1] "Įkeliami %n failai" msgstr[2] "Įkeliama %n failų" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "įkeliami failai" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' yra neleidžiamas failo pavadinime." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Failo pavadinimas negali būti tuščias." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Jūsų visa vieta serveryje užimta" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Pavadinimas" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Dydis" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Pakeista" @@ -237,7 +245,7 @@ msgstr "Pakeista" msgid "%s could not be renamed" msgstr "%s negali būti pervadintas" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Įkelti" @@ -273,65 +281,65 @@ msgstr "Maksimalus ZIP archyvo failo dydis" msgid "Save" msgstr "Išsaugoti" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Naujas" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Teksto failas" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Katalogas" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Iš nuorodos" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Ištrinti failai" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Atšaukti siuntimą" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Jūs neturite rašymo leidimo." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Čia tuščia. Įkelkite ką nors!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Atsisiųsti" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Nebesidalinti" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Ištrinti" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Įkėlimui failas per didelis" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Skenuojami failai, prašome palaukti." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Šiuo metu skenuojama" diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po index d651f762750..14592409dd9 100644 --- a/l10n/lt_LT/settings.po +++ b/l10n/lt_LT/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -113,11 +113,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/lv/core.po b/l10n/lv/core.po index a0a14df889d..b4f827bd08f 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,59 +191,59 @@ msgstr "Decembris" msgid "Settings" msgstr "Iestatījumi" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekundes atpakaļ" -#: js/js.js:854 +#: js/js.js:867 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:855 +#: js/js.js:868 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:856 +#: js/js.js:869 msgid "today" msgstr "šodien" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "vakar" -#: js/js.js:858 +#: js/js.js:871 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:859 +#: js/js.js:872 msgid "last month" msgstr "pagājušajā mēnesī" -#: js/js.js:860 +#: js/js.js:873 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:861 +#: js/js.js:874 msgid "months ago" msgstr "mēnešus atpakaļ" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "gājušajā gadā" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "gadus atpakaļ" @@ -271,6 +271,47 @@ msgstr "Labi" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/lv/files.po b/l10n/lv/files.po index c173b6e331c..c2bec93c458 100644 --- a/l10n/lv/files.po +++ b/l10n/lv/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Neizdevās saglabāt diskā" msgid "Not enough storage available" msgstr "Nav pietiekami daudz vietas" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Neizdevās augšupielādēt" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Nederīga direktorija." @@ -87,147 +91,151 @@ msgstr "Nederīga direktorija." msgid "Files" msgstr "Datnes" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nepietiek brīvas vietas" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Augšupielāde ir atcelta." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL nevar būt tukšs." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Kļūda" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Dalīties" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Dzēst pavisam" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Pārsaukt" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Gaida savu kārtu" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} jau eksistē" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "aizvietot" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "ieteiktais nosaukums" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "atcelt" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "aizvietoja {new_name} ar {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "atsaukt" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mapes" msgstr[1] "%n mape" msgstr[2] "%n mapes" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n faili" msgstr[1] "%n fails" msgstr[2] "%n faili" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n" msgstr[1] "Augšupielāde %n failu" msgstr[2] "Augšupielāde %n failus" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fails augšupielādējas" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' ir nederīgs datnes nosaukums." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Datnes nosaukums nevar būt tukšs." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nosaukums" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Izmērs" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Mainīts" @@ -236,7 +244,7 @@ msgstr "Mainīts" msgid "%s could not be renamed" msgstr "%s nevar tikt pārsaukts" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Augšupielādēt" @@ -272,65 +280,65 @@ msgstr "Maksimālais ievades izmērs ZIP datnēm" msgid "Save" msgstr "Saglabāt" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Jauna" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Teksta datne" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mape" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "No saites" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Dzēstās datnes" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Atcelt augšupielādi" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Jums nav tiesību šeit rakstīt." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Lejupielādēt" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Pārtraukt dalīšanos" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Dzēst" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Datne ir par lielu, lai to augšupielādētu" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Šobrīd tiek caurskatīts" diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po index 9f3e95c7174..68f2e3c4db4 100644 --- a/l10n/lv/settings.po +++ b/l10n/lv/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/mk/core.po b/l10n/mk/core.po index 4adcd52cb6c..94b36d5a9c5 100644 --- a/l10n/mk/core.po +++ b/l10n/mk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "Декември" msgid "Settings" msgstr "Подесувања" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "пред секунди" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "денеска" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "вчера" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "минатиот месец" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "пред месеци" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "минатата година" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "пред години" @@ -266,6 +266,46 @@ msgstr "Во ред" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/mk/files.po b/l10n/mk/files.po index 3d0602225b0..a075f4d8f84 100644 --- a/l10n/mk/files.po +++ b/l10n/mk/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Неуспеав да запишам на диск" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "Датотеки" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Преземањето е прекинато." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Адресата неможе да биде празна." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Грешка" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Сподели" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Преименувај" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Чека" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} веќе постои" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "замени" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "предложи име" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "откажи" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "заменета {new_name} со {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "врати" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Име" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Големина" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Променето" @@ -232,7 +240,7 @@ msgstr "Променето" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Подигни" @@ -268,65 +276,65 @@ msgstr "Максимална големина за внес на ZIP датот msgid "Save" msgstr "Сними" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ново" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Текстуална датотека" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Папка" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Од врска" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Откажи прикачување" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Тука нема ништо. Снимете нешто!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Преземи" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Не споделувај" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Избриши" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Фајлот кој се вчитува е преголем" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Се скенираат датотеки, ве молам почекајте." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Моментално скенирам" diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po index 78ab0823ab6..d8573ecf006 100644 --- a/l10n/mk/settings.po +++ b/l10n/mk/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po index 18bc15e9ed7..8e7523af26c 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po index 6f1d3f841e5..5a25ca39107 100644 --- a/l10n/ml_IN/files.po +++ b/l10n/ml_IN/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po index eacef25fc6b..127decca790 100644 --- a/l10n/ml_IN/settings.po +++ b/l10n/ml_IN/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po index 18895df227e..38457ad1118 100644 --- a/l10n/ms_MY/core.po +++ b/l10n/ms_MY/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "Disember" msgid "Settings" msgstr "Tetapan" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po index 27f7519e9d3..05de8db4dcc 100644 --- a/l10n/ms_MY/files.po +++ b/l10n/ms_MY/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Gagal untuk disimpan" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "Fail-fail" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Muatnaik dibatalkan." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Ralat" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Kongsi" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Dalam proses" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ganti" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "Batal" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nama" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Saiz" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Dimodifikasi" @@ -229,7 +237,7 @@ msgstr "Dimodifikasi" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Muat naik" @@ -265,65 +273,65 @@ msgstr "Saiz maksimum input untuk fail ZIP" msgid "Save" msgstr "Simpan" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Baru" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Fail teks" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Folder" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Batal muat naik" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Tiada apa-apa di sini. Muat naik sesuatu!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Muat turun" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Padam" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Muatnaik terlalu besar" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Fail sedang diimbas, harap bersabar." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Imbasan semasa" diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po index f4ab52b45c1..c144cf2096c 100644 --- a/l10n/ms_MY/settings.po +++ b/l10n/ms_MY/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po index 3732fcec7ab..d66c528d963 100644 --- a/l10n/my_MM/core.po +++ b/l10n/my_MM/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "ဒီဇင်ဘာ" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "စက္ကန့်အနည်းငယ်က" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "ယနေ့" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "မနေ့က" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "ပြီးခဲ့သောလ" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "မနှစ်က" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "နှစ် အရင်က" @@ -262,6 +262,45 @@ msgstr "အိုကေ" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po index 65da5b18778..a143e196594 100644 --- a/l10n/my_MM/files.po +++ b/l10n/my_MM/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "ဖိုင်များ" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "ဒေါင်းလုတ်" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po index f8cd38d9c5e..144af1c4211 100644 --- a/l10n/my_MM/settings.po +++ b/l10n/my_MM/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po index 74f64d6762b..7d6a9bedeb1 100644 --- a/l10n/nb_NO/core.po +++ b/l10n/nb_NO/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,55 +191,55 @@ msgstr "Desember" msgid "Settings" msgstr "Innstillinger" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekunder siden" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "i dag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "i går" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "forrige måned" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "måneder siden" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "forrige år" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "år siden" @@ -267,6 +267,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po index 318d4d445a5..e5f3ebc6c84 100644 --- a/l10n/nb_NO/files.po +++ b/l10n/nb_NO/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Klarte ikke å skrive til disk" msgid "Not enough storage available" msgstr "Ikke nok lagringsplass" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Opplasting feilet" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ugyldig katalog." @@ -89,144 +93,148 @@ msgstr "Ugyldig katalog." msgid "Files" msgstr "Filer" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ikke nok lagringsplass" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Opplasting avbrutt." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL-en kan ikke være tom." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Feil" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Del" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Slett permanent" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Gi nytt navn" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ventende" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} finnes allerede" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "erstatt" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "foreslå navn" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "erstattet {new_name} med {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "angre" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mappe" msgstr[1] "%n mapper" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fil" msgstr[1] "%n filer" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laster opp %n fil" msgstr[1] "Laster opp %n filer" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "filer lastes opp" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' er et ugyldig filnavn." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Filnavn kan ikke være tomt." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Navn" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Størrelse" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Endret" @@ -235,7 +243,7 @@ msgstr "Endret" msgid "%s could not be renamed" msgstr "Kunne ikke gi nytt navn til %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Last opp" @@ -271,65 +279,65 @@ msgstr "Maksimal størrelse på ZIP-filer" msgid "Save" msgstr "Lagre" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ny" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstfil" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mappe" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Fra link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Slettet filer" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Avbryt opplasting" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Du har ikke skrivetilgang her." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ingenting her. Last opp noe!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Last ned" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Avslutt deling" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Slett" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Filen er for stor" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filene du prøver å laste opp er for store for å laste opp til denne serveren." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Skanner filer, vennligst vent." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Pågående skanning" diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po index 55c24f51b9d..fe0d19856af 100644 --- a/l10n/nb_NO/settings.po +++ b/l10n/nb_NO/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ne/core.po b/l10n/ne/core.po index 10549b66bad..52425ae2ab0 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ne/files.po b/l10n/ne/files.po index 16ee2747372..99b4c542210 100644 --- a/l10n/ne/files.po +++ b/l10n/ne/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po index 0a5f4dc015a..855bab38ba2 100644 --- a/l10n/ne/settings.po +++ b/l10n/ne/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index 42fe772e224..9b6abbaf29c 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: André Koot \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -193,55 +193,55 @@ msgstr "december" msgid "Settings" msgstr "Instellingen" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "seconden geleden" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "%n minuten geleden" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "%n uur geleden" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "vandaag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "gisteren" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "%n dagen geleden" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "vorige maand" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "%n maanden geleden" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "maanden geleden" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "vorig jaar" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "jaar geleden" @@ -269,6 +269,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "Fout bij laden berichtensjabloon: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/nl/files.po b/l10n/nl/files.po index e8546df4ad2..68d1ce8e06b 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: kwillems \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -76,11 +76,15 @@ msgstr "Schrijven naar schijf mislukt" msgid "Not enough storage available" msgstr "Niet genoeg opslagruimte beschikbaar" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Upload mislukt" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ongeldige directory." @@ -88,144 +92,148 @@ msgstr "Ongeldige directory." msgid "Files" msgstr "Bestanden" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Niet genoeg ruimte beschikbaar" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Uploaden geannuleerd." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL kan niet leeg zijn." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fout" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Delen" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Verwijder definitief" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Hernoem" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "In behandeling" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} bestaat al" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "vervang" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Stel een naam voor" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "annuleren" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "verving {new_name} met {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "ongedaan maken" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "%n mappen" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "%n bestanden" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} en {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n bestand aan het uploaden" msgstr[1] "%n bestanden aan het uploaden" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "bestanden aan het uploaden" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' is een ongeldige bestandsnaam." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Bestandsnaam kan niet leeg zijn." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Naam" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Grootte" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Aangepast" @@ -234,7 +242,7 @@ msgstr "Aangepast" msgid "%s could not be renamed" msgstr "%s kon niet worden hernoemd" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Uploaden" @@ -270,65 +278,65 @@ msgstr "Maximale grootte voor ZIP bestanden" msgid "Save" msgstr "Bewaren" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nieuw" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekstbestand" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Map" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Vanaf link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Verwijderde bestanden" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Upload afbreken" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "U hebt hier geen schrijfpermissies." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Er bevindt zich hier niets. Upload een bestand!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Downloaden" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Stop met delen" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Verwijder" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload is te groot" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Bestanden worden gescand, even wachten." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Er wordt gescand" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 1baf2c7cab2..68edba7080a 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -113,11 +113,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index 87a27da4b85..42a5e395e01 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -193,55 +193,55 @@ msgstr "Desember" msgid "Settings" msgstr "Innstillingar" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekund sidan" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minutt sidan" msgstr[1] "%n minutt sidan" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n time sidan" msgstr[1] "%n timar sidan" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "i dag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "i går" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dag sidan" msgstr[1] "%n dagar sidan" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "førre månad" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n månad sidan" msgstr[1] "%n månadar sidan" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "månadar sidan" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "i fjor" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "år sidan" @@ -269,6 +269,46 @@ msgstr "Greitt" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po index 049246c47e1..0573ecf2951 100644 --- a/l10n/nn_NO/files.po +++ b/l10n/nn_NO/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: unhammer \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,11 +76,15 @@ msgstr "Klarte ikkje skriva til disk" msgid "Not enough storage available" msgstr "Ikkje nok lagringsplass tilgjengeleg" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Feil ved opplasting" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Ugyldig mappe." @@ -88,144 +92,148 @@ msgstr "Ugyldig mappe." msgid "Files" msgstr "Filer" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Ikkje nok lagringsplass tilgjengeleg" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Opplasting avbroten." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Nettadressa kan ikkje vera tom." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Feil" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Del" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Slett for godt" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Endra namn" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Under vegs" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} finst allereie" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "byt ut" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "føreslå namn" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "bytte ut {new_name} med {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "angre" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mappe" msgstr[1] "%n mapper" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fil" msgstr[1] "%n filer" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} og {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Lastar opp %n fil" msgstr[1] "Lastar opp %n filer" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "filer lastar opp" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "«.» er eit ugyldig filnamn." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Filnamnet kan ikkje vera tomt." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Lagringa di er nesten full ({usedSpacePercent} %)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Namn" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Storleik" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Endra" @@ -234,7 +242,7 @@ msgstr "Endra" msgid "%s could not be renamed" msgstr "Klarte ikkje å omdøypa på %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Last opp" @@ -270,65 +278,65 @@ msgstr "Maksimal storleik for ZIP-filer" msgid "Save" msgstr "Lagre" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ny" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tekst fil" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mappe" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Frå lenkje" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Sletta filer" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Avbryt opplasting" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Du har ikkje skriverettar her." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ingenting her. Last noko opp!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Last ned" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Udel" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Slett" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "For stor opplasting" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Skannar filer, ver venleg og vent." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Køyrande skanning" diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po index 8fa98b0bea8..6100216bbda 100644 --- a/l10n/nn_NO/settings.po +++ b/l10n/nn_NO/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -112,11 +112,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po index 27d872844d4..e50801d30ba 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/nqo/files.po b/l10n/nqo/files.po index ee3f40afbc4..4749e89f264 100644 --- a/l10n/nqo/files.po +++ b/l10n/nqo/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:39-0400\n" -"PO-Revision-Date: 2013-09-07 07:28+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po index 4c9ef40f604..aafbac399b0 100644 --- a/l10n/nqo/settings.po +++ b/l10n/nqo/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/oc/core.po b/l10n/oc/core.po index 42aeba0c189..91003bba794 100644 --- a/l10n/oc/core.po +++ b/l10n/oc/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "Decembre" msgid "Settings" msgstr "Configuracion" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segonda a" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "uèi" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ièr" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "mes passat" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "meses a" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "an passat" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "ans a" @@ -266,6 +266,46 @@ msgstr "D'accòrdi" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/oc/files.po b/l10n/oc/files.po index 1630f022556..df81825fe3f 100644 --- a/l10n/oc/files.po +++ b/l10n/oc/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "L'escriptura sul disc a fracassat" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "Fichièrs" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Amontcargar anullat." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. " -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Error" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Parteja" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Torna nomenar" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Al esperar" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "remplaça" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "nom prepausat" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "anulla" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "defar" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fichièrs al amontcargar" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nom" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Talha" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificat" @@ -232,7 +240,7 @@ msgstr "Modificat" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Amontcarga" @@ -268,65 +276,65 @@ msgstr "Talha maximum de dintrada per fichièrs ZIP" msgid "Save" msgstr "Enregistra" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nòu" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Fichièr de tèxte" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dorsièr" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr " Anulla l'amontcargar" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Pas res dedins. Amontcarga qualquaren" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Avalcarga" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Pas partejador" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Escafa" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Amontcargament tròp gròs" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Los fiichièrs son a èsser explorats, " -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Exploracion en cors" diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po index ed8d2ec20a2..bd0c36692d2 100644 --- a/l10n/oc/settings.po +++ b/l10n/oc/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/pa/core.po b/l10n/pa/core.po index 695b684902f..a7fc0e1e131 100644 --- a/l10n/pa/core.po +++ b/l10n/pa/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:14+0000\n" -"Last-Translator: A S Alam \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -191,55 +191,55 @@ msgstr "ਦਸੰਬਰ" msgid "Settings" msgstr "ਸੈਟਿੰਗ" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "ਅੱਜ" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ਕੱਲ੍ਹ" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "ਪਿਛਲੇ ਮਹੀਨੇ" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "ਮਹੀਨੇ ਪਹਿਲਾਂ" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "ਪਿਛਲੇ ਸਾਲ" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ" @@ -267,6 +267,46 @@ msgstr "ਠੀਕ ਹੈ" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/pa/files.po b/l10n/pa/files.po index 54e0656a991..93b8cdfacd0 100644 --- a/l10n/pa/files.po +++ b/l10n/pa/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:46-0400\n" -"PO-Revision-Date: 2013-09-17 13:20+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "ਅੱਪਲੋਡ ਫੇਲ੍ਹ ਹੈ" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "ਫਾਇਲਾਂ" -#: js/file-upload.js:40 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:53 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:91 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:206 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:280 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:285 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:317 js/file-upload.js:333 js/files.js:528 js/files.js:566 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "ਗਲਤੀ" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "ਸਾਂਝਾ ਕਰੋ" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "ਨਾਂ ਬਦਲੋ" -#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:710 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:417 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "undo" msgstr "ਵਾਪਸ" -#: js/filelist.js:534 js/filelist.js:600 js/files.js:597 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:535 js/filelist.js:601 js/files.js:603 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:542 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:698 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:763 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:322 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:579 templates/index.php:61 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:580 templates/index.php:73 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:581 templates/index.php:75 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po index 66a45889956..8095ea1076f 100644 --- a/l10n/pa/settings.po +++ b/l10n/pa/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index 7e3a4dd2baa..1e9839e6f69 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,59 +192,59 @@ msgstr "Grudzień" msgid "Settings" msgstr "Ustawienia" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekund temu" -#: js/js.js:854 +#: js/js.js:867 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:855 +#: js/js.js:868 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:856 +#: js/js.js:869 msgid "today" msgstr "dziś" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "wczoraj" -#: js/js.js:858 +#: js/js.js:871 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:859 +#: js/js.js:872 msgid "last month" msgstr "w zeszłym miesiącu" -#: js/js.js:860 +#: js/js.js:873 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:861 +#: js/js.js:874 msgid "months ago" msgstr "miesięcy temu" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "w zeszłym roku" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "lat temu" @@ -272,6 +272,47 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/pl/files.po b/l10n/pl/files.po index 780faa39bcc..b94335006bb 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Cyryl Sochacki \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Błąd zapisu na dysk" msgid "Not enough storage available" msgstr "Za mało dostępnego miejsca" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Wysyłanie nie powiodło się" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Zła ścieżka." @@ -89,147 +93,151 @@ msgstr "Zła ścieżka." msgid "Files" msgstr "Pliki" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Za mało miejsca" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Wczytywanie anulowane." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL nie może być pusty." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Błąd" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Udostępnij" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Trwale usuń" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Zmień nazwę" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Oczekujące" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} już istnieje" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "zastąp" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "zasugeruj nazwę" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "anuluj" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "zastąpiono {new_name} przez {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "cofnij" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n katalog" msgstr[1] "%n katalogi" msgstr[2] "%n katalogów" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n plik" msgstr[1] "%n pliki" msgstr[2] "%n plików" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{katalogi} and {pliki}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Wysyłanie %n pliku" msgstr[1] "Wysyłanie %n plików" msgstr[2] "Wysyłanie %n plików" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "pliki wczytane" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "„.” jest nieprawidłową nazwą pliku." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Nazwa pliku nie może być pusta." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nazwa" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Rozmiar" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modyfikacja" @@ -238,7 +246,7 @@ msgstr "Modyfikacja" msgid "%s could not be renamed" msgstr "%s nie można zmienić nazwy" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Wyślij" @@ -274,65 +282,65 @@ msgstr "Maksymalna wielkość pliku wejściowego ZIP " msgid "Save" msgstr "Zapisz" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nowy" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Plik tekstowy" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Folder" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Z odnośnika" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Pliki usunięte" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Anuluj wysyłanie" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nie masz uprawnień do zapisu w tym miejscu." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Pusto. Wyślij coś!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Pobierz" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Zatrzymaj współdzielenie" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Usuń" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Ładowany plik jest za duży" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Skanowanie plików, proszę czekać." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Aktualnie skanowane" diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po index ae9f4924213..5b5e435ef1c 100644 --- a/l10n/pl/settings.po +++ b/l10n/pl/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po index ad96fabaeba..06857800f33 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-17 13:05+0000\n" -"Last-Translator: Flávio Veras \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "dezembro" msgid "Settings" msgstr "Ajustes" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "segundos atrás" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] " ha %n minuto" msgstr[1] "ha %n minutos" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "ha %n hora" msgstr[1] "ha %n horas" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hoje" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ontem" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "ha %n dia" msgstr[1] "ha %n dias" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "último mês" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "ha %n mês" msgstr[1] "ha %n meses" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "meses atrás" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "último ano" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "anos atrás" @@ -268,6 +268,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "Erro no carregamento de modelo de mensagem: {error}" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index b38bee5e902..d9d4aaf18f5 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Flávio Veras \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Falha ao escrever no disco" msgid "Not enough storage available" msgstr "Espaço de armazenamento insuficiente" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Falha no envio" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Diretório inválido." @@ -89,144 +93,148 @@ msgstr "Diretório inválido." msgid "Files" msgstr "Arquivos" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Espaço de armazenamento insuficiente" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Envio cancelado." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL não pode ficar em branco" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Erro" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Compartilhar" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Excluir permanentemente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Renomear" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendente" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} já existe" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "substituir" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugerir nome" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "Substituído {old_name} por {new_name} " -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "desfazer" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n pasta" msgstr[1] "%n pastas" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n arquivo" msgstr[1] "%n arquivos" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} e {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Enviando %n arquivo" msgstr[1] "Enviando %n arquivos" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "enviando arquivos" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' é um nome de arquivo inválido." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "O nome do arquivo não pode estar vazio." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nome" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamanho" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificado" @@ -235,7 +243,7 @@ msgstr "Modificado" msgid "%s could not be renamed" msgstr "%s não pode ser renomeado" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Upload" @@ -271,65 +279,65 @@ msgstr "Tamanho máximo para arquivo ZIP" msgid "Save" msgstr "Guardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Novo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Arquivo texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Pasta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Do link" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Arquivos apagados" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancelar upload" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Você não possui permissão de escrita aqui." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nada aqui.Carrege alguma coisa!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Baixar" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Descompartilhar" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Excluir" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload muito grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Arquivos sendo escaneados, por favor aguarde." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Scanning atual" diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po index bfd40a0f931..c8608696d61 100644 --- a/l10n/pt_BR/settings.po +++ b/l10n/pt_BR/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -88,36 +88,32 @@ msgstr "Não foi possível atualizar a app." #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Senha errada" #: changepassword/controller.php:42 msgid "No user supplied" -msgstr "" +msgstr "Nenhum usuário fornecido" #: changepassword/controller.php:74 msgid "" "Please provide an admin recovery password, otherwise all user data will be " "lost" -msgstr "" +msgstr "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente." #: changepassword/controller.php:87 msgid "" "Back-end doesn't support password change, but the users encryption key was " "successfully updated." -msgstr "" +msgstr "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso...." -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Impossível modificar senha" #: js/apps.js:43 msgid "Update to {appversion}" diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po index b355ad56e02..d0a28fbf406 100644 --- a/l10n/pt_PT/core.po +++ b/l10n/pt_PT/core.po @@ -6,13 +6,14 @@ # Bruno Martins , 2013 # bmgmatias , 2013 # Mouxy , 2013 +# Gontxi , 2013 # Helder Meneses , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -96,19 +97,19 @@ msgstr "Erro a remover %s dos favoritos." #: avatar/controller.php:62 msgid "No image or file provided" -msgstr "" +msgstr "Não foi selecionado nenhum ficheiro para importar" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Ficheiro desconhecido" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Imagem inválida" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" -msgstr "" +msgstr "Foto temporária de perfil indisponível, tente novamente" #: avatar/controller.php:135 msgid "No crop data provided" @@ -194,55 +195,55 @@ msgstr "Dezembro" msgid "Settings" msgstr "Configurações" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "Minutos atrás" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minuto atrás" msgstr[1] "%n minutos atrás" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n hora atrás" msgstr[1] "%n horas atrás" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hoje" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ontem" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dia atrás" msgstr[1] "%n dias atrás" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "ultímo mês" -#: js/js.js:860 +#: js/js.js:873 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:861 +#: js/js.js:874 msgid "months ago" msgstr "meses atrás" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "ano passado" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "anos atrás" @@ -268,6 +269,46 @@ msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" +msgstr "Erro ao carregar o template: {error}" + +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" msgstr "" #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index 7bd460d366b..7a359872888 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Helder Meneses \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Falhou a escrita no disco" msgid "Not enough storage available" msgstr "Não há espaço suficiente em disco" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Carregamento falhou" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Directório Inválido" @@ -89,144 +93,148 @@ msgstr "Directório Inválido" msgid "Files" msgstr "Ficheiros" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Espaço em disco insuficiente!" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Envio cancelado." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "O URL não pode estar vazio." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Erro" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Partilhar" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Eliminar permanentemente" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Renomear" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pendente" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "O nome {new_name} já existe" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "substituir" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugira um nome" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "cancelar" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "substituido {new_name} por {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "desfazer" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n pasta" msgstr[1] "%n pastas" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n ficheiro" msgstr[1] "%n ficheiros" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} e {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "A carregar %n ficheiro" msgstr[1] "A carregar %n ficheiros" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "A enviar os ficheiros" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' não é um nome de ficheiro válido!" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "O nome do ficheiro não pode estar vazio." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nome" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Tamanho" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificado" @@ -235,7 +243,7 @@ msgstr "Modificado" msgid "%s could not be renamed" msgstr "%s não pode ser renomeada" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Carregar" @@ -271,65 +279,65 @@ msgstr "Tamanho máximo para ficheiros ZIP" msgid "Save" msgstr "Guardar" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Novo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Ficheiro de texto" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Pasta" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Da ligação" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Ficheiros eliminados" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Cancelar envio" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Não tem permissões de escrita aqui." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Vazio. Envie alguma coisa!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Transferir" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Deixar de partilhar" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Eliminar" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Upload muito grande" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Os ficheiros estão a ser analisados, por favor aguarde." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Análise actual" diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po index a71bf023222..937940f9572 100644 --- a/l10n/pt_PT/lib.po +++ b/l10n/pt_PT/lib.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-19 18:40+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" @@ -60,11 +60,11 @@ msgstr "" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Ficheiro desconhecido" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Imagem inválida" #: defaults.php:35 msgid "web services under your control" @@ -165,15 +165,15 @@ msgstr "Erro na autenticação" msgid "Token expired. Please reload page." msgstr "O token expirou. Por favor recarregue a página." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Ficheiros" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Texto" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Imagens" diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po index 240d92edaf7..f171929bbc3 100644 --- a/l10n/pt_PT/settings.po +++ b/l10n/pt_PT/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -113,11 +113,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" @@ -517,7 +513,7 @@ msgstr "" #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Abortar" #: templates/personal.php:98 msgid "Choose as profile image" diff --git a/l10n/ro/core.po b/l10n/ro/core.po index 171346b912a..db5393d90c5 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -194,59 +194,59 @@ msgstr "Decembrie" msgid "Settings" msgstr "Setări" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "secunde în urmă" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "astăzi" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ieri" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "ultima lună" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "luni în urmă" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "ultimul an" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "ani în urmă" @@ -274,6 +274,47 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ro/files.po b/l10n/ro/files.po index 0ac14ca3c91..e40c8605cfc 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: inaina \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,11 +78,15 @@ msgstr "Eroare la scrierea discului" msgid "Not enough storage available" msgstr "Nu este suficient spațiu disponibil" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Încărcarea a eșuat" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "registru invalid." @@ -90,147 +94,151 @@ msgstr "registru invalid." msgid "Files" msgstr "Fișiere" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "lista nu se poate incarca poate fi un fisier sau are 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nu este suficient spațiu disponibil" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Încărcare anulată." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Adresa URL nu poate fi golita" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Eroare" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "a imparti" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Stergere permanenta" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Redenumire" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "in timpul" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} deja exista" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "înlocuire" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugerează nume" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "anulare" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} inlocuit cu {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "Anulează ultima acțiune" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "fișiere se încarcă" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' este un nume invalid de fișier." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Numele fișierului nu poate rămâne gol." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Spatiul de stocare este plin, fisierele nu mai pot fi actualizate sau sincronizate" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Spatiul de stocare este aproape plin {spatiu folosit}%" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Nume" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Dimensiune" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modificat" @@ -239,7 +247,7 @@ msgstr "Modificat" msgid "%s could not be renamed" msgstr "%s nu a putut fi redenumit" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Încărcare" @@ -275,65 +283,65 @@ msgstr "Dimensiunea maximă de intrare pentru fișiere compresate" msgid "Save" msgstr "Salvează" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nou" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "lista" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dosar" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "de la adresa" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Sterge fisierele" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Anulează încărcarea" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nu ai permisiunea de a scrie aici." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Nimic aici. Încarcă ceva!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Descarcă" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Anulare" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Șterge" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Fișierul încărcat este prea mare" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Fișierele sunt scanate, asteptati va rog" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "În curs de scanare" diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po index 1016778fe33..858e3cb2a17 100644 --- a/l10n/ro/settings.po +++ b/l10n/ro/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ru/core.po b/l10n/ru/core.po index 1f90ed5e5ef..6570bde0635 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -7,6 +7,7 @@ # lord93 , 2013 # foool , 2013 # eurekafag , 2013 +# sk.avenger , 2013 # Victor Bravo <>, 2013 # Vyacheslav Muranov , 2013 # Den4md , 2013 @@ -15,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -44,15 +45,15 @@ msgstr "" #: ajax/update.php:17 msgid "Updated database" -msgstr "" +msgstr "База данных обновлена" #: ajax/update.php:20 msgid "Updating filecache, this may take really long..." -msgstr "" +msgstr "Обновление файлового кэша, это может занять некоторое время..." #: ajax/update.php:23 msgid "Updated filecache" -msgstr "" +msgstr "Обновлен файловый кэш" #: ajax/update.php:26 #, php-format @@ -104,11 +105,11 @@ msgstr "" #: avatar/controller.php:81 msgid "Unknown filetype" -msgstr "" +msgstr "Неизвестный тип файла" #: avatar/controller.php:85 msgid "Invalid image" -msgstr "" +msgstr "Изображение повреждено" #: avatar/controller.php:115 avatar/controller.php:142 msgid "No temporary profile picture available, try again" @@ -198,59 +199,59 @@ msgstr "Декабрь" msgid "Settings" msgstr "Конфигурация" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "несколько секунд назад" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n минуту назад" msgstr[1] "%n минуты назад" msgstr[2] "%n минут назад" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n час назад" msgstr[1] "%n часа назад" msgstr[2] "%n часов назад" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "сегодня" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "вчера" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n день назад" msgstr[1] "%n дня назад" msgstr[2] "%n дней назад" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "в прошлом месяце" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n месяц назад" msgstr[1] "%n месяца назад" msgstr[2] "%n месяцев назад" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "несколько месяцев назад" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "в прошлом году" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "несколько лет назад" @@ -278,6 +279,47 @@ msgstr "Ок" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." @@ -609,11 +651,11 @@ msgstr "будет использовано" #: templates/installation.php:140 msgid "Database user" -msgstr "Имя пользователя для базы данных" +msgstr "Пользователь базы данных" #: templates/installation.php:147 msgid "Database password" -msgstr "Пароль для базы данных" +msgstr "Пароль базы данных" #: templates/installation.php:152 msgid "Database name" diff --git a/l10n/ru/files.po b/l10n/ru/files.po index 2db89c27daa..bb956fc01cd 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -6,14 +6,15 @@ # lord93 , 2013 # eurekafag , 2013 # Victor Bravo <>, 2013 +# navigator666 , 2013 # hackproof , 2013 # Friktor , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -79,11 +80,15 @@ msgstr "Ошибка записи на диск" msgid "Not enough storage available" msgstr "Недостаточно доступного места в хранилище" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Ошибка загрузки" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Неправильный каталог." @@ -91,147 +96,151 @@ msgstr "Неправильный каталог." msgid "Files" msgstr "Файлы" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Файл не был загружен: его размер 0 байт либо это не файл, а директория." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Недостаточно свободного места" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Загрузка отменена." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Ссылка не может быть пустой." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Ошибка" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Открыть доступ" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Удалено навсегда" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Переименовать" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Ожидание" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} уже существует" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "заменить" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "предложить название" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "отмена" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "заменено {new_name} на {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "отмена" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n папка" msgstr[1] "%n папки" msgstr[2] "%n папок" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n файл" msgstr[1] "%n файла" msgstr[2] "%n файлов" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" -msgstr "" +msgstr "{dirs} и {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Закачка %n файла" msgstr[1] "Закачка %n файлов" msgstr[2] "Закачка %n файлов" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "файлы загружаются" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' - неправильное имя файла." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Имя файла не может быть пустым." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ваше дисковое пространство полностью заполнено, произведите очистку перед загрузкой новых файлов." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." -msgstr "" +msgstr "Шифрование было отключено, но ваши файлы все еще зашифрованы. Пожалуйста, зайдите на страницу персональных настроек для того, чтобы расшифровать ваши файлы." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Имя" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Размер" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Изменён" @@ -240,7 +249,7 @@ msgstr "Изменён" msgid "%s could not be renamed" msgstr "%s не может быть переименован" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Загрузка" @@ -276,65 +285,65 @@ msgstr "Максимальный исходный размер для ZIP фай msgid "Save" msgstr "Сохранить" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Новый" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Текстовый файл" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Папка" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Из ссылки" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Удалённые файлы" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Отмена загрузки" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "У вас нет разрешений на запись здесь." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Здесь ничего нет. Загрузите что-нибудь!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Скачать" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Закрыть общий доступ" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Удалить" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Файл слишком велик" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Подождите, файлы сканируются." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Текущее сканирование" diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po index 2f638c5bcd0..03120345444 100644 --- a/l10n/ru/lib.po +++ b/l10n/ru/lib.po @@ -5,14 +5,16 @@ # Translators: # Alexander Shashkevych , 2013 # eurekafag , 2013 +# sk.avenger , 2013 +# navigator666 , 2013 # Friktor , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 12:50+0000\n" +"Last-Translator: sk.avenger \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" @@ -25,11 +27,11 @@ msgstr "" msgid "" "App \"%s\" can't be installed because it is not compatible with this version" " of ownCloud." -msgstr "" +msgstr "Приложение \"%s\" нельзя установить, так как оно не совместимо с текущей версией ownCloud." #: app.php:250 msgid "No app name specified" -msgstr "" +msgstr "Не выбрано имя приложения" #: app.php:361 msgid "Help" @@ -62,11 +64,11 @@ msgstr "" #: avatar.php:64 msgid "Unknown filetype" -msgstr "" +msgstr "Неизвестный тип файла" #: avatar.php:69 msgid "Invalid image" -msgstr "" +msgstr "Изображение повреждено" #: defaults.php:35 msgid "web services under your control" @@ -101,38 +103,38 @@ msgstr "Загрузите файл маленьшими порциями, ра #: installer.php:63 msgid "No source specified when installing app" -msgstr "" +msgstr "Не указан источник при установке приложения" #: installer.php:70 msgid "No href specified when installing app from http" -msgstr "" +msgstr "Не указан атрибут href при установке приложения через http" #: installer.php:75 msgid "No path specified when installing app from local file" -msgstr "" +msgstr "Не указан путь при установке приложения из локального файла" #: installer.php:89 #, php-format msgid "Archives of type %s are not supported" -msgstr "" +msgstr "Архивы %s не поддерживаются" #: installer.php:103 msgid "Failed to open archive when installing app" -msgstr "" +msgstr "Не возможно открыть архив при установке приложения" #: installer.php:125 msgid "App does not provide an info.xml file" -msgstr "" +msgstr "Приложение не имеет файла info.xml" #: installer.php:131 msgid "App can't be installed because of not allowed code in the App" -msgstr "" +msgstr "Приложение невозможно установить. В нем содержится запрещенный код." #: installer.php:140 msgid "" "App can't be installed because it is not compatible with this version of " "ownCloud" -msgstr "" +msgstr "Приложение невозможно установить. Не совместимо с текущей версией ownCloud." #: installer.php:146 msgid "" @@ -148,7 +150,7 @@ msgstr "" #: installer.php:162 msgid "App directory already exists" -msgstr "" +msgstr "Папка приложения уже существует" #: installer.php:175 #, php-format @@ -167,15 +169,15 @@ msgstr "Ошибка аутентификации" msgid "Token expired. Please reload page." msgstr "Токен просрочен. Перезагрузите страницу." -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Файлы" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Текст" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "Изображения" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index edaeaf19326..e70eab1bd49 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -8,14 +8,15 @@ # alfsoft , 2013 # lord93 , 2013 # eurekafag , 2013 +# navigator666 , 2013 # hackproof , 2013 # Friktor , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -93,7 +94,7 @@ msgstr "Невозможно обновить приложение" #: changepassword/controller.php:20 msgid "Wrong password" -msgstr "" +msgstr "Неправильный пароль" #: changepassword/controller.php:42 msgid "No user supplied" @@ -108,7 +109,7 @@ msgstr "" #: changepassword/controller.php:79 msgid "" "Wrong admin recovery password. Please check the password and try again." -msgstr "" +msgstr "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз." #: changepassword/controller.php:87 msgid "" @@ -116,13 +117,9 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" -msgstr "" +msgstr "Невозможно изменить пароль" #: js/apps.js:43 msgid "Update to {appversion}" @@ -142,11 +139,11 @@ msgstr "Подождите..." #: js/apps.js:79 js/apps.js:80 js/apps.js:100 msgid "Error while disabling app" -msgstr "" +msgstr "Ошибка отключения приложения" #: js/apps.js:99 js/apps.js:112 js/apps.js:113 msgid "Error while enabling app" -msgstr "" +msgstr "Ошибка включения приложения" #: js/apps.js:123 msgid "Updating...." @@ -170,7 +167,7 @@ msgstr "Обновлено" #: js/personal.js:220 msgid "Select a profile picture" -msgstr "" +msgstr "Выберите картинку профиля" #: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." @@ -504,27 +501,27 @@ msgstr "Фото профиля" #: templates/personal.php:90 msgid "Upload new" -msgstr "" +msgstr "Закачать новую" #: templates/personal.php:92 msgid "Select new from Files" -msgstr "" +msgstr "Выберите новый из файлов" #: templates/personal.php:93 msgid "Remove image" -msgstr "" +msgstr "Удалить изображение" #: templates/personal.php:94 msgid "Either png or jpg. Ideally square but you will be able to crop it." -msgstr "" +msgstr "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже." #: templates/personal.php:97 msgid "Abort" -msgstr "" +msgstr "Отмена" #: templates/personal.php:98 msgid "Choose as profile image" -msgstr "" +msgstr "Выберите изображение профиля" #: templates/personal.php:106 templates/personal.php:107 msgid "Language" @@ -551,15 +548,15 @@ msgstr "Шифрование" #: templates/personal.php:140 msgid "The encryption app is no longer enabled, decrypt all your file" -msgstr "" +msgstr "Приложение шифрования не активно, отмените шифрование всех ваших файлов." #: templates/personal.php:146 msgid "Log-in password" -msgstr "" +msgstr "Пароль входа" #: templates/personal.php:151 msgid "Decrypt all Files" -msgstr "" +msgstr "Снять шифрование со всех файлов" #: templates/users.php:21 msgid "Login Name" diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po index b231595c2f9..a454bfc58e1 100644 --- a/l10n/ru/user_ldap.po +++ b/l10n/ru/user_ldap.po @@ -6,13 +6,14 @@ # Alexander Shashkevych , 2013 # Fenuks , 2013 # alfsoft , 2013 +# navigator666 , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 08:20+0000\n" +"Last-Translator: navigator666 \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" @@ -216,7 +217,7 @@ msgstr "Отключение главного сервера" #: templates/settings.php:72 msgid "Only connect to the replica server." -msgstr "" +msgstr "Только подключение к серверу реплик." #: templates/settings.php:73 msgid "Use TLS" @@ -259,7 +260,7 @@ msgstr "Поле отображаемого имени пользователя" #: templates/settings.php:80 msgid "The LDAP attribute to use to generate the user's display name." -msgstr "" +msgstr "Атрибут LDAP, который используется для генерации отображаемого имени пользователя." #: templates/settings.php:81 msgid "Base User Tree" @@ -283,7 +284,7 @@ msgstr "Поле отображаемого имени группы" #: templates/settings.php:83 msgid "The LDAP attribute to use to generate the groups's display name." -msgstr "" +msgstr "Атрибут LDAP, который используется для генерации отображаемого имени группы." #: templates/settings.php:84 msgid "Base Group Tree" diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po index a83cde1f4e2..0bd8e5d646b 100644 --- a/l10n/si_LK/core.po +++ b/l10n/si_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "දෙසැම්බර්" msgid "Settings" msgstr "සිටුවම්" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "තත්පරයන්ට පෙර" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "අද" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "ඊයේ" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "පෙර මාසයේ" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "මාස කීපයකට පෙර" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "පෙර අවුරුද්දේ" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "අවුරුදු කීපයකට පෙර" @@ -266,6 +266,46 @@ msgstr "හරි" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po index 00c7fd92b17..6a62c6c1ea1 100644 --- a/l10n/si_LK/files.po +++ b/l10n/si_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "තැටිගත කිරීම අසාර්ථකයි" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "උඩුගත කිරීම අසාර්ථකයි" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "ගොනු" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "උඩුගත කිරීම අත් හරින්න ලදී" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "යොමුව හිස් විය නොහැක" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "දෝෂයක්" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "බෙදා හදා ගන්න" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "නැවත නම් කරන්න" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ප්‍රතිස්ථාපනය කරන්න" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "නමක් යෝජනා කරන්න" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "අත් හරින්න" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "නිෂ්ප්‍රභ කරන්න" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "නම" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "ප්‍රමාණය" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "වෙනස් කළ" @@ -232,7 +240,7 @@ msgstr "වෙනස් කළ" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "උඩුගත කරන්න" @@ -268,65 +276,65 @@ msgstr "ZIP ගොනු සඳහා දැමිය හැකි උපරි msgid "Save" msgstr "සුරකින්න" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "නව" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "පෙළ ගොනුව" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "ෆෝල්ඩරය" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "යොමුවෙන්" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "උඩුගත කිරීම අත් හරින්න" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "බාන්න" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "නොබෙදු" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "මකා දමන්න" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "උඩුගත කිරීම විශාල වැඩිය" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "වර්තමාන පරික්ෂාව" diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po index 78e5accf9e1..dede6a46ee8 100644 --- a/l10n/si_LK/settings.po +++ b/l10n/si_LK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sk/core.po b/l10n/sk/core.po index 0d0fc7e389d..6970d1b3c74 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,59 +190,59 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -270,6 +270,47 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/sk/files.po b/l10n/sk/files.po index 17be34bd16c..070448f726f 100644 --- a/l10n/sk/files.po +++ b/l10n/sk/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,147 +90,151 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -235,7 +243,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -271,65 +279,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po index de97d238d76..864614817b2 100644 --- a/l10n/sk/settings.po +++ b/l10n/sk/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po index d1abe24db2d..22b868c88e6 100644 --- a/l10n/sk_SK/core.po +++ b/l10n/sk_SK/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,59 +192,59 @@ msgstr "December" msgid "Settings" msgstr "Nastavenia" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "pred sekundami" -#: js/js.js:854 +#: js/js.js:867 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:855 +#: js/js.js:868 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:856 +#: js/js.js:869 msgid "today" msgstr "dnes" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "včera" -#: js/js.js:858 +#: js/js.js:871 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:859 +#: js/js.js:872 msgid "last month" msgstr "minulý mesiac" -#: js/js.js:860 +#: js/js.js:873 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:861 +#: js/js.js:874 msgid "months ago" msgstr "pred mesiacmi" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "minulý rok" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "pred rokmi" @@ -272,6 +272,47 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po index 13b2c321e86..fd554f6c973 100644 --- a/l10n/sk_SK/files.po +++ b/l10n/sk_SK/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Zápis na disk sa nepodaril" msgid "Not enough storage available" msgstr "Nedostatok dostupného úložného priestoru" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Odoslanie bolo neúspešné" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Neplatný priečinok." @@ -87,147 +91,151 @@ msgstr "Neplatný priečinok." msgid "Files" msgstr "Súbory" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nie je k dispozícii dostatok miesta" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Odosielanie zrušené." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL nemôže byť prázdne." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Chyba" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Zdieľať" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Zmazať trvalo" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Premenovať" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Prebieha" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} už existuje" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "nahradiť" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "pomôcť s menom" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "zrušiť" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "prepísaný {new_name} súborom {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "vrátiť" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n priečinok" msgstr[1] "%n priečinky" msgstr[2] "%n priečinkov" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n súbor" msgstr[1] "%n súbory" msgstr[2] "%n súborov" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Nahrávam %n súbor" msgstr[1] "Nahrávam %n súbory" msgstr[2] "Nahrávam %n súborov" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "nahrávanie súborov" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' je neplatné meno súboru." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Meno súboru nemôže byť prázdne" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Názov" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Veľkosť" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Upravené" @@ -236,7 +244,7 @@ msgstr "Upravené" msgid "%s could not be renamed" msgstr "%s nemohol byť premenovaný" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Odoslať" @@ -272,65 +280,65 @@ msgstr "Najväčšia veľkosť ZIP súborov" msgid "Save" msgstr "Uložiť" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Nová" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textový súbor" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Priečinok" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Z odkazu" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Zmazané súbory" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Zrušiť odosielanie" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nemáte oprávnenie na zápis." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Žiadny súbor. Nahrajte niečo!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Sťahovanie" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Zrušiť zdieľanie" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Zmazať" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Nahrávanie je príliš veľké" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Čakajte, súbory sú prehľadávané." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Práve prezerané" diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po index 000abca08a0..961d19a242b 100644 --- a/l10n/sk_SK/settings.po +++ b/l10n/sk_SK/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 5df1c0fa5c1..d67d119a51b 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,11 +192,11 @@ msgstr "december" msgid "Settings" msgstr "Nastavitve" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "pred nekaj sekundami" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" @@ -204,7 +204,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" @@ -212,15 +212,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "danes" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "včeraj" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" @@ -228,11 +228,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "zadnji mesec" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" @@ -240,15 +240,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "mesecev nazaj" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "lansko leto" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "let nazaj" @@ -276,6 +276,48 @@ msgstr "V redu" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/sl/files.po b/l10n/sl/files.po index 6b461d6107b..d8dee234cc0 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Pisanje na disk je spodletelo" msgid "Not enough storage available" msgstr "Na voljo ni dovolj prostora" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Pošiljanje je spodletelo" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Neveljavna mapa." @@ -87,76 +91,80 @@ msgstr "Neveljavna mapa." msgid "Files" msgstr "Datoteke" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov." +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Na voljo ni dovolj prostora." -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Pošiljanje je preklicano." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Naslov URL ne sme biti prazna vrednost." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Napaka" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Souporaba" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Izbriši dokončno" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Preimenuj" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "V čakanju ..." -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} že obstaja" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "zamenjaj" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "predlagaj ime" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "prekliči" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "preimenovano ime {new_name} z imenom {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "razveljavi" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" @@ -164,7 +172,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" @@ -172,11 +180,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" @@ -184,53 +192,53 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "poteka pošiljanje datotek" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' je neveljavno ime datoteke." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Ime datoteke ne sme biti prazno polje." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Ime" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Velikost" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Spremenjeno" @@ -239,7 +247,7 @@ msgstr "Spremenjeno" msgid "%s could not be renamed" msgstr "%s ni bilo mogoče preimenovati" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Pošlji" @@ -275,65 +283,65 @@ msgstr "Največja vhodna velikost za datoteke ZIP" msgid "Save" msgstr "Shrani" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Novo" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Besedilna datoteka" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mapa" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Iz povezave" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Izbrisane datoteke" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Prekliči pošiljanje" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Za to mesto ni ustreznih dovoljenj za pisanje." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Prejmi" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Prekliči souporabo" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Izbriši" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Prekoračenje omejitve velikosti" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Poteka preučevanje datotek, počakajte ..." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Trenutno poteka preučevanje" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index 4a2acfea748..dd0437a4bdd 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -111,11 +111,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sq/core.po b/l10n/sq/core.po index d87486309e3..249f4fdcadf 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,55 +192,55 @@ msgstr "Dhjetor" msgid "Settings" msgstr "Parametra" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekonda më parë" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut më parë" msgstr[1] "%n minuta më parë" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n orë më parë" msgstr[1] "%n orë më parë" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "sot" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "dje" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n ditë më parë" msgstr[1] "%n ditë më parë" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "muajin e shkuar" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n muaj më parë" msgstr[1] "%n muaj më parë" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "muaj më parë" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "vitin e shkuar" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "vite më parë" @@ -268,6 +268,46 @@ msgstr "Në rregull" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/sq/files.po b/l10n/sq/files.po index 3bf0e4962c0..a5b9a669e29 100644 --- a/l10n/sq/files.po +++ b/l10n/sq/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Odeen \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,11 +75,15 @@ msgstr "Ruajtja në disk dështoi" msgid "Not enough storage available" msgstr "Nuk ka mbetur hapësirë memorizimi e mjaftueshme" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Ngarkimi dështoi" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Dosje e pavlefshme." @@ -87,144 +91,148 @@ msgstr "Dosje e pavlefshme." msgid "Files" msgstr "Skedarët" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Nuk ka hapësirë memorizimi e mjaftueshme" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Ngarkimi u anulua." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL-i nuk mund të jetë bosh." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Veprim i gabuar" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Nda" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Elimino përfundimisht" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Riemërto" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Pezulluar" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} ekziston" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "zëvëndëso" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "sugjero një emër" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "anulo" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "U zëvëndësua {new_name} me {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "anulo" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n dosje" msgstr[1] "%n dosje" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n skedar" msgstr[1] "%n skedarë" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} dhe {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Po ngarkoj %n skedar" msgstr[1] "Po ngarkoj %n skedarë" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "po ngarkoj skedarët" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' është emër i pavlefshëm." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Emri i skedarit nuk mund të jetë bosh." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Emër i pavlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sinkronizoni më skedarët." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Emri" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Dimensioni" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Modifikuar" @@ -233,7 +241,7 @@ msgstr "Modifikuar" msgid "%s could not be renamed" msgstr "Nuk është i mundur riemërtimi i %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Ngarko" @@ -269,65 +277,65 @@ msgstr "Dimensioni maksimal i ngarkimit të skedarëve ZIP" msgid "Save" msgstr "Ruaj" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "I ri" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Skedar teksti" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Dosje" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Nga lidhja" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Skedarë të eliminuar" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Anulo ngarkimin" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Nuk keni të drejta për të shkruar këtu." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Këtu nuk ka asgjë. Ngarkoni diçka!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Shkarko" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Hiq ndarjen" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Elimino" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Ngarkimi është shumë i madh" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Skedarët që doni të ngarkoni tejkalojnë dimensionet maksimale për ngarkimet në këtë server." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Skedarët po analizohen, ju lutemi pritni." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Analizimi aktual" diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po index 05680ab5d73..033a815c20c 100644 --- a/l10n/sq/settings.po +++ b/l10n/sq/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sr/core.po b/l10n/sr/core.po index c146f275ab3..6c29c2d9def 100644 --- a/l10n/sr/core.po +++ b/l10n/sr/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,59 +190,59 @@ msgstr "Децембар" msgid "Settings" msgstr "Поставке" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "пре неколико секунди" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "данас" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "јуче" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "прошлог месеца" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "месеци раније" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "прошле године" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "година раније" @@ -270,6 +270,47 @@ msgstr "У реду" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/sr/files.po b/l10n/sr/files.po index 31dda625a60..58518b339be 100644 --- a/l10n/sr/files.po +++ b/l10n/sr/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "Не могу да пишем на диск" msgid "Not enough storage available" msgstr "Нема довољно простора" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Отпремање није успело" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "неисправна фасцикла." @@ -86,147 +90,151 @@ msgstr "неисправна фасцикла." msgid "Files" msgstr "Датотеке" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Нема довољно простора" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Отпремање је прекинуто." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "Адреса не може бити празна." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Грешка" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Дели" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Обриши за стално" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Преименуј" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "На чекању" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} већ постоји" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "замени" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "предложи назив" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "откажи" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "замењено {new_name} са {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "опозови" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "датотеке се отпремају" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "Датотека „.“ је неисправног имена." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Име датотеке не може бити празно." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ваше складиште је скоро па пуно ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Име" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Величина" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Измењено" @@ -235,7 +243,7 @@ msgstr "Измењено" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Отпреми" @@ -271,65 +279,65 @@ msgstr "Највећа величина ZIP датотека" msgid "Save" msgstr "Сачувај" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Нова" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "текстуална датотека" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "фасцикла" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Са везе" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Обрисане датотеке" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Прекини отпремање" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Овде немате дозволу за писање." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Овде нема ничег. Отпремите нешто!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Преузми" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Укини дељење" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Обриши" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Датотека је превелика" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Датотеке које желите да отпремите прелазе ограничење у величини." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Скенирам датотеке…" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Тренутно скенирање" diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po index ba7da173f28..ee77f11fb6e 100644 --- a/l10n/sr/settings.po +++ b/l10n/sr/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po index 89721e4a20b..6fc014eedf4 100644 --- a/l10n/sr@latin/core.po +++ b/l10n/sr@latin/core.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# lemi667 , 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -53,42 +54,42 @@ msgstr "" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Tip kategorije nije zadan." #: ajax/vcategories/add.php:30 msgid "No category to add?" -msgstr "" +msgstr "Bez dodavanja kategorije?" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "Kategorija već postoji: %s" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "Tip objekta nije zadan." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "" +msgstr "%s ID nije zadan." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Greška u dodavanju %s u omiljeno." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." -msgstr "" +msgstr "Kategorije za brisanje nisu izabrane." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Greška u uklanjanju %s iz omiljeno." #: avatar/controller.php:62 msgid "No image or file provided" @@ -190,65 +191,65 @@ msgstr "Decembar" msgid "Settings" msgstr "Podešavanja" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" -msgstr "" +msgstr "Pre par sekundi" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" -msgstr "" +msgstr "Danas" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" -msgstr "" +msgstr "juče" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" -msgstr "" +msgstr "prošlog meseca" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" -msgstr "" +msgstr "pre nekoliko meseci" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" -msgstr "" +msgstr "prošle godine" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" -msgstr "" +msgstr "pre nekoliko godina" #: js/oc-dialogs.js:123 msgid "Choose" -msgstr "" +msgstr "Izaberi" #: js/oc-dialogs.js:146 msgid "Error loading file picker template: {error}" @@ -256,24 +257,65 @@ msgstr "" #: js/oc-dialogs.js:172 msgid "Yes" -msgstr "" +msgstr "Da" #: js/oc-dialogs.js:182 msgid "No" -msgstr "" +msgstr "Ne" #: js/oc-dialogs.js:199 msgid "Ok" -msgstr "" +msgstr "Ok" #: js/oc-dialogs.js:219 msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." -msgstr "" +msgstr "Tip objekta nije zadan." #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136 @@ -281,55 +323,55 @@ msgstr "" #: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149 #: js/share.js:645 js/share.js:657 msgid "Error" -msgstr "" +msgstr "Greška" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "" +msgstr "Ime aplikacije nije precizirano." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "" +msgstr "Potreban fajl {file} nije instaliran!" #: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" -msgstr "" +msgstr "Deljeno" #: js/share.js:90 msgid "Share" -msgstr "" +msgstr "Podeli" #: js/share.js:131 js/share.js:685 msgid "Error while sharing" -msgstr "" +msgstr "Greška pri deljenju" #: js/share.js:142 msgid "Error while unsharing" -msgstr "" +msgstr "Greška u uklanjanju deljenja" #: js/share.js:149 msgid "Error while changing permissions" -msgstr "" +msgstr "Greška u promeni dozvola" #: js/share.js:158 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "{owner} podelio sa Vama i grupom {group} " #: js/share.js:160 msgid "Shared with you by {owner}" -msgstr "" +msgstr "Sa vama podelio {owner}" #: js/share.js:183 msgid "Share with" -msgstr "" +msgstr "Podeli sa" #: js/share.js:188 msgid "Share with link" -msgstr "" +msgstr "Podeli koristei link" #: js/share.js:191 msgid "Password protect" -msgstr "" +msgstr "Zaštita lozinkom" #: js/share.js:193 templates/installation.php:57 templates/login.php:26 msgid "Password" @@ -341,94 +383,94 @@ msgstr "" #: js/share.js:202 msgid "Email link to person" -msgstr "" +msgstr "Pošalji link e-mailom" #: js/share.js:203 msgid "Send" -msgstr "" +msgstr "Pošalji" #: js/share.js:208 msgid "Set expiration date" -msgstr "" +msgstr "Datum isteka" #: js/share.js:209 msgid "Expiration date" -msgstr "" +msgstr "Datum isteka" #: js/share.js:242 msgid "Share via email:" -msgstr "" +msgstr "Deli putem e-maila" #: js/share.js:245 msgid "No people found" -msgstr "" +msgstr "Nema pronađenih ljudi" #: js/share.js:283 msgid "Resharing is not allowed" -msgstr "" +msgstr "Dalje deljenje nije dozvoljeno" #: js/share.js:319 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "Deljeno u {item} sa {user}" #: js/share.js:340 msgid "Unshare" -msgstr "" +msgstr "Ukljoni deljenje" #: js/share.js:352 msgid "can edit" -msgstr "" +msgstr "dozvoljene izmene" #: js/share.js:354 msgid "access control" -msgstr "" +msgstr "kontrola pristupa" #: js/share.js:357 msgid "create" -msgstr "" +msgstr "napravi" #: js/share.js:360 msgid "update" -msgstr "" +msgstr "ažuriranje" #: js/share.js:363 msgid "delete" -msgstr "" +msgstr "brisanje" #: js/share.js:366 msgid "share" -msgstr "" +msgstr "deljenje" #: js/share.js:400 js/share.js:632 msgid "Password protected" -msgstr "" +msgstr "Zaštćeno lozinkom" #: js/share.js:645 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Greška u uklanjanju datuma isteka" #: js/share.js:657 msgid "Error setting expiration date" -msgstr "" +msgstr "Greška u postavljanju datuma isteka" #: js/share.js:672 msgid "Sending ..." -msgstr "" +msgstr "Slanje..." #: js/share.js:683 msgid "Email sent" -msgstr "" +msgstr "Email poslat" #: js/update.js:17 msgid "" "The update was unsuccessful. Please report this issue to the ownCloud " "community." -msgstr "" +msgstr "Ažuriranje nije uspelo. Molimo obavestite ownCloud zajednicu." #: js/update.js:21 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "Ažuriranje je uspelo. Prosleđivanje na ownCloud." #: lostpassword/controller.php:62 #, php-format @@ -437,7 +479,7 @@ msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" -msgstr "" +msgstr "Koristite sledeći link za reset lozinke: {link}" #: lostpassword/templates/lostpassword.php:4 msgid "" @@ -481,7 +523,7 @@ msgstr "Vaša lozinka je resetovana" #: lostpassword/templates/resetpassword.php:5 msgid "To login page" -msgstr "" +msgstr "Na login stranicu" #: lostpassword/templates/resetpassword.php:8 msgid "New password" @@ -513,7 +555,7 @@ msgstr "Pomoć" #: templates/403.php:12 msgid "Access forbidden" -msgstr "" +msgstr "Pristup zabranjen" #: templates/404.php:15 msgid "Cloud not found" @@ -532,20 +574,20 @@ msgstr "" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" -msgstr "" +msgstr "Izmena kategorija" #: templates/edit_categories_dialog.php:16 msgid "Add" -msgstr "" +msgstr "Dodaj" #: templates/installation.php:24 templates/installation.php:31 #: templates/installation.php:38 msgid "Security Warning" -msgstr "" +msgstr "Bezbednosno upozorenje" #: templates/installation.php:25 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" -msgstr "" +msgstr "Vaša PHP verzija je ranjiva na " #: templates/installation.php:26 #, php-format @@ -556,19 +598,19 @@ msgstr "" msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "" +msgstr "Nije dostupan generator slučajnog broja, molimo omogućite PHP OpenSSL ekstenziju." #: templates/installation.php:33 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." -msgstr "" +msgstr "Bez generatora slučajnog broja napadač može predvideti token za reset lozinke i preuzeti Vaš nalog." #: templates/installation.php:39 msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše." #: templates/installation.php:41 #, php-format @@ -587,7 +629,7 @@ msgstr "Napredno" #: templates/installation.php:67 msgid "Data folder" -msgstr "Facikla podataka" +msgstr "Fascikla podataka" #: templates/installation.php:77 msgid "Configure the database" @@ -613,7 +655,7 @@ msgstr "Ime baze" #: templates/installation.php:160 msgid "Database tablespace" -msgstr "" +msgstr "tablespace baze" #: templates/installation.php:167 msgid "Database host" @@ -634,7 +676,7 @@ msgstr "Odjava" #: templates/login.php:9 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Automatsko logovanje odbijeno!" #: templates/login.php:10 msgid "" diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po index c1b281b797f..72c25ecb2ed 100644 --- a/l10n/sr@latin/files.po +++ b/l10n/sr@latin/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,147 +90,151 @@ msgstr "" msgid "Files" msgstr "Fajlovi" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" -msgstr "" +msgstr "Greška" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" -msgstr "" +msgstr "Podeli" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Ime" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Veličina" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Zadnja izmena" @@ -235,7 +243,7 @@ msgstr "Zadnja izmena" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Pošalji" @@ -271,65 +279,65 @@ msgstr "" msgid "Save" msgstr "Snimi" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ovde nema ničeg. Pošaljite nešto!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Preuzmi" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" -msgstr "" +msgstr "Ukljoni deljenje" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Obriši" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Pošiljka je prevelika" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po index f1524d3b935..0c52072bbaa 100644 --- a/l10n/sr@latin/files_trashbin.po +++ b/l10n/sr@latin/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-15 04:47-0400\n" -"PO-Revision-Date: 2013-08-15 08:48+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 07:30+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" @@ -27,45 +27,45 @@ msgstr "" msgid "Couldn't restore %s" msgstr "" -#: js/trash.js:7 js/trash.js:100 +#: js/trash.js:7 js/trash.js:102 msgid "perform restore operation" msgstr "" -#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146 +#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148 msgid "Error" -msgstr "" +msgstr "Greška" -#: js/trash.js:36 +#: js/trash.js:37 msgid "delete file permanently" msgstr "" -#: js/trash.js:127 +#: js/trash.js:129 msgid "Delete permanently" msgstr "" -#: js/trash.js:182 templates/index.php:17 +#: js/trash.js:190 templates/index.php:21 msgid "Name" msgstr "Ime" -#: js/trash.js:183 templates/index.php:27 +#: js/trash.js:191 templates/index.php:31 msgid "Deleted" msgstr "" -#: js/trash.js:191 +#: js/trash.js:199 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/trash.js:197 +#: js/trash.js:205 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: lib/trash.php:819 lib/trash.php:821 +#: lib/trash.php:814 lib/trash.php:816 msgid "restored" msgstr "" @@ -73,11 +73,11 @@ msgstr "" msgid "Nothing in here. Your trash bin is empty!" msgstr "" -#: templates/index.php:20 templates/index.php:22 +#: templates/index.php:24 templates/index.php:26 msgid "Restore" msgstr "" -#: templates/index.php:30 templates/index.php:31 +#: templates/index.php:34 templates/index.php:35 msgid "Delete" msgstr "Obriši" diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po index 6af1411e01b..afa426b476b 100644 --- a/l10n/sr@latin/lib.po +++ b/l10n/sr@latin/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 07:30+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" @@ -164,15 +164,15 @@ msgstr "Greška pri autentifikaciji" msgid "Token expired. Please reload page." msgstr "" -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "Fajlovi" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "Tekst" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "" @@ -278,7 +278,7 @@ msgstr "" #: template/functions.php:96 msgid "seconds ago" -msgstr "" +msgstr "Pre par sekundi" #: template/functions.php:97 msgid "%n minute ago" @@ -296,11 +296,11 @@ msgstr[2] "" #: template/functions.php:99 msgid "today" -msgstr "" +msgstr "Danas" #: template/functions.php:100 msgid "yesterday" -msgstr "" +msgstr "juče" #: template/functions.php:101 msgid "%n day go" @@ -311,7 +311,7 @@ msgstr[2] "" #: template/functions.php:102 msgid "last month" -msgstr "" +msgstr "prošlog meseca" #: template/functions.php:103 msgid "%n month ago" @@ -322,11 +322,11 @@ msgstr[2] "" #: template/functions.php:104 msgid "last year" -msgstr "" +msgstr "prošle godine" #: template/functions.php:105 msgid "years ago" -msgstr "" +msgstr "pre nekoliko godina" #: template.php:297 msgid "Caused by:" diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po index 28437f33e6d..eaddf7af119 100644 --- a/l10n/sr@latin/settings.po +++ b/l10n/sr@latin/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" @@ -151,7 +147,7 @@ msgstr "" #: js/apps.js:126 msgid "Error" -msgstr "" +msgstr "Greška" #: js/apps.js:127 templates/apps.php:43 msgid "Update" @@ -220,7 +216,7 @@ msgstr "" #: templates/admin.php:15 msgid "Security Warning" -msgstr "" +msgstr "Bezbednosno upozorenje" #: templates/admin.php:18 msgid "" diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po index cdb427f5c8c..32f10400a2c 100644 --- a/l10n/sr@latin/user_ldap.po +++ b/l10n/sr@latin/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-07 04:40-0400\n" -"PO-Revision-Date: 2013-09-05 11:51+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 07:30+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" @@ -67,7 +67,7 @@ msgstr "" #: js/settings.js:117 msgid "Error" -msgstr "" +msgstr "Greška" #: js/settings.js:141 msgid "Connection test succeeded" diff --git a/l10n/sv/core.po b/l10n/sv/core.po index 4ed86320a27..84b71673c35 100644 --- a/l10n/sv/core.po +++ b/l10n/sv/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -194,55 +194,55 @@ msgstr "December" msgid "Settings" msgstr "Inställningar" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "sekunder sedan" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n minut sedan" msgstr[1] "%n minuter sedan" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n timme sedan" msgstr[1] "%n timmar sedan" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "i dag" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "i går" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n dag sedan" msgstr[1] "%n dagar sedan" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "förra månaden" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n månad sedan" msgstr[1] "%n månader sedan" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "månader sedan" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "förra året" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "år sedan" @@ -270,6 +270,46 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/sv/files.po b/l10n/sv/files.po index 6b498778cf9..3fe12b46d57 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: Magnus Höglund \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -78,11 +78,15 @@ msgstr "Misslyckades spara till disk" msgid "Not enough storage available" msgstr "Inte tillräckligt med lagringsutrymme tillgängligt" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Misslyckad uppladdning" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Felaktig mapp." @@ -90,144 +94,148 @@ msgstr "Felaktig mapp." msgid "Files" msgstr "Filer" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Inte tillräckligt med utrymme tillgängligt" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Uppladdning avbruten." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL kan inte vara tom." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Fel" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Dela" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Radera permanent" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Byt namn" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Väntar" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} finns redan" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ersätt" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "föreslå namn" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "avbryt" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "ersatt {new_name} med {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "ångra" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mapp" msgstr[1] "%n mappar" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n fil" msgstr[1] "%n filer" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} och {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Laddar upp %n fil" msgstr[1] "Laddar upp %n filer" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "filer laddas upp" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' är ett ogiltigt filnamn." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Filnamn kan inte vara tomt." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Namn" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Storlek" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Ändrad" @@ -236,7 +244,7 @@ msgstr "Ändrad" msgid "%s could not be renamed" msgstr "%s kunde inte namnändras" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Ladda upp" @@ -272,65 +280,65 @@ msgstr "Största tillåtna storlek för ZIP-filer" msgid "Save" msgstr "Spara" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Ny" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Textfil" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Mapp" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Från länk" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Raderade filer" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Avbryt uppladdning" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Du saknar skrivbehörighet här." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Ingenting här. Ladda upp något!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Ladda ner" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Sluta dela" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Radera" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "För stor uppladdning" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Filer skannas, var god vänta" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Aktuell skanning" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index f6ced07827c..284b1287a87 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/settings.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -115,11 +115,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po index 46d6c564324..7b0e7105489 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po index f32f2a01fde..b12e3fb13dc 100644 --- a/l10n/sw_KE/files.po +++ b/l10n/sw_KE/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po index efa55405965..da407172733 100644 --- a/l10n/sw_KE/settings.po +++ b/l10n/sw_KE/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po index a9b2566a89e..511b0ca1133 100644 --- a/l10n/ta_LK/core.po +++ b/l10n/ta_LK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "மார்கழி" msgid "Settings" msgstr "அமைப்புகள்" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "செக்கன்களுக்கு முன்" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "இன்று" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "நேற்று" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "கடந்த மாதம்" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "மாதங்களுக்கு முன்" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "கடந்த வருடம்" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "வருடங்களுக்கு முன்" @@ -266,6 +266,46 @@ msgstr "சரி" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po index cb81b1d0b54..dd4a7dcf141 100644 --- a/l10n/ta_LK/files.po +++ b/l10n/ta_LK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "வட்டில் எழுத முடியவில்லை" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "பதிவேற்றல் தோல்வியுற்றது" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "கோப்புகள்" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL வெறுமையாக இருக்கமுடியாது." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "வழு" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "பகிர்வு" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "பெயர்மாற்றம்" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "நிலுவையிலுள்ள" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} ஏற்கனவே உள்ளது" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "மாற்றிடுக" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "பெயரை பரிந்துரைக்க" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "இரத்து செய்க" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "முன் செயல் நீக்கம் " -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "பெயர்" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "அளவு" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "மாற்றப்பட்டது" @@ -232,7 +240,7 @@ msgstr "மாற்றப்பட்டது" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "பதிவேற்றுக" @@ -268,65 +276,65 @@ msgstr "ZIP கோப்புகளுக்கான ஆகக்கூடி msgid "Save" msgstr "சேமிக்க " -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "புதிய" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "கோப்பு உரை" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "கோப்புறை" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "இணைப்பிலிருந்து" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "பதிவேற்றலை இரத்து செய்க" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "பதிவிறக்குக" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "பகிரப்படாதது" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "நீக்குக" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "பதிவேற்றல் மிகப்பெரியது" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "தற்போது வருடப்படுபவை" diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po index c7ece05242c..cafed635ec9 100644 --- a/l10n/ta_LK/settings.po +++ b/l10n/ta_LK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/te/core.po b/l10n/te/core.po index 9c2ae9cdb2d..807fd914571 100644 --- a/l10n/te/core.po +++ b/l10n/te/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "డిసెంబర్" msgid "Settings" msgstr "అమరికలు" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "క్షణాల క్రితం" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "ఈరోజు" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "నిన్న" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "పోయిన నెల" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "నెలల క్రితం" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "పోయిన సంవత్సరం" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "సంవత్సరాల క్రితం" @@ -266,6 +266,46 @@ msgstr "సరే" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/te/files.po b/l10n/te/files.po index f414cfe474d..6c0c87d2181 100644 --- a/l10n/te/files.po +++ b/l10n/te/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "పొరపాటు" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "శాశ్వతంగా తొలగించు" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "రద్దుచేయి" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "పేరు" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "పరిమాణం" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "భద్రపరచు" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "సంచయం" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "తొలగించు" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/te/settings.po b/l10n/te/settings.po index fae385a6340..b9bb6933e6a 100644 --- a/l10n/te/settings.po +++ b/l10n/te/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index b33795587e7..33882c89991 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -191,55 +191,55 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -267,6 +267,46 @@ msgstr "" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its " +"name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index eedc0a25df3..93b709990c0 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:46-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -75,11 +75,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -87,144 +91,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:40 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:53 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:91 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:206 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:280 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:285 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:317 js/file-upload.js:333 js/files.js:528 js/files.js:566 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:710 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:417 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:417 js/filelist.js:419 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:464 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:534 js/filelist.js:600 js/files.js:597 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:535 js/filelist.js:601 js/files.js:603 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:542 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:698 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:763 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:322 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:579 templates/index.php:61 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:580 templates/index.php:73 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:581 templates/index.php:75 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index d3bea416f53..30de1ff6de2 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:46-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index e479af01a27..b5ecc6f796e 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index d7f497295db..7524db3041a 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index f64c3dfd3d0..cd6766aee43 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index b0fc9800d2a..17353203915 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index d10c7fb9fb3..2202934fcda 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -165,15 +165,15 @@ msgstr "" msgid "Token expired. Please reload page." msgstr "" -#: search/provider/file.php:17 search/provider/file.php:35 +#: search/provider/file.php:18 search/provider/file.php:36 msgid "Files" msgstr "" -#: search/provider/file.php:26 search/provider/file.php:33 +#: search/provider/file.php:27 search/provider/file.php:34 msgid "Text" msgstr "" -#: search/provider/file.php:29 +#: search/provider/file.php:30 msgid "Images" msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 3d0cbd90cfc..034369deddf 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -108,11 +108,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index cce14efa4e1..1f0ca9c4ef9 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index ea6486423a4..9ea999ee237 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po index 3ab10d3bf6f..db30ee027ea 100644 --- a/l10n/th_TH/core.po +++ b/l10n/th_TH/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "ธันวาคม" msgid "Settings" msgstr "ตั้งค่า" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "วินาที ก่อนหน้านี้" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "วันนี้" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "เมื่อวานนี้" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "เดือนที่แล้ว" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "เดือน ที่ผ่านมา" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "ปีที่แล้ว" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "ปี ที่ผ่านมา" @@ -262,6 +262,45 @@ msgstr "ตกลง" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po index 2bb54ad25e0..c6f59333185 100644 --- a/l10n/th_TH/files.po +++ b/l10n/th_TH/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้ msgid "Not enough storage available" msgstr "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "อัพโหลดล้มเหลว" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "ไดเร็กทอรี่ไม่ถูกต้อง" @@ -86,141 +90,145 @@ msgstr "ไดเร็กทอรี่ไม่ถูกต้อง" msgid "Files" msgstr "ไฟล์" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "มีพื้นที่เหลือไม่เพียงพอ" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "การอัพโหลดถูกยกเลิก" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL ไม่สามารถเว้นว่างได้" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "ข้อผิดพลาด" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "แชร์" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "เปลี่ยนชื่อ" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "อยู่ระหว่างดำเนินการ" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} มีอยู่แล้วในระบบ" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "แทนที่" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "แนะนำชื่อ" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ยกเลิก" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "เลิกทำ" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "การอัพโหลดไฟล์" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "ชื่อไฟล์ไม่สามารถเว้นว่างได้" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "ชื่อ" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "ขนาด" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "แก้ไขแล้ว" @@ -229,7 +237,7 @@ msgstr "แก้ไขแล้ว" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "อัพโหลด" @@ -265,65 +273,65 @@ msgstr "ขนาดไฟล์ ZIP สูงสุด" msgid "Save" msgstr "บันทึก" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "อัพโหลดไฟล์ใหม่" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "ไฟล์ข้อความ" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "แฟ้มเอกสาร" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "จากลิงก์" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "ยกเลิกการอัพโหลด" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "ดาวน์โหลด" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "ยกเลิกการแชร์" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "ลบ" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้" diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po index 6c34842bf4b..1b369b9b75b 100644 --- a/l10n/th_TH/settings.po +++ b/l10n/th_TH/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/tr/core.po b/l10n/tr/core.po index eed4853b177..3c751e4cd35 100644 --- a/l10n/tr/core.po +++ b/l10n/tr/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -193,55 +193,55 @@ msgstr "Aralık" msgid "Settings" msgstr "Ayarlar" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "saniye önce" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n dakika önce" msgstr[1] "%n dakika önce" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n saat önce" msgstr[1] "%n saat önce" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "bugün" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "dün" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n gün önce" msgstr[1] "%n gün önce" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "geçen ay" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n ay önce" msgstr[1] "%n ay önce" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "ay önce" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "geçen yıl" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "yıl önce" @@ -269,6 +269,46 @@ msgstr "Tamam" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/tr/files.po b/l10n/tr/files.po index e4878d5cdee..05c4ef56797 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "Diske yazılamadı" msgid "Not enough storage available" msgstr "Yeterli disk alanı yok" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Yükleme başarısız" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Geçersiz dizin." @@ -89,144 +93,148 @@ msgstr "Geçersiz dizin." msgid "Files" msgstr "Dosyalar" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Yeterli disk alanı yok" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Yükleme iptal edildi." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL boş olamaz." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir." -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Hata" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Paylaş" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Kalıcı olarak sil" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "İsim değiştir." -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Bekliyor" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} zaten mevcut" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "değiştir" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "Öneri ad" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "iptal" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "{new_name} ismi {old_name} ile değiştirildi" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "geri al" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n dizin" msgstr[1] "%n dizin" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n dosya" msgstr[1] "%n dosya" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n dosya yükleniyor" msgstr[1] "%n dosya yükleniyor" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "Dosyalar yükleniyor" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' geçersiz dosya adı." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Dosya adı boş olamaz." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkronizasyon edilmeyecek." -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "Şifreleme işlemi durduruldu ancak dosyalarınız şifreli. Dosyalarınızın şifresini kaldırmak için lütfen kişisel ayarlar kısmına geçiniz." -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "İsim" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Boyut" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Değiştirilme" @@ -235,7 +243,7 @@ msgstr "Değiştirilme" msgid "%s could not be renamed" msgstr "%s yeniden adlandırılamadı" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Yükle" @@ -271,65 +279,65 @@ msgstr "ZIP dosyaları için en fazla girdi sayısı" msgid "Save" msgstr "Kaydet" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Yeni" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Metin dosyası" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Klasör" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Bağlantıdan" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Dosyalar silindi" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Yüklemeyi iptal et" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Buraya erişim hakkınız yok." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "İndir" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Paylaşılmayan" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Sil" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Yükleme çok büyük" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Dosyalar taranıyor, lütfen bekleyin." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Güncel tarama" diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index 473a8a6790c..8d168dd065d 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -113,11 +113,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ug/core.po b/l10n/ug/core.po index 385f716e96f..6078bee4c5f 100644 --- a/l10n/ug/core.po +++ b/l10n/ug/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -190,51 +190,51 @@ msgstr "كۆنەك" msgid "Settings" msgstr "تەڭشەكلەر" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "بۈگۈن" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "تۈنۈگۈن" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "جەزملە" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ug/files.po b/l10n/ug/files.po index 3eabab5235b..c029562d869 100644 --- a/l10n/ug/files.po +++ b/l10n/ug/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -74,11 +74,15 @@ msgstr "دىسكىغا يازالمىدى" msgid "Not enough storage available" msgstr "يېتەرلىك ساقلاش بوشلۇقى يوق" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "ھۆججەتلەر" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "يېتەرلىك بوشلۇق يوق" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "يۈكلەشتىن ۋاز كەچتى." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "خاتالىق" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "ھەمبەھىر" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "مەڭگۈلۈك ئۆچۈر" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "ئات ئۆزگەرت" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "كۈتۈۋاتىدۇ" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} مەۋجۇت" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "ئالماشتۇر" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "تەۋسىيە ئات" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "ۋاز كەچ" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "يېنىۋال" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "ھۆججەت يۈكلىنىۋاتىدۇ" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "ئاتى" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "چوڭلۇقى" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "ئۆزگەرتكەن" @@ -229,7 +237,7 @@ msgstr "ئۆزگەرتكەن" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "يۈكلە" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "ساقلا" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "يېڭى" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "تېكىست ھۆججەت" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "قىسقۇچ" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "ئۆچۈرۈلگەن ھۆججەتلەر" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "يۈكلەشتىن ۋاز كەچ" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "بۇ جايدا ھېچنېمە يوق. Upload something!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "چۈشۈر" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "ھەمبەھىرلىمە" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "ئۆچۈر" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "يۈكلەندىغىنى بەك چوڭ" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po index 63874495c3b..84bd5ebb2a5 100644 --- a/l10n/ug/settings.po +++ b/l10n/ug/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot \n" "Language-Team: Uighur \n" "MIME-Version: 1.0\n" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/uk/core.po b/l10n/uk/core.po index 888399d1dc7..b30a1633773 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,59 +190,59 @@ msgstr "Грудень" msgid "Settings" msgstr "Налаштування" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "секунди тому" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "сьогодні" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "вчора" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "минулого місяця" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "місяці тому" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "минулого року" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "роки тому" @@ -270,6 +270,47 @@ msgstr "Ok" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/uk/files.po b/l10n/uk/files.po index 13cbcf24616..23349e0800d 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: zubr139 \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,11 +75,15 @@ msgstr "Невдалося записати на диск" msgid "Not enough storage available" msgstr "Місця більше немає" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Помилка завантаження" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Невірний каталог." @@ -87,147 +91,151 @@ msgstr "Невірний каталог." msgid "Files" msgstr "Файли" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Місця більше немає" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Завантаження перервано." -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL не може бути пустим." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Помилка" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Поділитися" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Видалити назавжди" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Перейменувати" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Очікування" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} вже існує" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "заміна" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "запропонуйте назву" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "відміна" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "замінено {new_name} на {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "відмінити" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "файли завантажуються" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' це невірне ім'я файлу." -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr " Ім'я файлу не може бути порожнім." -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ваше сховище майже повне ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Ім'я" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Розмір" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Змінено" @@ -236,7 +244,7 @@ msgstr "Змінено" msgid "%s could not be renamed" msgstr "%s не може бути перейменований" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Вивантажити" @@ -272,65 +280,65 @@ msgstr "Максимальний розмір завантажуємого ZIP msgid "Save" msgstr "Зберегти" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Створити" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Текстовий файл" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Папка" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "З посилання" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "Видалено файлів" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Перервати завантаження" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "У вас тут немає прав на запис." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Тут нічого немає. Відвантажте що-небудь!" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Завантажити" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Закрити доступ" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Видалити" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Файл занадто великий" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Файли скануються, зачекайте, будь-ласка." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Поточне сканування" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 53d79864613..a96bef5878c 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po index 5e22263ec5f..4b4391115ef 100644 --- a/l10n/ur_PK/core.po +++ b/l10n/ur_PK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,55 +190,55 @@ msgstr "دسمبر" msgid "Settings" msgstr "سیٹینگز" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" msgstr[1] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -266,6 +266,46 @@ msgstr "اوکے" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" +msgstr[1] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po index e92fc72d7f3..2efc8cf7473 100644 --- a/l10n/ur_PK/files.po +++ b/l10n/ur_PK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-08-30 09:31-0400\n" -"PO-Revision-Date: 2013-08-30 13:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,144 +90,148 @@ msgstr "" msgid "Files" msgstr "" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:275 js/file-upload.js:291 js/files.js:511 js/files.js:549 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "ایرر" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:573 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:305 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:305 js/filelist.js:307 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:352 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:422 js/filelist.js:488 js/files.js:580 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:423 js/filelist.js:489 js/files.js:586 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:430 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:561 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:626 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:562 templates/index.php:67 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "" -#: js/files.js:563 templates/index.php:78 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:564 templates/index.php:80 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -232,7 +240,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "" @@ -268,65 +276,65 @@ msgstr "" msgid "Save" msgstr "" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:73 +#: templates/index.php:67 msgid "Download" msgstr "" -#: templates/index.php:85 templates/index.php:86 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "شئیرنگ ختم کریں" -#: templates/index.php:91 templates/index.php:92 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "" -#: templates/index.php:105 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:107 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:112 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:115 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po index 92dc0e5d077..2893f058698 100644 --- a/l10n/ur_PK/settings.po +++ b/l10n/ur_PK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/vi/core.po b/l10n/vi/core.po index 6cdb4d2458e..6d9203adc4b 100644 --- a/l10n/vi/core.po +++ b/l10n/vi/core.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -191,51 +191,51 @@ msgstr "Tháng 12" msgid "Settings" msgstr "Cài đặt" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "vài giây trước" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "hôm nay" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "hôm qua" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "tháng trước" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "tháng trước" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "năm trước" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "năm trước" @@ -263,6 +263,45 @@ msgstr "Đồng ý" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/vi/files.po b/l10n/vi/files.po index ffc9063f5d7..df0a42f78e5 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "Không thể ghi " msgid "Not enough storage available" msgstr "Không đủ không gian lưu trữ" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "Tải lên thất bại" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "Thư mục không hợp lệ" @@ -87,141 +91,145 @@ msgstr "Thư mục không hợp lệ" msgid "Files" msgstr "Tập tin" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "Không đủ chỗ trống cần thiết" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "Hủy tải lên" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này." -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL không được để trống." -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "Lỗi" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "Chia sẻ" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "Xóa vĩnh vễn" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "Sửa tên" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "Đang chờ" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} đã tồn tại" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "thay thế" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "tên gợi ý" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "hủy" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "đã thay thế {new_name} bằng {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "lùi lại" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "tệp tin đang được tải lên" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' là một tên file không hợp lệ" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "Tên file không được rỗng" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng." -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "Your storage is full, files can not be updated or synced anymore!" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Your storage is almost full ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Your download is being prepared. This might take some time if the files are big." -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "Tên" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "Kích cỡ" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "Thay đổi" @@ -230,7 +238,7 @@ msgstr "Thay đổi" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "Tải lên" @@ -266,65 +274,65 @@ msgstr "Kích thước tối đa cho các tập tin ZIP" msgid "Save" msgstr "Lưu" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "Mới" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "Tập tin văn bản" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "Thư mục" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "Từ liên kết" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "File đã bị xóa" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "Hủy upload" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "Bạn không có quyền ghi vào đây." -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "Tải về" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "Bỏ chia sẻ" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "Xóa" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "Tập tin tải lên quá lớn" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ ." -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "Tập tin đang được quét ,vui lòng chờ." -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "Hiện tại đang quét" diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po index 37f3d2e0da8..a3499595611 100644 --- a/l10n/vi/settings.po +++ b/l10n/vi/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index 8d4cdaa172a..50a09f4c32c 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -193,51 +193,51 @@ msgstr "十二月" msgid "Settings" msgstr "设置" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "秒前" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分钟前" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 小时前" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "今天" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "昨天" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n 天前" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "上月" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n 月前" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "月前" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "去年" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "年前" @@ -265,6 +265,45 @@ msgstr "好" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index e68d22da13a..26678e7a453 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -77,11 +77,15 @@ msgstr "写入磁盘失败" msgid "Not enough storage available" msgstr "没有足够的存储空间" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "上传失败" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "无效文件夹。" @@ -89,141 +93,145 @@ msgstr "无效文件夹。" msgid "Files" msgstr "文件" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "无法上传您的文件，文件夹或者空文件" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "没有足够可用空间" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "上传已取消" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL不能为空" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "错误" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "分享" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "永久删除" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "重命名" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "等待" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} 已存在" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "替换" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "建议名称" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "取消" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "已将 {old_name}替换成 {new_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "撤销" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n 文件夹" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n个文件" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "文件上传中" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' 是一个无效的文件名。" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "文件名不能为空。" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "您的存储空间已满，文件将无法更新或同步！" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "您的存储空间即将用完 ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "下载正在准备中。如果文件较大可能会花费一些时间。" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "名称" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "大小" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "修改日期" @@ -232,7 +240,7 @@ msgstr "修改日期" msgid "%s could not be renamed" msgstr "%s 不能被重命名" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "上传" @@ -268,65 +276,65 @@ msgstr "ZIP 文件的最大输入大小" msgid "Save" msgstr "保存" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "新建" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "文本文件" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "文件夹" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "来自链接" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "已删除文件" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "取消上传" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "您没有写权限" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "这里还什么都没有。上传些东西吧！" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "下载" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "取消共享" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "删除" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "上传文件过大" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "文件正在被扫描，请稍候。" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "当前扫描" diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index 2e9ea7f2a6d..fc3228827b0 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/settings.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -114,11 +114,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po index 51efb5c3cf6..edcf03cc9dd 100644 --- a/l10n/zh_HK/core.po +++ b/l10n/zh_HK/core.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -190,51 +190,51 @@ msgstr "十二月" msgid "Settings" msgstr "設定" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "今日" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "昨日" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "前一月" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "個月之前" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "" @@ -262,6 +262,45 @@ msgstr "OK" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po index ef901a270fc..20aca3cb37e 100644 --- a/l10n/zh_HK/files.po +++ b/l10n/zh_HK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -74,11 +74,15 @@ msgstr "" msgid "Not enough storage available" msgstr "" -#: ajax/upload.php:109 -msgid "Upload failed" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "" @@ -86,141 +90,145 @@ msgstr "" msgid "Files" msgstr "文件" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "錯誤" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "分享" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "名稱" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "" @@ -229,7 +237,7 @@ msgstr "" msgid "%s could not be renamed" msgstr "" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "上傳" @@ -265,65 +273,65 @@ msgstr "" msgid "Save" msgstr "儲存" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "下載" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "取消分享" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "刪除" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "" diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po index 03c8c330da4..079b4a52ddf 100644 --- a/l10n/zh_HK/settings.po +++ b/l10n/zh_HK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -109,11 +109,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po index 405447f8111..76b1ce04f5b 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: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:33+0000\n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -192,51 +192,51 @@ msgstr "十二月" msgid "Settings" msgstr "設定" -#: js/js.js:853 +#: js/js.js:866 msgid "seconds ago" msgstr "幾秒前" -#: js/js.js:854 +#: js/js.js:867 msgid "%n minute ago" msgid_plural "%n minutes ago" msgstr[0] "%n 分鐘前" -#: js/js.js:855 +#: js/js.js:868 msgid "%n hour ago" msgid_plural "%n hours ago" msgstr[0] "%n 小時前" -#: js/js.js:856 +#: js/js.js:869 msgid "today" msgstr "今天" -#: js/js.js:857 +#: js/js.js:870 msgid "yesterday" msgstr "昨天" -#: js/js.js:858 +#: js/js.js:871 msgid "%n day ago" msgid_plural "%n days ago" msgstr[0] "%n 天前" -#: js/js.js:859 +#: js/js.js:872 msgid "last month" msgstr "上個月" -#: js/js.js:860 +#: js/js.js:873 msgid "%n month ago" msgid_plural "%n months ago" msgstr[0] "%n 個月前" -#: js/js.js:861 +#: js/js.js:874 msgid "months ago" msgstr "幾個月前" -#: js/js.js:862 +#: js/js.js:875 msgid "last year" msgstr "去年" -#: js/js.js:863 +#: js/js.js:876 msgid "years ago" msgstr "幾年前" @@ -264,6 +264,45 @@ msgstr "好" msgid "Error loading message template: {error}" msgstr "" +#: js/oc-dialogs.js:347 +msgid "{count} file conflict" +msgid_plural "{count} file conflicts" +msgstr[0] "" + +#: js/oc-dialogs.js:361 +msgid "One file conflict" +msgstr "" + +#: js/oc-dialogs.js:367 +msgid "Which files do you want to keep?" +msgstr "" + +#: js/oc-dialogs.js:368 +msgid "" +"If you select both versions, the copied file will have a number added to its" +" name." +msgstr "" + +#: js/oc-dialogs.js:376 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:386 +msgid "Continue" +msgstr "" + +#: js/oc-dialogs.js:433 js/oc-dialogs.js:446 +msgid "(all selected)" +msgstr "" + +#: js/oc-dialogs.js:436 js/oc-dialogs.js:449 +msgid "({count} selected)" +msgstr "" + +#: js/oc-dialogs.js:457 +msgid "Error loading file exists template" +msgstr "" + #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 msgid "The object type is not specified." diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po index cc65168506e..60f8fdf7a0d 100644 --- a/l10n/zh_TW/files.po +++ b/l10n/zh_TW/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 21:46-0400\n" -"PO-Revision-Date: 2013-09-14 00:00+0000\n" -"Last-Translator: pellaeon \n" +"POT-Creation-Date: 2013-09-20 10:44-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -75,11 +75,15 @@ msgstr "寫入硬碟失敗" msgid "Not enough storage available" msgstr "儲存空間不足" -#: ajax/upload.php:109 -msgid "Upload failed" -msgstr "上傳失敗" +#: ajax/upload.php:120 ajax/upload.php:143 +msgid "Upload failed. Could not get file info." +msgstr "" -#: ajax/upload.php:127 +#: ajax/upload.php:136 +msgid "Upload failed. Could not find uploaded file" +msgstr "" + +#: ajax/upload.php:160 msgid "Invalid directory." msgstr "無效的資料夾" @@ -87,141 +91,145 @@ msgstr "無效的資料夾" msgid "Files" msgstr "檔案" -#: js/file-upload.js:11 -msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "無法上傳您的檔案，因為它可能是一個目錄或檔案大小為0" +#: js/file-upload.js:244 +msgid "Unable to upload {filename} as it is a directory or has 0 bytes" +msgstr "" -#: js/file-upload.js:24 +#: js/file-upload.js:255 msgid "Not enough space available" msgstr "沒有足夠的可用空間" -#: js/file-upload.js:64 +#: js/file-upload.js:322 msgid "Upload cancelled." msgstr "上傳已取消" -#: js/file-upload.js:165 +#: js/file-upload.js:356 +msgid "Could not get result from server." +msgstr "" + +#: js/file-upload.js:446 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "檔案上傳中，離開此頁面將會取消上傳。" -#: js/file-upload.js:239 +#: js/file-upload.js:520 msgid "URL cannot be empty." msgstr "URL 不能為空" -#: js/file-upload.js:244 lib/app.php:53 +#: js/file-upload.js:525 lib/app.php:53 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留" -#: js/file-upload.js:276 js/file-upload.js:292 js/files.js:512 js/files.js:550 +#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545 msgid "Error" msgstr "錯誤" -#: js/fileactions.js:116 +#: js/fileactions.js:119 msgid "Share" msgstr "分享" -#: js/fileactions.js:126 +#: js/fileactions.js:131 msgid "Delete permanently" msgstr "永久刪除" -#: js/fileactions.js:192 +#: js/fileactions.js:197 msgid "Rename" msgstr "重新命名" -#: js/filelist.js:50 js/filelist.js:53 js/filelist.js:575 +#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:788 msgid "Pending" msgstr "等候中" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "{new_name} already exists" msgstr "{new_name} 已經存在" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "replace" msgstr "取代" -#: js/filelist.js:307 +#: js/filelist.js:416 msgid "suggest name" msgstr "建議檔名" -#: js/filelist.js:307 js/filelist.js:309 +#: js/filelist.js:416 js/filelist.js:418 msgid "cancel" msgstr "取消" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "replaced {new_name} with {old_name}" msgstr "使用 {new_name} 取代 {old_name}" -#: js/filelist.js:354 +#: js/filelist.js:463 msgid "undo" msgstr "復原" -#: js/filelist.js:424 js/filelist.js:490 js/files.js:581 +#: js/filelist.js:533 js/filelist.js:599 js/files.js:576 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n 個資料夾" -#: js/filelist.js:425 js/filelist.js:491 js/files.js:587 +#: js/filelist.js:534 js/filelist.js:600 js/files.js:582 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n 個檔案" -#: js/filelist.js:432 +#: js/filelist.js:541 msgid "{dirs} and {files}" msgstr "{dirs} 和 {files}" -#: js/filelist.js:563 +#: js/filelist.js:731 js/filelist.js:769 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "%n 個檔案正在上傳" -#: js/filelist.js:628 -msgid "files uploading" -msgstr "檔案上傳中" - -#: js/files.js:52 +#: js/files.js:25 msgid "'.' is an invalid file name." msgstr "'.' 是不合法的檔名" -#: js/files.js:56 +#: js/files.js:29 msgid "File name cannot be empty." msgstr "檔名不能為空" -#: js/files.js:64 +#: js/files.js:37 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." msgstr "檔名不合法，不允許 \\ / < > : \" | ? * 字元" -#: js/files.js:78 +#: js/files.js:51 msgid "Your storage is full, files can not be updated or synced anymore!" msgstr "您的儲存空間已滿，沒有辦法再更新或是同步檔案！" -#: js/files.js:82 +#: js/files.js:55 msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "您的儲存空間快要滿了 ({usedSpacePercent}%)" -#: js/files.js:94 +#: js/files.js:67 msgid "" "Encryption was disabled but your files are still encrypted. Please go to " "your personal settings to decrypt your files." msgstr "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。" -#: js/files.js:245 +#: js/files.js:296 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "正在準備您的下載，若您的檔案較大，將會需要更多時間。" -#: js/files.js:563 templates/index.php:69 +#: js/files.js:507 js/files.js:545 +msgid "Error moving file" +msgstr "" + +#: js/files.js:558 templates/index.php:61 msgid "Name" msgstr "名稱" -#: js/files.js:564 templates/index.php:81 +#: js/files.js:559 templates/index.php:73 msgid "Size" msgstr "大小" -#: js/files.js:565 templates/index.php:83 +#: js/files.js:560 templates/index.php:75 msgid "Modified" msgstr "修改時間" @@ -230,7 +238,7 @@ msgstr "修改時間" msgid "%s could not be renamed" msgstr "無法重新命名 %s" -#: lib/helper.php:11 templates/index.php:18 +#: lib/helper.php:11 templates/index.php:17 msgid "Upload" msgstr "上傳" @@ -266,65 +274,65 @@ msgstr "ZIP 壓縮前的原始大小限制" msgid "Save" msgstr "儲存" -#: templates/index.php:7 +#: templates/index.php:6 msgid "New" msgstr "新增" -#: templates/index.php:10 +#: templates/index.php:9 msgid "Text file" msgstr "文字檔" -#: templates/index.php:12 +#: templates/index.php:11 msgid "Folder" msgstr "資料夾" -#: templates/index.php:14 +#: templates/index.php:13 msgid "From link" msgstr "從連結" -#: templates/index.php:41 +#: templates/index.php:33 msgid "Deleted files" msgstr "回收桶" -#: templates/index.php:46 +#: templates/index.php:39 msgid "Cancel upload" msgstr "取消上傳" -#: templates/index.php:52 +#: templates/index.php:45 msgid "You don’t have write permissions here." msgstr "您在這裡沒有編輯權" -#: templates/index.php:59 +#: templates/index.php:50 msgid "Nothing in here. Upload something!" msgstr "這裡還沒有東西，上傳一些吧！" -#: templates/index.php:75 +#: templates/index.php:67 msgid "Download" msgstr "下載" -#: templates/index.php:88 templates/index.php:89 +#: templates/index.php:80 templates/index.php:81 msgid "Unshare" msgstr "取消分享" -#: templates/index.php:94 templates/index.php:95 +#: templates/index.php:86 templates/index.php:87 msgid "Delete" msgstr "刪除" -#: templates/index.php:108 +#: templates/index.php:100 msgid "Upload too large" msgstr "上傳過大" -#: templates/index.php:110 +#: templates/index.php:102 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "您試圖上傳的檔案大小超過伺服器的限制。" -#: templates/index.php:115 +#: templates/index.php:107 msgid "Files are being scanned, please wait." msgstr "正在掃描檔案，請稍等。" -#: templates/index.php:118 +#: templates/index.php:110 msgid "Current scanning" msgstr "正在掃描" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index e6f825433a8..5c24961e5cb 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/settings.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-18 11:47-0400\n" -"PO-Revision-Date: 2013-09-18 15:47+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+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" @@ -110,11 +110,7 @@ msgid "" "successfully updated." msgstr "" -#: changepassword/controller.php:92 -msgid "message" -msgstr "" - -#: changepassword/controller.php:103 +#: changepassword/controller.php:92 changepassword/controller.php:103 msgid "Unable to change password" msgstr "" diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index da3ec4ce372..ab3d618849e 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Utilisateurs", "Admin" => "Administration", "Failed to upgrade \"%s\"." => "Echec de la mise à niveau \"%s\".", +"Custom profile pictures don't work with encryption yet" => "Les images de profil personnalisées ne fonctionnent pas encore avec le système de chiffrement.", +"Unknown filetype" => "Type de fichier inconnu", +"Invalid image" => "Image invalide", "web services under your control" => "services web sous votre contrôle", "cannot open \"%s\"" => "impossible d'ouvrir \"%s\"", "ZIP download is turned off." => "Téléchargement ZIP désactivé.", diff --git a/lib/l10n/it.php b/lib/l10n/it.php index 2dab6dee157..b00789bc86f 100644 --- a/lib/l10n/it.php +++ b/lib/l10n/it.php @@ -8,8 +8,8 @@ $TRANSLATIONS = array( "Users" => "Utenti", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "Aggiornamento non riuscito \"%s\".", -"Custom profile pictures don't work with encryption yet" => "Le immagini personalizzate del profilo non funzionano ancora con la cifratura.", -"Unknown filetype" => "Tipo file sconosciuto", +"Custom profile pictures don't work with encryption yet" => "Le immagini personalizzate del profilo non funzionano ancora con la cifratura", +"Unknown filetype" => "Tipo di file sconosciuto", "Invalid image" => "Immagine non valida", "web services under your control" => "servizi web nelle tue mani", "cannot open \"%s\"" => "impossibile aprire \"%s\"", diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php index bf540012249..6e2bcba7b10 100644 --- a/lib/l10n/pt_PT.php +++ b/lib/l10n/pt_PT.php @@ -6,6 +6,8 @@ $TRANSLATIONS = array( "Users" => "Utilizadores", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "A actualização \"%s\" falhou.", +"Unknown filetype" => "Ficheiro desconhecido", +"Invalid image" => "Imagem inválida", "web services under your control" => "serviços web sob o seu controlo", "cannot open \"%s\"" => "Não foi possível abrir \"%s\"", "ZIP download is turned off." => "Descarregamento em ZIP está desligado.", diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index c3b6a077b72..0fe88efef70 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -1,11 +1,15 @@ "Приложение \"%s\" нельзя установить, так как оно не совместимо с текущей версией ownCloud.", +"No app name specified" => "Не выбрано имя приложения", "Help" => "Помощь", "Personal" => "Личное", "Settings" => "Конфигурация", "Users" => "Пользователи", "Admin" => "Admin", "Failed to upgrade \"%s\"." => "Не смог обновить \"%s\".", +"Unknown filetype" => "Неизвестный тип файла", +"Invalid image" => "Изображение повреждено", "web services under your control" => "веб-сервисы под вашим управлением", "cannot open \"%s\"" => "не могу открыть \"%s\"", "ZIP download is turned off." => "ZIP-скачивание отключено.", @@ -13,6 +17,15 @@ $TRANSLATIONS = array( "Back to Files" => "Назад к файлам", "Selected files too large to generate zip file." => "Выбранные файлы слишком велики, чтобы создать zip файл.", "Download the files in smaller chunks, seperately or kindly ask your administrator." => "Загрузите файл маленьшими порциями, раздельно или вежливо попросите Вашего администратора.", +"No source specified when installing app" => "Не указан источник при установке приложения", +"No href specified when installing app from http" => "Не указан атрибут href при установке приложения через http", +"No path specified when installing app from local file" => "Не указан путь при установке приложения из локального файла", +"Archives of type %s are not supported" => "Архивы %s не поддерживаются", +"Failed to open archive when installing app" => "Не возможно открыть архив при установке приложения", +"App does not provide an info.xml file" => "Приложение не имеет файла info.xml", +"App can't be installed because of not allowed code in the App" => "Приложение невозможно установить. В нем содержится запрещенный код.", +"App can't be installed because it is not compatible with this version of ownCloud" => "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.", +"App directory already exists" => "Папка приложения уже существует", "Application is not enabled" => "Приложение не разрешено", "Authentication error" => "Ошибка аутентификации", "Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.", diff --git a/lib/l10n/sr@latin.php b/lib/l10n/sr@latin.php index 5ba51bc0ba7..d8fa9289221 100644 --- a/lib/l10n/sr@latin.php +++ b/lib/l10n/sr@latin.php @@ -8,9 +8,15 @@ $TRANSLATIONS = array( "Authentication error" => "Greška pri autentifikaciji", "Files" => "Fajlovi", "Text" => "Tekst", +"seconds ago" => "Pre par sekundi", "_%n minute ago_::_%n minutes ago_" => array("","",""), "_%n hour ago_::_%n hours ago_" => array("","",""), +"today" => "Danas", +"yesterday" => "juče", "_%n day go_::_%n days ago_" => array("","",""), -"_%n month ago_::_%n months ago_" => array("","","") +"last month" => "prošlog meseca", +"_%n month ago_::_%n months ago_" => array("","",""), +"last year" => "prošle godine", +"years ago" => "pre nekoliko godina" ); $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/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php index 7e2ec238465..9873d4d20ac 100644 --- a/settings/l10n/cs_CZ.php +++ b/settings/l10n/cs_CZ.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Nelze přidat uživatele do skupiny %s", "Unable to remove user from group %s" => "Nelze odebrat uživatele ze skupiny %s", "Couldn't update app." => "Nelze aktualizovat aplikaci.", +"Wrong password" => "Nesprávné heslo", +"No user supplied" => "Nebyl uveden uživatel", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena", +"Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.", +"Unable to change password" => "Změna hesla se nezdařila", "Update to {appversion}" => "Aktualizovat na {appversion}", "Disable" => "Zakázat", "Enable" => "Povolit", diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 05c02e530ed..ae2165873ea 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden", "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden", "Couldn't update app." => "Die App konnte nicht aktualisiert werden.", +"Wrong password" => "Falsches Passwort", +"No user supplied" => "Keinen Benutzer übermittelt", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können", +"Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", +"Unable to change password" => "Passwort konnte nicht geändert werden", "Update to {appversion}" => "Aktualisiere zu {appversion}", "Disable" => "Deaktivieren", "Enable" => "Aktivieren", diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php new file mode 100644 index 00000000000..d70f365826c --- /dev/null +++ b/settings/l10n/de_AT.php @@ -0,0 +1,5 @@ + "Deutsch (Österreich)" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php index 45650a3b440..558071b3cbf 100644 --- a/settings/l10n/de_CH.php +++ b/settings/l10n/de_CH.php @@ -39,7 +39,7 @@ $TRANSLATIONS = array( "A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden", "Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten", "A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden", -"__language_name__" => "Deutsch (Förmlich: Sie)", +"__language_name__" => "Deutsch (Schweiz)", "Security Warning" => "Sicherheitshinweis", "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.", "Setup Warning" => "Einrichtungswarnung", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index 15511569a18..924792aa62b 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden", "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden", "Couldn't update app." => "Die App konnte nicht aktualisiert werden.", +"Wrong password" => "Falsches Passwort", +"No user supplied" => "Keinen Benutzer übermittelt", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können", +"Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.", +"Unable to change password" => "Passwort konnte nicht geändert werden", "Update to {appversion}" => "Update zu {appversion}", "Disable" => "Deaktivieren", "Enable" => "Aktivieren", diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php index edac1152100..abbc92709e5 100644 --- a/settings/l10n/en_GB.php +++ b/settings/l10n/en_GB.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Unable to add user to group %s", "Unable to remove user from group %s" => "Unable to remove user from group %s", "Couldn't update app." => "Couldn't update app.", +"Wrong password" => "Incorrect password", +"No user supplied" => "No user supplied", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Please provide an admin recovery password, otherwise all user data will be lost", +"Wrong admin recovery password. Please check the password and try again." => "Incorrect admin recovery password. Please check the password and try again.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end doesn't support password change, but the user's encryption key was successfully updated.", +"Unable to change password" => "Unable to change password", "Update to {appversion}" => "Update to {appversion}", "Disable" => "Disable", "Enable" => "Enable", @@ -47,7 +53,7 @@ $TRANSLATIONS = array( "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.", "Please double check the installation guides." => "Please double check the installation guides.", "Module 'fileinfo' missing" => "Module 'fileinfo' missing", -"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection.", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.", "Locale not working" => "Locale not working", "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.", "Internet connection not working" => "Internet connection not working", @@ -76,7 +82,7 @@ $TRANSLATIONS = array( "More" => "More", "Less" => "Less", "Version" => "Version", -"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Developed by the ownCloud community, the source code is licensed under the AGPL.", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Developed by the ownCloud community, the source code is licensed under the AGPL.", "Add your App" => "Add your App", "More Apps" => "More Apps", "Select an App" => "Select an App", diff --git a/settings/l10n/es.php b/settings/l10n/es.php index 027bd23c3e1..b20a4acb299 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "No se pudo añadir el usuario al grupo %s", "Unable to remove user from group %s" => "No se pudo eliminar al usuario del grupo %s", "Couldn't update app." => "No se pudo actualizar la aplicacion.", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor facilite una contraseña de recuperación de administrador, sino se perderán todos los datos de usuario", +"Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.", +"Unable to change password" => "No se ha podido cambiar la contraseña", "Update to {appversion}" => "Actualizado a {appversion}", "Disable" => "Desactivar", "Enable" => "Activar", @@ -27,6 +30,7 @@ $TRANSLATIONS = array( "Error" => "Error", "Update" => "Actualizar", "Updated" => "Actualizado", +"Select a profile picture" => "Seleccionar una imagen de perfil", "Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.", "Saving..." => "Guardando...", "deleted" => "Eliminado", @@ -101,7 +105,11 @@ $TRANSLATIONS = array( "Your email address" => "Su dirección de correo", "Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña", "Profile picture" => "Foto del perfil", +"Upload new" => "Subir nuevo", +"Select new from Files" => "Seleccionar nuevo desde Ficheros", +"Remove image" => "Borrar imagen", "Abort" => "Abortar", +"Choose as profile image" => "Seleccionar como imagen de perfil", "Language" => "Idioma", "Help translate" => "Ayúdanos a traducir", "WebDAV" => "WebDAV", diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php index 0a1b66e6ae6..a93ea817422 100644 --- a/settings/l10n/et_EE.php +++ b/settings/l10n/et_EE.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s", "Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s", "Couldn't update app." => "Rakenduse uuendamine ebaõnnestus.", +"Wrong password" => "Vale parool", +"No user supplied" => "Kasutajat ei sisestatud", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed", +"Wrong admin recovery password. Please check the password and try again." => "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.", +"Unable to change password" => "Ei suuda parooli muuta", "Update to {appversion}" => "Uuenda versioonile {appversion}", "Disable" => "Lülita välja", "Enable" => "Lülita sisse", diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php index 81ec9b483e9..d50dc87e014 100644 --- a/settings/l10n/fi_FI.php +++ b/settings/l10n/fi_FI.php @@ -16,6 +16,8 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Käyttäjän tai ryhmän %s lisääminen ei onnistu", "Unable to remove user from group %s" => "Käyttäjän poistaminen ryhmästä %s ei onnistu", "Couldn't update app." => "Sovelluksen päivitys epäonnistui.", +"Wrong password" => "Väärä salasana", +"Unable to change password" => "Salasanan vaihto ei onnistunut", "Update to {appversion}" => "Päivitä versioon {appversion}", "Disable" => "Poista käytöstä", "Enable" => "Käytä", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 6b1a829435c..55c0e7fe9a8 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -16,6 +16,9 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s", "Unable to remove user from group %s" => "Impossible de supprimer l'utilisateur du groupe %s", "Couldn't update app." => "Impossible de mettre à jour l'application", +"Wrong password" => "Mot de passe incorrect", +"No user supplied" => "Aucun utilisateur fourni", +"Unable to change password" => "Impossible de modifier le mot de passe", "Update to {appversion}" => "Mettre à jour vers {appversion}", "Disable" => "Désactiver", "Enable" => "Activer", diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php index e2537255fc8..62a2f7b8739 100644 --- a/settings/l10n/gl.php +++ b/settings/l10n/gl.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Non é posíbel engadir o usuario ao grupo %s", "Unable to remove user from group %s" => "Non é posíbel eliminar o usuario do grupo %s", "Couldn't update app." => "Non foi posíbel actualizar o aplicativo.", +"Wrong password" => "Contrasinal incorrecto", +"No user supplied" => "Non subministrado polo usuario", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario", +"Wrong admin recovery password. Please check the password and try again." => "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.", +"Unable to change password" => "Non é posíbel cambiar o contrasinal", "Update to {appversion}" => "Actualizar á {appversion}", "Disable" => "Desactivar", "Enable" => "Activar", diff --git a/settings/l10n/it.php b/settings/l10n/it.php index b06fc2a0f67..fc91bc5f170 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Impossibile aggiungere l'utente al gruppo %s", "Unable to remove user from group %s" => "Impossibile rimuovere l'utente dal gruppo %s", "Couldn't update app." => "Impossibile aggiornate l'applicazione.", +"Wrong password" => "Password errata", +"No user supplied" => "Non è stato fornito alcun utente", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.", +"Wrong admin recovery password. Please check the password and try again." => "Password amministrativa di ripristino errata. Controlla la password e prova ancora.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.", +"Unable to change password" => "Impossibile cambiare la password", "Update to {appversion}" => "Aggiorna a {appversion}", "Disable" => "Disabilita", "Enable" => "Abilita", diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php index 7d36468e1a5..6f3312fa78b 100644 --- a/settings/l10n/pt_BR.php +++ b/settings/l10n/pt_BR.php @@ -16,6 +16,12 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Não foi possível adicionar usuário ao grupo %s", "Unable to remove user from group %s" => "Não foi possível remover usuário do grupo %s", "Couldn't update app." => "Não foi possível atualizar a app.", +"Wrong password" => "Senha errada", +"No user supplied" => "Nenhum usuário fornecido", +"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos", +"Wrong admin recovery password. Please check the password and try again." => "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.", +"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....", +"Unable to change password" => "Impossível modificar senha", "Update to {appversion}" => "Atualizar para {appversion}", "Disable" => "Desabilitar", "Enable" => "Habilitar", diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php index cf0e66a24da..b664d2be3db 100644 --- a/settings/l10n/pt_PT.php +++ b/settings/l10n/pt_PT.php @@ -101,6 +101,7 @@ $TRANSLATIONS = array( "Your email address" => "O seu endereço de email", "Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave", "Profile picture" => "Foto do perfil", +"Abort" => "Abortar", "Language" => "Idioma", "Help translate" => "Ajude a traduzir", "WebDAV" => "WebDAV", diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index 40dbbd45009..7bcceb8b905 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -16,15 +16,21 @@ $TRANSLATIONS = array( "Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s", "Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s", "Couldn't update app." => "Невозможно обновить приложение", +"Wrong password" => "Неправильный пароль", +"Wrong admin recovery password. Please check the password and try again." => "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.", +"Unable to change password" => "Невозможно изменить пароль", "Update to {appversion}" => "Обновить до {версия приложения}", "Disable" => "Выключить", "Enable" => "Включить", "Please wait...." => "Подождите...", +"Error while disabling app" => "Ошибка отключения приложения", +"Error while enabling app" => "Ошибка включения приложения", "Updating...." => "Обновление...", "Error while updating app" => "Ошибка при обновлении приложения", "Error" => "Ошибка", "Update" => "Обновить", "Updated" => "Обновлено", +"Select a profile picture" => "Выберите картинку профиля", "Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.", "Saving..." => "Сохранение...", "deleted" => "удален", @@ -99,11 +105,20 @@ $TRANSLATIONS = array( "Your email address" => "Ваш адрес электронной почты", "Fill in an email address to enable password recovery" => "Введите адрес электронной почты чтобы появилась возможность восстановления пароля", "Profile picture" => "Фото профиля", +"Upload new" => "Закачать новую", +"Select new from Files" => "Выберите новый из файлов", +"Remove image" => "Удалить изображение", +"Either png or jpg. Ideally square but you will be able to crop it." => "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже.", +"Abort" => "Отмена", +"Choose as profile image" => "Выберите изображение профиля", "Language" => "Язык", "Help translate" => "Помочь с переводом", "WebDAV" => "WebDAV", "Use this address to access your Files via WebDAV" => "Используйте этот адрес чтобы получить доступ к вашим файлам через WebDav - ", "Encryption" => "Шифрование", +"The encryption app is no longer enabled, decrypt all your file" => "Приложение шифрования не активно, отмените шифрование всех ваших файлов.", +"Log-in password" => "Пароль входа", +"Decrypt all Files" => "Снять шифрование со всех файлов", "Login Name" => "Имя пользователя", "Create" => "Создать", "Admin Recovery Password" => "Восстановление Пароля Администратора", diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php index f23e665bb27..b89f710c280 100644 --- a/settings/l10n/sr@latin.php +++ b/settings/l10n/sr@latin.php @@ -3,8 +3,10 @@ $TRANSLATIONS = array( "Authentication error" => "Greška pri autentifikaciji", "Language changed" => "Jezik je izmenjen", "Invalid request" => "Neispravan zahtev", +"Error" => "Greška", "Groups" => "Grupe", "Delete" => "Obriši", +"Security Warning" => "Bezbednosno upozorenje", "Select an App" => "Izaberite program", "Password" => "Lozinka", "Unable to change your password" => "Ne mogu da izmenim vašu lozinku",