diff options
465 files changed, 1677 insertions, 2744 deletions
diff --git a/3rdparty b/3rdparty -Subproject 912a45c3458685a1105fba38a39a3a71c7348ed +Subproject dd0e7b6dcec142c790a6325b74a7c4fd3c6d723 diff --git a/apps/files/l10n/de_CH.js b/apps/files/l10n/de_CH.js deleted file mode 100644 index 05cec407e0b..00000000000 --- a/apps/files/l10n/de_CH.js +++ /dev/null @@ -1,58 +0,0 @@ -OC.L10N.register( - "files", - { - "Unknown error" : "Unbekannter Fehler", - "Could not move %s - File with this name already exists" : "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.", - "Could not move %s" : "Konnte %s nicht verschieben", - "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.", - "Unable to set upload directory." : "Das Upload-Verzeichnis konnte nicht gesetzt werden.", - "Invalid Token" : "Ungültiges Merkmal", - "No file was uploaded. Unknown error" : "Keine Datei hochgeladen. Unbekannter Fehler", - "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.", - "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini", - "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist grösser, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist", - "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden", - "No file was uploaded" : "Keine Datei konnte übertragen werden.", - "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.", - "Invalid directory." : "Ungültiges Verzeichnis.", - "Files" : "Dateien", - "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.", - "{new_name} already exists" : "{new_name} existiert bereits", - "Share" : "Teilen", - "Delete" : "Löschen", - "Unshare" : "Teilung aufheben", - "Delete permanently" : "Endgültig löschen", - "Rename" : "Umbenennen", - "Pending" : "Ausstehend", - "Error" : "Fehler", - "Name" : "Name", - "Size" : "Grösse", - "Modified" : "Geändert", - "_%n folder_::_%n folders_" : ["","%n Ordner"], - "_%n file_::_%n files_" : ["","%n Dateien"], - "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"], - "Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!", - "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)", - "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "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.", - "%s could not be renamed" : "%s konnte nicht umbenannt werden", - "File handling" : "Dateibehandlung", - "Maximum upload size" : "Maximale Upload-Grösse", - "max. possible: " : "maximal möglich:", - "Save" : "Speichern", - "WebDAV" : "WebDAV", - "New" : "Neu", - "Text file" : "Textdatei", - "New folder" : "Neues Verzeichnis", - "Folder" : "Ordner", - "From link" : "Von einem Link", - "Nothing in here. Upload something!" : "Alles leer. Laden Sie etwas hoch!", - "Download" : "Herunterladen", - "Upload too large" : "Der Upload ist zu gross", - "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.", - "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten." -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/de_CH.json b/apps/files/l10n/de_CH.json deleted file mode 100644 index 9ef3585f722..00000000000 --- a/apps/files/l10n/de_CH.json +++ /dev/null @@ -1,56 +0,0 @@ -{ "translations": { - "Unknown error" : "Unbekannter Fehler", - "Could not move %s - File with this name already exists" : "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.", - "Could not move %s" : "Konnte %s nicht verschieben", - "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.", - "Unable to set upload directory." : "Das Upload-Verzeichnis konnte nicht gesetzt werden.", - "Invalid Token" : "Ungültiges Merkmal", - "No file was uploaded. Unknown error" : "Keine Datei hochgeladen. Unbekannter Fehler", - "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.", - "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini", - "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist grösser, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist", - "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden", - "No file was uploaded" : "Keine Datei konnte übertragen werden.", - "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.", - "Invalid directory." : "Ungültiges Verzeichnis.", - "Files" : "Dateien", - "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.", - "{new_name} already exists" : "{new_name} existiert bereits", - "Share" : "Teilen", - "Delete" : "Löschen", - "Unshare" : "Teilung aufheben", - "Delete permanently" : "Endgültig löschen", - "Rename" : "Umbenennen", - "Pending" : "Ausstehend", - "Error" : "Fehler", - "Name" : "Name", - "Size" : "Grösse", - "Modified" : "Geändert", - "_%n folder_::_%n folders_" : ["","%n Ordner"], - "_%n file_::_%n files_" : ["","%n Dateien"], - "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"], - "Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!", - "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)", - "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "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.", - "%s could not be renamed" : "%s konnte nicht umbenannt werden", - "File handling" : "Dateibehandlung", - "Maximum upload size" : "Maximale Upload-Grösse", - "max. possible: " : "maximal möglich:", - "Save" : "Speichern", - "WebDAV" : "WebDAV", - "New" : "Neu", - "Text file" : "Textdatei", - "New folder" : "Neues Verzeichnis", - "Folder" : "Ordner", - "From link" : "Von einem Link", - "Nothing in here. Upload something!" : "Alles leer. Laden Sie etwas hoch!", - "Download" : "Herunterladen", - "Upload too large" : "Der Upload ist zu gross", - "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.", - "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten." -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files/l10n/hi_IN.js b/apps/files/l10n/hi_IN.js deleted file mode 100644 index 329844854f1..00000000000 --- a/apps/files/l10n/hi_IN.js +++ /dev/null @@ -1,8 +0,0 @@ -OC.L10N.register( - "files", - { - "_%n folder_::_%n folders_" : ["",""], - "_%n file_::_%n files_" : ["",""], - "_Uploading %n file_::_Uploading %n files_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/hi_IN.json b/apps/files/l10n/hi_IN.json deleted file mode 100644 index 37156658a86..00000000000 --- a/apps/files/l10n/hi_IN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ "translations": { - "_%n folder_::_%n folders_" : ["",""], - "_%n file_::_%n files_" : ["",""], - "_Uploading %n file_::_Uploading %n files_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files/l10n/sk.js b/apps/files/l10n/sk.js deleted file mode 100644 index 13c12b94967..00000000000 --- a/apps/files/l10n/sk.js +++ /dev/null @@ -1,12 +0,0 @@ -OC.L10N.register( - "files", - { - "Share" : "Zdieľať", - "Delete" : "Odstrániť", - "_%n folder_::_%n folders_" : ["","",""], - "_%n file_::_%n files_" : ["","",""], - "_Uploading %n file_::_Uploading %n files_" : ["","",""], - "Save" : "Uložiť", - "Download" : "Stiahnuť" -}, -"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files/l10n/sk.json b/apps/files/l10n/sk.json deleted file mode 100644 index 982ae3759b2..00000000000 --- a/apps/files/l10n/sk.json +++ /dev/null @@ -1,10 +0,0 @@ -{ "translations": { - "Share" : "Zdieľať", - "Delete" : "Odstrániť", - "_%n folder_::_%n folders_" : ["","",""], - "_%n file_::_%n files_" : ["","",""], - "_Uploading %n file_::_Uploading %n files_" : ["","",""], - "Save" : "Uložiť", - "Download" : "Stiahnuť" -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" -}
\ No newline at end of file diff --git a/apps/files/l10n/ur.js b/apps/files/l10n/ur.js deleted file mode 100644 index 0700689b60d..00000000000 --- a/apps/files/l10n/ur.js +++ /dev/null @@ -1,9 +0,0 @@ -OC.L10N.register( - "files", - { - "Error" : "خرابی", - "_%n folder_::_%n folders_" : ["",""], - "_%n file_::_%n files_" : ["",""], - "_Uploading %n file_::_Uploading %n files_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/ur.json b/apps/files/l10n/ur.json deleted file mode 100644 index c5fe11055db..00000000000 --- a/apps/files/l10n/ur.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "translations": { - "Error" : "خرابی", - "_%n folder_::_%n folders_" : ["",""], - "_%n file_::_%n files_" : ["",""], - "_Uploading %n file_::_Uploading %n files_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php index 3bccaca1231..48aed05823b 100644 --- a/apps/files/tests/ajax_rename.php +++ b/apps/files/tests/ajax_rename.php @@ -21,7 +21,7 @@ * */ -class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase { +class Test_OC_Files_App_Rename extends \Test\TestCase { private static $user; /** @@ -34,7 +34,6 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase { */ private $files; - /** @var \OC\Files\Storage\Storage */ private $originalStorage; protected function setUp() { diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php index 17be1770c33..da902f4f78a 100644 --- a/apps/files/tests/helper.php +++ b/apps/files/tests/helper.php @@ -11,7 +11,7 @@ use OCA\Files; /** * Class Test_Files_Helper */ -class Test_Files_Helper extends \PHPUnit_Framework_TestCase { +class Test_Files_Helper extends \Test\TestCase { private function makeFileInfo($name, $size, $mtime, $isDir = false) { return new \OC\Files\FileInfo( @@ -90,7 +90,7 @@ class Test_Files_Helper extends \PHPUnit_Framework_TestCase { $this->assertEquals( $expectedOrder, $fileNames - ); + ); } } diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 3a0a37c0a59..eadd2b64b80 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -263,6 +263,19 @@ class Hooks { }
}
+ /**
+ * after password reset we create a new key pair for the user
+ *
+ * @param array $params
+ */
+ public static function postPasswordReset($params) {
+ $uid = $params['uid'];
+ $password = $params['password'];
+
+ $util = new Util(new \OC\Files\View(), $uid);
+ $util->replaceUserKeys($password);
+ }
+
/*
* check if files can be encrypted to every user.
*/
diff --git a/apps/files_encryption/l10n/de_CH.js b/apps/files_encryption/l10n/de_CH.js deleted file mode 100644 index 1f5a01e6798..00000000000 --- a/apps/files_encryption/l10n/de_CH.js +++ /dev/null @@ -1,33 +0,0 @@ -OC.L10N.register( - "files_encryption", - { - "Unknown error" : "Unbekannter Fehler", - "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.", - "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!", - "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.", - "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.", - "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.", - "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.", - "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.", - "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.", - "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.", - "Missing requirements." : "Fehlende Voraussetzungen", - "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.", - "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:", - "Encryption" : "Verschlüsselung", - "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).", - "Recovery key password" : "Wiederherstellungschlüsselpasswort", - "Enabled" : "Aktiviert", - "Disabled" : "Deaktiviert", - "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern", - "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort", - "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ", - "Change Password" : "Passwort ändern", - " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.", - "Old log-in password" : "Altes Login-Passwort", - "Current log-in password" : "Momentanes Login-Passwort", - "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren", - "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:", - "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben." -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files_encryption/l10n/de_CH.json b/apps/files_encryption/l10n/de_CH.json deleted file mode 100644 index 244d0946bfe..00000000000 --- a/apps/files_encryption/l10n/de_CH.json +++ /dev/null @@ -1,31 +0,0 @@ -{ "translations": { - "Unknown error" : "Unbekannter Fehler", - "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.", - "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!", - "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.", - "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.", - "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.", - "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.", - "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.", - "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.", - "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.", - "Missing requirements." : "Fehlende Voraussetzungen", - "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.", - "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:", - "Encryption" : "Verschlüsselung", - "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).", - "Recovery key password" : "Wiederherstellungschlüsselpasswort", - "Enabled" : "Aktiviert", - "Disabled" : "Deaktiviert", - "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern", - "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort", - "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ", - "Change Password" : "Passwort ändern", - " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.", - "Old log-in password" : "Altes Login-Passwort", - "Current log-in password" : "Momentanes Login-Passwort", - "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren", - "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:", - "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben." -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php index 53c380ab2b3..7a50ade82f3 100644 --- a/apps/files_encryption/lib/helper.php +++ b/apps/files_encryption/lib/helper.php @@ -70,6 +70,7 @@ class Helper { \OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Encryption\Hooks', 'preDelete'); \OCP\Util::connectHook('OC_Filesystem', 'post_umount', 'OCA\Encryption\Hooks', 'postUmount'); \OCP\Util::connectHook('OC_Filesystem', 'umount', 'OCA\Encryption\Hooks', 'preUmount'); + \OCP\Util::connectHook('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', 'OCA\Encryption\Hooks', 'postPasswordReset'); } /** diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index c8697ae7c80..d12b003b227 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -125,6 +125,18 @@ class Util { } /** + * create a new public/private key pair for the user + * + * @param string $password password for the private key + */ + public function replaceUserKeys($password) { + $this->backupAllKeys('password_reset'); + $this->view->unlink($this->publicKeyPath); + $this->view->unlink($this->privateKeyPath); + $this->setupServerSide($password); + } + + /** * Sets up user folders and keys for serverside encryption * * @param string $passphrase to encrypt server-stored private key with diff --git a/apps/files_encryption/tests/migration.php b/apps/files_encryption/tests/migration.php index 80f30d4e793..8ca2e94c90a 100644 --- a/apps/files_encryption/tests/migration.php +++ b/apps/files_encryption/tests/migration.php @@ -23,16 +23,20 @@ use OCA\Encryption; use OCA\Files_Encryption\Migration; -class Test_Migration extends PHPUnit_Framework_TestCase { +class Test_Migration extends \Test\TestCase { - public function tearDown() { + protected function tearDown() { if (OC_DB::tableExists('encryption_test')) { OC_DB::dropTable('encryption_test'); } $this->assertTableNotExist('encryption_test'); + + parent::tearDown(); } - public function setUp() { + protected function setUp() { + parent::setUp(); + if (OC_DB::tableExists('encryption_test')) { OC_DB::dropTable('encryption_test'); } diff --git a/apps/files_external/l10n/de_CH.js b/apps/files_external/l10n/de_CH.js deleted file mode 100644 index b0039573097..00000000000 --- a/apps/files_external/l10n/de_CH.js +++ /dev/null @@ -1,28 +0,0 @@ -OC.L10N.register( - "files_external", - { - "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.", - "External storage" : "Externer Speicher", - "Local" : "Lokal", - "Location" : "Ort", - "Port" : "Port", - "Host" : "Host", - "Username" : "Benutzername", - "Password" : "Passwort", - "Share" : "Freigeben", - "URL" : "URL", - "Access granted" : "Zugriff gestattet", - "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox", - "Grant access" : "Zugriff gestatten", - "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive", - "Personal" : "Persönlich", - "Saved" : "Gespeichert", - "Name" : "Name", - "External Storage" : "Externer Speicher", - "Folder name" : "Ordnername", - "Configuration" : "Konfiguration", - "Add storage" : "Speicher hinzufügen", - "Delete" : "Löschen", - "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files_external/l10n/de_CH.json b/apps/files_external/l10n/de_CH.json deleted file mode 100644 index 955fae07f5b..00000000000 --- a/apps/files_external/l10n/de_CH.json +++ /dev/null @@ -1,26 +0,0 @@ -{ "translations": { - "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.", - "External storage" : "Externer Speicher", - "Local" : "Lokal", - "Location" : "Ort", - "Port" : "Port", - "Host" : "Host", - "Username" : "Benutzername", - "Password" : "Passwort", - "Share" : "Freigeben", - "URL" : "URL", - "Access granted" : "Zugriff gestattet", - "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox", - "Grant access" : "Zugriff gestatten", - "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive", - "Personal" : "Persönlich", - "Saved" : "Gespeichert", - "Name" : "Name", - "External Storage" : "Externer Speicher", - "Folder name" : "Ordnername", - "Configuration" : "Konfiguration", - "Add storage" : "Speicher hinzufügen", - "Delete" : "Löschen", - "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files_external/l10n/sk.js b/apps/files_external/l10n/sk.js deleted file mode 100644 index edae863703d..00000000000 --- a/apps/files_external/l10n/sk.js +++ /dev/null @@ -1,9 +0,0 @@ -OC.L10N.register( - "files_external", - { - "Location" : "Poloha", - "Share" : "Zdieľať", - "Personal" : "Osobné", - "Delete" : "Odstrániť" -}, -"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_external/l10n/sk.json b/apps/files_external/l10n/sk.json deleted file mode 100644 index 4d6a95caf3c..00000000000 --- a/apps/files_external/l10n/sk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "translations": { - "Location" : "Poloha", - "Share" : "Zdieľať", - "Personal" : "Osobné", - "Delete" : "Odstrániť" -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" -}
\ No newline at end of file diff --git a/apps/files_external/l10n/sk.php b/apps/files_external/l10n/sk.php deleted file mode 100644 index 9418c949228..00000000000 --- a/apps/files_external/l10n/sk.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -$TRANSLATIONS = array( -"Location" => "Poloha", -"Share" => "Zdieľať", -"Personal" => "Osobné", -"Delete" => "Odstrániť" -); -$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index fa44e446d96..9400bbdedc0 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -121,6 +121,14 @@ class OC_Mount_Config { if ($data['user']) { $user = \OC::$server->getUserManager()->get($data['user']); + if (!$user) { + \OC_Log::write( + 'files_external', + 'Cannot init external mount points for non-existant user "' . $data['user'] . '".', + \OC_Log::WARN + ); + return; + } $userView = new \OC\Files\View('/' . $user->getUID() . '/files'); $changePropagator = new \OC\Files\Cache\ChangePropagator($userView); $etagPropagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, \OC::$server->getConfig()); diff --git a/apps/files_external/tests/amazons3.php b/apps/files_external/tests/amazons3.php index 8eaece6dad9..fbb8744bd8d 100644 --- a/apps/files_external/tests/amazons3.php +++ b/apps/files_external/tests/amazons3.php @@ -28,7 +28,9 @@ class AmazonS3 extends Storage { private $config; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->config = include('files_external/tests/config.php'); if ( ! is_array($this->config) or ! isset($this->config['amazons3']) or ! $this->config['amazons3']['run']) { $this->markTestSkipped('AmazonS3 backend not configured'); @@ -36,10 +38,12 @@ class AmazonS3 extends Storage { $this->instance = new \OC\Files\Storage\AmazonS3($this->config['amazons3']); } - public function tearDown() { + protected function tearDown() { if ($this->instance) { $this->instance->rmdir(''); } + + parent::tearDown(); } public function testStat() { diff --git a/apps/files_external/tests/amazons3migration.php b/apps/files_external/tests/amazons3migration.php index 629cf5cfa3c..145213f5293 100644 --- a/apps/files_external/tests/amazons3migration.php +++ b/apps/files_external/tests/amazons3migration.php @@ -23,15 +23,26 @@ namespace Test\Files\Storage; -class AmazonS3Migration extends \PHPUnit_Framework_TestCase { +class AmazonS3Migration extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage instance */ protected $instance; - public function setUp () { - $uuid = uniqid(); + /** @var array */ + protected $params; + + /** @var string */ + protected $oldId; + + /** @var string */ + protected $newId; + + protected function setUp() { + parent::setUp(); + + $uuid = $this->getUniqueID(); $this->params['key'] = 'key'.$uuid; $this->params['secret'] = 'secret'.$uuid; @@ -41,9 +52,11 @@ class AmazonS3Migration extends \PHPUnit_Framework_TestCase { $this->newId = 'amazon::' . $this->params['bucket']; } - public function tearDown () { + protected function tearDown() { $this->deleteStorage($this->oldId); $this->deleteStorage($this->newId); + + parent::tearDown(); } public function testUpdateLegacyOnlyId () { diff --git a/apps/files_external/tests/dropbox.php b/apps/files_external/tests/dropbox.php index 4b052282019..3f25d5a31e8 100644 --- a/apps/files_external/tests/dropbox.php +++ b/apps/files_external/tests/dropbox.php @@ -11,8 +11,10 @@ namespace Test\Files\Storage; class Dropbox extends Storage { private $config; - public function setUp() { - $id = uniqid(); + protected function setUp() { + parent::setUp(); + + $id = $this->getUniqueID(); $this->config = include('files_external/tests/config.php'); if ( ! is_array($this->config) or ! isset($this->config['dropbox']) or ! $this->config['dropbox']['run']) { $this->markTestSkipped('Dropbox backend not configured'); @@ -21,6 +23,14 @@ class Dropbox extends Storage { $this->instance = new \OC\Files\Storage\Dropbox($this->config['dropbox']); } + protected function tearDown() { + if ($this->instance) { + $this->instance->unlink('/'); + } + + parent::tearDown(); + } + public function directoryProvider() { // doesn't support leading/trailing spaces return array(array('folder')); @@ -36,10 +46,4 @@ class Dropbox extends Storage { // false because not supported $this->assertFalse($this->instance->touch('foo')); } - - public function tearDown() { - if ($this->instance) { - $this->instance->unlink('/'); - } - } } diff --git a/apps/files_external/tests/dynamicmountconfig.php b/apps/files_external/tests/dynamicmountconfig.php index 650299075e6..eef2a896b3a 100644 --- a/apps/files_external/tests/dynamicmountconfig.php +++ b/apps/files_external/tests/dynamicmountconfig.php @@ -36,7 +36,7 @@ class Test_Mount_Config_Dummy_Backend { /** * Class Test_Dynamic_Mount_Config */ -class Test_Dynamic_Mount_Config extends \PHPUnit_Framework_TestCase { +class Test_Dynamic_Mount_Config extends \Test\TestCase { private $backup; @@ -82,6 +82,7 @@ class Test_Dynamic_Mount_Config extends \PHPUnit_Framework_TestCase { } protected function setUp() { + parent::setUp(); $this->backup = OC_Mount_Config::setUp(); @@ -97,5 +98,6 @@ class Test_Dynamic_Mount_Config extends \PHPUnit_Framework_TestCase { protected function tearDown() { OC_Mount_Config::setUp($this->backup); + parent::tearDown(); } } diff --git a/apps/files_external/tests/etagpropagator.php b/apps/files_external/tests/etagpropagator.php index 7fa1863f962..84b687d18e4 100644 --- a/apps/files_external/tests/etagpropagator.php +++ b/apps/files_external/tests/etagpropagator.php @@ -11,9 +11,9 @@ namespace Tests\Files_External; use OC\Files\Filesystem; use OC\User\User; -class EtagPropagator extends \PHPUnit_Framework_TestCase { +class EtagPropagator extends \Test\TestCase { protected function getUser() { - return new User(uniqid(), null); + return new User($this->getUniqueID(), null); } /** diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php index 3037793120a..842b7f43fa8 100644 --- a/apps/files_external/tests/ftp.php +++ b/apps/files_external/tests/ftp.php @@ -11,8 +11,10 @@ namespace Test\Files\Storage; class FTP extends Storage { private $config; - public function setUp() { - $id = uniqid(); + protected function setUp() { + parent::setUp(); + + $id = $this->getUniqueID(); $this->config = include('files_external/tests/config.php'); if ( ! is_array($this->config) or ! isset($this->config['ftp']) or ! $this->config['ftp']['run']) { $this->markTestSkipped('FTP backend not configured'); @@ -22,10 +24,12 @@ class FTP extends Storage { $this->instance->mkdir('/'); } - public function tearDown() { + protected function tearDown() { if ($this->instance) { \OCP\Files::rmdirr($this->instance->constructUrl('')); } + + parent::tearDown(); } public function testConstructUrl(){ diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php index d5495d49c5e..79023fac9e1 100644 --- a/apps/files_external/tests/google.php +++ b/apps/files_external/tests/google.php @@ -28,6 +28,8 @@ class Google extends Storage { private $config; protected function setUp() { + parent::setUp(); + $this->config = include('files_external/tests/config.php'); if (!is_array($this->config) || !isset($this->config['google']) || !$this->config['google']['run'] @@ -41,5 +43,7 @@ class Google extends Storage { if ($this->instance) { $this->instance->rmdir('/'); } + + parent::tearDown(); } } diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php index c11e48b82f3..ab65e648643 100644 --- a/apps/files_external/tests/mountconfig.php +++ b/apps/files_external/tests/mountconfig.php @@ -65,7 +65,7 @@ class Test_Mount_Config_Hook_Test { /** * Class Test_Mount_Config */ -class Test_Mount_Config extends \PHPUnit_Framework_TestCase { +class Test_Mount_Config extends \Test\TestCase { private $dataDir; private $userHome; @@ -79,7 +79,9 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase { const TEST_GROUP2 = 'group2'; const TEST_GROUP2B = 'group2b'; - public function setUp() { + protected function setUp() { + parent::setUp(); + \OC_User::createUser(self::TEST_USER1, self::TEST_USER1); \OC_User::createUser(self::TEST_USER2, self::TEST_USER2); @@ -116,7 +118,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase { Test_Mount_Config_Hook_Test::setupHooks(); } - public function tearDown() { + protected function tearDown() { Test_Mount_Config_Hook_Test::clear(); OC_Mount_Config::$skipTest = false; @@ -134,6 +136,8 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase { 'user_mounting_backends', $this->oldAllowedBackends ); + + parent::tearDown(); } /** diff --git a/apps/files_external/tests/owncloud.php b/apps/files_external/tests/owncloud.php index 408a55864f2..ab9101cfe5f 100644 --- a/apps/files_external/tests/owncloud.php +++ b/apps/files_external/tests/owncloud.php @@ -12,8 +12,10 @@ class OwnCloud extends Storage { private $config; - public function setUp() { - $id = uniqid(); + protected function setUp() { + parent::setUp(); + + $id = $this->getUniqueID(); $this->config = include('files_external/tests/config.php'); if ( ! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) { $this->markTestSkipped('ownCloud backend not configured'); @@ -23,9 +25,11 @@ class OwnCloud extends Storage { $this->instance->mkdir('/'); } - public function tearDown() { + protected function tearDown() { if ($this->instance) { $this->instance->rmdir('/'); } + + parent::tearDown(); } } diff --git a/apps/files_external/tests/owncloudfunctions.php b/apps/files_external/tests/owncloudfunctions.php index 57608fff0cf..8232f30a5e2 100644 --- a/apps/files_external/tests/owncloudfunctions.php +++ b/apps/files_external/tests/owncloudfunctions.php @@ -8,7 +8,7 @@ namespace Test\Files\Storage; -class OwnCloudFunctions extends \PHPUnit_Framework_TestCase { +class OwnCloudFunctions extends \Test\TestCase { function configUrlProvider() { return array( diff --git a/apps/files_external/tests/sftp.php b/apps/files_external/tests/sftp.php index efea7f075ff..703b37d93f1 100644 --- a/apps/files_external/tests/sftp.php +++ b/apps/files_external/tests/sftp.php @@ -25,8 +25,10 @@ namespace Test\Files\Storage; class SFTP extends Storage { private $config; - public function setUp() { - $id = uniqid(); + protected function setUp() { + parent::setUp(); + + $id = $this->getUniqueID(); $this->config = include('files_external/tests/config.php'); if ( ! is_array($this->config) or ! isset($this->config['sftp']) or ! $this->config['sftp']['run']) { $this->markTestSkipped('SFTP backend not configured'); @@ -36,9 +38,11 @@ class SFTP extends Storage { $this->instance->mkdir('/'); } - public function tearDown() { + protected function tearDown() { if ($this->instance) { $this->instance->rmdir('/'); } + + parent::tearDown(); } } diff --git a/apps/files_external/tests/smb.php b/apps/files_external/tests/smb.php index 199e35af676..9e5ab2b331f 100644 --- a/apps/files_external/tests/smb.php +++ b/apps/files_external/tests/smb.php @@ -12,8 +12,10 @@ class SMB extends Storage { private $config; - public function setUp() { - $id = uniqid(); + protected function setUp() { + parent::setUp(); + + $id = $this->getUniqueID(); $this->config = include('files_external/tests/config.php'); if (!is_array($this->config) or !isset($this->config['smb']) or !$this->config['smb']['run']) { $this->markTestSkipped('Samba backend not configured'); @@ -23,10 +25,12 @@ class SMB extends Storage { $this->instance->mkdir('/'); } - public function tearDown() { + protected function tearDown() { if ($this->instance) { \OCP\Files::rmdirr($this->instance->constructUrl('')); } + + parent::tearDown(); } public function directoryProvider() { diff --git a/apps/files_external/tests/smbfunctions.php b/apps/files_external/tests/smbfunctions.php index 749906d0136..cf9f7cb20fe 100644 --- a/apps/files_external/tests/smbfunctions.php +++ b/apps/files_external/tests/smbfunctions.php @@ -8,10 +8,11 @@ namespace Test\Files\Storage; -class SMBFunctions extends \PHPUnit_Framework_TestCase { +class SMBFunctions extends \Test\TestCase { + + protected function setUp() { + parent::setUp(); - public function setUp() { - $id = uniqid(); // dummy config $this->config = array( 'run'=>false, @@ -25,9 +26,6 @@ class SMBFunctions extends \PHPUnit_Framework_TestCase { $this->instance = new \OC\Files\Storage\SMB($this->config); } - public function tearDown() { - } - public function testGetId() { $this->assertEquals('smb::test@smbhost//sharename//rootdir/', $this->instance->getId()); } diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php index 3918497ebfa..d2c884a8b4c 100644 --- a/apps/files_external/tests/swift.php +++ b/apps/files_external/tests/swift.php @@ -26,7 +26,9 @@ class Swift extends Storage { private $config; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->config = include('files_external/tests/config.php'); if (!is_array($this->config) or !isset($this->config['swift']) or !$this->config['swift']['run']) { @@ -35,7 +37,7 @@ class Swift extends Storage { $this->instance = new \OC\Files\Storage\Swift($this->config['swift']); } - public function tearDown() { + protected function tearDown() { if ($this->instance) { $connection = $this->instance->getConnection(); $container = $connection->getContainer($this->config['swift']['bucket']); @@ -48,5 +50,7 @@ class Swift extends Storage { $container->delete(); } + + parent::tearDown(); } } diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php index 74e905ccc89..5f53568b91a 100644 --- a/apps/files_external/tests/webdav.php +++ b/apps/files_external/tests/webdav.php @@ -12,8 +12,10 @@ class DAV extends Storage { private $config; - public function setUp() { - $id = uniqid(); + protected function setUp() { + parent::setUp(); + + $id = $this->getUniqueID(); $this->config = include('files_external/tests/config.php'); if ( ! is_array($this->config) or ! isset($this->config['webdav']) or ! $this->config['webdav']['run']) { $this->markTestSkipped('WebDAV backend not configured'); @@ -26,9 +28,11 @@ class DAV extends Storage { $this->instance->mkdir('/'); } - public function tearDown() { + protected function tearDown() { if ($this->instance) { $this->instance->rmdir('/'); } + + parent::tearDown(); } } diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js index 5869d7f77f7..7a7c24993c0 100644 --- a/apps/files_sharing/js/sharedfilelist.js +++ b/apps/files_sharing/js/sharedfilelist.js @@ -103,7 +103,11 @@ }, getDirectoryPermissions: function() { - return OC.PERMISSION_READ | OC.PERMISSION_DELETE; + var perms = OC.PERMISSION_READ; + if (this._sharedWithUser) { + perms |= OC.PERMISSION_DELETE; + } + return perms; }, updateStorageStatistics: function() { @@ -203,7 +207,11 @@ } file.name = OC.basename(share.path); file.path = OC.dirname(share.path); - file.permissions = OC.PERMISSION_ALL; + if (this._sharedWithUser) { + file.permissions = OC.PERMISSION_ALL; + } else { + file.permissions = OC.PERMISSION_ALL - OC.PERMISSION_DELETE; + } if (file.path) { file.extraData = share.path; } diff --git a/apps/files_sharing/l10n/de_CH.js b/apps/files_sharing/l10n/de_CH.js deleted file mode 100644 index 2cdb3d47c69..00000000000 --- a/apps/files_sharing/l10n/de_CH.js +++ /dev/null @@ -1,17 +0,0 @@ -OC.L10N.register( - "files_sharing", - { - "Cancel" : "Abbrechen", - "Shared by" : "Geteilt von", - "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.", - "Password" : "Passwort", - "Name" : "Name", - "Sorry, this link doesn’t seem to work anymore." : "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.", - "Reasons might be:" : "Gründe könnten sein:", - "the item was removed" : "Das Element wurde entfernt", - "the link expired" : "Der Link ist abgelaufen", - "sharing is disabled" : "Teilen ist deaktiviert", - "For more info, please ask the person who sent this link." : "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.", - "Download" : "Herunterladen" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de_CH.json b/apps/files_sharing/l10n/de_CH.json deleted file mode 100644 index a161e06bae8..00000000000 --- a/apps/files_sharing/l10n/de_CH.json +++ /dev/null @@ -1,15 +0,0 @@ -{ "translations": { - "Cancel" : "Abbrechen", - "Shared by" : "Geteilt von", - "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.", - "Password" : "Passwort", - "Name" : "Name", - "Sorry, this link doesn’t seem to work anymore." : "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.", - "Reasons might be:" : "Gründe könnten sein:", - "the item was removed" : "Das Element wurde entfernt", - "the link expired" : "Der Link ist abgelaufen", - "sharing is disabled" : "Teilen ist deaktiviert", - "For more info, please ask the person who sent this link." : "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.", - "Download" : "Herunterladen" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sk.js b/apps/files_sharing/l10n/sk.js deleted file mode 100644 index aa385851497..00000000000 --- a/apps/files_sharing/l10n/sk.js +++ /dev/null @@ -1,7 +0,0 @@ -OC.L10N.register( - "files_sharing", - { - "Cancel" : "Zrušiť", - "Download" : "Stiahnuť" -}, -"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_sharing/l10n/sk.json b/apps/files_sharing/l10n/sk.json deleted file mode 100644 index 65bbffa4191..00000000000 --- a/apps/files_sharing/l10n/sk.json +++ /dev/null @@ -1,5 +0,0 @@ -{ "translations": { - "Cancel" : "Zrušiť", - "Download" : "Stiahnuť" -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" -}
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sk.php b/apps/files_sharing/l10n/sk.php deleted file mode 100644 index bc251c7fd59..00000000000 --- a/apps/files_sharing/l10n/sk.php +++ /dev/null @@ -1,6 +0,0 @@ -<?php -$TRANSLATIONS = array( -"Cancel" => "Zrušiť", -"Download" => "Stiahnuť" -); -$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files_sharing/lib/connector/publicauth.php b/apps/files_sharing/lib/connector/publicauth.php index c9d545180b3..4144dafa379 100644 --- a/apps/files_sharing/lib/connector/publicauth.php +++ b/apps/files_sharing/lib/connector/publicauth.php @@ -48,12 +48,26 @@ class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic { if (isset($linkItem['share_with'])) { if ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_LINK) { // Check Password - $forcePortable = (CRYPT_BLOWFISH != 1); - $hasher = new \PasswordHash(8, $forcePortable); - if (!$hasher->CheckPassword($password . $this->config->getSystemValue('passwordsalt', ''), $linkItem['share_with'])) { - return false; - } else { + $newHash = ''; + if(\OC::$server->getHasher()->verify($password, $linkItem['share_with'], $newHash)) { + /** + * FIXME: Migrate old hashes to new hash format + * Due to the fact that there is no reasonable functionality to update the password + * of an existing share no migration is yet performed there. + * The only possibility is to update the existing share which will result in a new + * share ID and is a major hack. + * + * In the future the migration should be performed once there is a proper method + * to update the share's password. (for example `$share->updatePassword($password)` + * + * @link https://github.com/owncloud/core/issues/10671 + */ + if(!empty($newHash)) { + + } return true; + } else { + return false; } } else { return false; diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php index e5fd0f401c2..552d9164344 100644 --- a/apps/files_sharing/lib/controllers/sharecontroller.php +++ b/apps/files_sharing/lib/controllers/sharecontroller.php @@ -99,6 +99,7 @@ class ShareController extends Controller { /** * @PublicPage + * @UseSession * * Authenticates against password-protected shares * @param $token diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php index 3a2d51cddb7..f7204a8db8f 100644 --- a/apps/files_sharing/lib/helper.php +++ b/apps/files_sharing/lib/helper.php @@ -3,7 +3,6 @@ namespace OCA\Files_Sharing; use OC_Config; -use PasswordHash; class Helper { @@ -99,14 +98,28 @@ class Helper { if ($password !== null) { if ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_LINK) { // Check Password - $forcePortable = (CRYPT_BLOWFISH != 1); - $hasher = new PasswordHash(8, $forcePortable); - if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), - $linkItem['share_with']))) { - return false; - } else { + $newHash = ''; + if(\OC::$server->getHasher()->verify($password, $linkItem['share_with'], $newHash)) { // Save item id in session for future requests \OC::$server->getSession()->set('public_link_authenticated', $linkItem['id']); + + /** + * FIXME: Migrate old hashes to new hash format + * Due to the fact that there is no reasonable functionality to update the password + * of an existing share no migration is yet performed there. + * The only possibility is to update the existing share which will result in a new + * share ID and is a major hack. + * + * In the future the migration should be performed once there is a proper method + * to update the share's password. (for example `$share->updatePassword($password)` + * + * @link https://github.com/owncloud/core/issues/10671 + */ + if(!empty($newHash)) { + + } + } else { + return false; } } else { \OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type'] diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php index 453133fee31..e550dcc27db 100644 --- a/apps/files_sharing/tests/api.php +++ b/apps/files_sharing/tests/api.php @@ -32,7 +32,7 @@ class Test_Files_Sharing_Api extends TestCase { private static $tempStorage; - function setUp() { + protected function setUp() { parent::setUp(); \OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no'); @@ -53,7 +53,7 @@ class Test_Files_Sharing_Api extends TestCase { $this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data); } - function tearDown() { + protected function tearDown() { if($this->view instanceof \OC\Files\View) { $this->view->unlink($this->filename); $this->view->deleteAll($this->folder); diff --git a/apps/files_sharing/tests/backend.php b/apps/files_sharing/tests/backend.php index e113c940678..5cf2a22c792 100644 --- a/apps/files_sharing/tests/backend.php +++ b/apps/files_sharing/tests/backend.php @@ -34,7 +34,7 @@ class Test_Files_Sharing_Backend extends TestCase { public $subfolder; public $subsubfolder; - function setUp() { + protected function setUp() { parent::setUp(); $this->folder = self::TEST_FOLDER_NAME; @@ -53,7 +53,7 @@ class Test_Files_Sharing_Backend extends TestCase { $this->view->file_put_contents($this->folder . $this->subfolder . $this->subsubfolder . $this->filename, $this->data); } - function tearDown() { + protected function tearDown() { $this->view->unlink($this->filename); $this->view->deleteAll($this->folder); diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php index 0e96f5a4e09..b6a44f464f9 100644 --- a/apps/files_sharing/tests/cache.php +++ b/apps/files_sharing/tests/cache.php @@ -42,7 +42,7 @@ class Test_Files_Sharing_Cache extends TestCase { /** @var \OC\Files\Storage\Storage */ protected $sharedStorage; - function setUp() { + protected function setUp() { parent::setUp(); \OC_User::setDisplayName(self::TEST_FILES_SHARING_API_USER1, 'User One'); @@ -88,7 +88,7 @@ class Test_Files_Sharing_Cache extends TestCase { $this->sharedCache = $this->sharedStorage->getCache(); } - function tearDown() { + protected function tearDown() { $this->sharedCache->clear(); self::loginHelper(self::TEST_FILES_SHARING_API_USER1); diff --git a/apps/files_sharing/tests/externalstorage.php b/apps/files_sharing/tests/externalstorage.php index 0c741bb8199..cf82fcfc555 100644 --- a/apps/files_sharing/tests/externalstorage.php +++ b/apps/files_sharing/tests/externalstorage.php @@ -23,7 +23,7 @@ /** * Tests for the external Storage class for remote shares. */ -class Test_Files_Sharing_External_Storage extends \PHPUnit_Framework_TestCase { +class Test_Files_Sharing_External_Storage extends \Test\TestCase { function optionsProvider() { return array( diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js index 812f30d75db..dc6931af6e8 100644 --- a/apps/files_sharing/tests/js/sharedfilelistSpec.js +++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js @@ -91,7 +91,7 @@ describe('OCA.Sharing.FileList tests', function() { file_source: 49, file_target: '/local path/local name.txt', path: 'files/something shared.txt', - permissions: 31, + permissions: OC.PERMISSION_ALL, stime: 11111, share_type: OC.Share.SHARE_TYPE_USER, share_with: 'user1', @@ -127,7 +127,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-file')).toEqual('local name.txt'); expect($tr.attr('data-path')).toEqual('/local path'); expect($tr.attr('data-size')).not.toBeDefined(); - expect($tr.attr('data-permissions')).toEqual('31'); // read and delete + expect(parseInt($tr.attr('data-permissions'), 10)) + .toEqual(OC.PERMISSION_ALL); // read and delete expect($tr.attr('data-mime')).toEqual('text/plain'); expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-owner')).toEqual('User Two'); @@ -169,7 +170,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-file')).toEqual('local name'); expect($tr.attr('data-path')).toEqual('/local path'); expect($tr.attr('data-size')).not.toBeDefined(); - expect($tr.attr('data-permissions')).toEqual('31'); // read and delete + expect(parseInt($tr.attr('data-permissions'), 10)) + .toEqual(OC.PERMISSION_ALL); // read and delete expect($tr.attr('data-mime')).toEqual('httpd/unix-directory'); expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-owner')).toEqual('User Two'); @@ -244,7 +246,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-file')).toEqual('local name.txt'); expect($tr.attr('data-path')).toEqual('/local path'); expect($tr.attr('data-size')).not.toBeDefined(); - expect($tr.attr('data-permissions')).toEqual('31'); // read and delete + expect(parseInt($tr.attr('data-permissions'), 10)) + .toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read expect($tr.attr('data-mime')).toEqual('text/plain'); expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-owner')).not.toBeDefined(); @@ -285,7 +288,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-file')).toEqual('local name'); expect($tr.attr('data-path')).toEqual('/local path'); expect($tr.attr('data-size')).not.toBeDefined(); - expect($tr.attr('data-permissions')).toEqual('31'); // read and delete + expect(parseInt($tr.attr('data-permissions'), 10)) + .toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read expect($tr.attr('data-mime')).toEqual('httpd/unix-directory'); expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-owner')).not.toBeDefined(); @@ -336,7 +340,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-file')).toEqual('local name.txt'); expect($tr.attr('data-path')).toEqual('/local path'); expect($tr.attr('data-size')).not.toBeDefined(); - expect($tr.attr('data-permissions')).toEqual('31'); // read and delete + expect(parseInt($tr.attr('data-permissions'), 10)) + .toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read expect($tr.attr('data-mime')).toEqual('text/plain'); expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-owner')).not.toBeDefined(); @@ -404,7 +409,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-file')).toEqual('local name.txt'); expect($tr.attr('data-path')).toEqual('/local path'); expect($tr.attr('data-size')).not.toBeDefined(); - expect($tr.attr('data-permissions')).toEqual('31'); // read and delete + expect(parseInt($tr.attr('data-permissions'), 10)) + .toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read expect($tr.attr('data-mime')).toEqual('text/plain'); // always use the most recent stime expect($tr.attr('data-mtime')).toEqual('22222000'); @@ -430,6 +436,7 @@ describe('OCA.Sharing.FileList tests', function() { fileList.reload(); + /* jshint camelcase: false */ ocsResponse = { ocs: { meta: { @@ -496,7 +503,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-file')).toEqual('local name.txt'); expect($tr.attr('data-path')).toEqual('/local path'); expect($tr.attr('data-size')).not.toBeDefined(); - expect($tr.attr('data-permissions')).toEqual('31'); // read and delete + expect(parseInt($tr.attr('data-permissions'), 10)) + .toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read expect($tr.attr('data-mime')).toEqual('text/plain'); expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-recipients')).not.toBeDefined(); @@ -537,7 +545,8 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.attr('data-file')).toEqual('local name.txt'); expect($tr.attr('data-path')).toEqual('/local path'); expect($tr.attr('data-size')).not.toBeDefined(); - expect($tr.attr('data-permissions')).toEqual('31'); // read and delete + expect(parseInt($tr.attr('data-permissions'), 10)) + .toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read expect($tr.attr('data-mime')).toEqual('text/plain'); expect($tr.attr('data-mtime')).toEqual('11111000'); expect($tr.attr('data-share-recipients')).not.toBeDefined(); @@ -633,7 +642,8 @@ describe('OCA.Sharing.FileList tests', function() { }]); $tr = fileList.$el.find('tr:first'); - expect(parseInt($tr.attr('data-share-permissions'), 10)).toEqual(OC.PERMISSION_ALL - OC.PERMISSION_SHARE - OC.PERMISSION_DELETE); + expect(parseInt($tr.attr('data-share-permissions'), 10)) + .toEqual(OC.PERMISSION_ALL - OC.PERMISSION_SHARE - OC.PERMISSION_DELETE); }); }); }); diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php index 639ebfb5936..f72d724c6fe 100644 --- a/apps/files_sharing/tests/permissions.php +++ b/apps/files_sharing/tests/permissions.php @@ -61,7 +61,7 @@ class Test_Files_Sharing_Permissions extends OCA\Files_sharing\Tests\TestCase { */ private $ownerCache; - function setUp() { + protected function setUp() { parent::setUp(); self::loginHelper(self::TEST_FILES_SHARING_API_USER1); @@ -99,7 +99,7 @@ class Test_Files_Sharing_Permissions extends OCA\Files_sharing\Tests\TestCase { $this->sharedCacheRestrictedShare = $this->sharedStorageRestrictedShare->getCache(); } - function tearDown() { + protected function tearDown() { $this->sharedCache->clear(); self::loginHelper(self::TEST_FILES_SHARING_API_USER1); diff --git a/apps/files_sharing/tests/proxy.php b/apps/files_sharing/tests/proxy.php index 68cd81f963a..31acf9b27de 100644 --- a/apps/files_sharing/tests/proxy.php +++ b/apps/files_sharing/tests/proxy.php @@ -32,7 +32,7 @@ class Test_Files_Sharing_Proxy extends OCA\Files_sharing\Tests\TestCase { private static $tempStorage; - function setUp() { + protected function setUp() { parent::setUp(); // load proxies @@ -53,7 +53,7 @@ class Test_Files_Sharing_Proxy extends OCA\Files_sharing\Tests\TestCase { $this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data); } - function tearDown() { + protected function tearDown() { $this->view->deleteAll($this->folder); self::$tempStorage = null; diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php index 2b5978f8e57..4318d3c510e 100644 --- a/apps/files_sharing/tests/share.php +++ b/apps/files_sharing/tests/share.php @@ -31,7 +31,7 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase { private static $tempStorage; - function setUp() { + protected function setUp() { parent::setUp(); $this->folder = self::TEST_FOLDER_NAME; @@ -49,7 +49,7 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase { $this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data); } - function tearDown() { + protected function tearDown() { $this->view->unlink($this->filename); $this->view->deleteAll($this->folder); diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php index 6d155f174ba..dd66ca05d38 100644 --- a/apps/files_sharing/tests/sharedmount.php +++ b/apps/files_sharing/tests/sharedmount.php @@ -25,7 +25,7 @@ */ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase { - function setUp() { + protected function setUp() { parent::setUp(); $this->folder = '/folder_share_storage_test'; @@ -40,7 +40,7 @@ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase { $this->view->file_put_contents($this->folder . $this->filename, "file in subfolder"); } - function tearDown() { + protected function tearDown() { $this->view->unlink($this->folder); $this->view->unlink($this->filename); diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php index ab15e8fe3ba..75373244508 100644 --- a/apps/files_sharing/tests/sharedstorage.php +++ b/apps/files_sharing/tests/sharedstorage.php @@ -27,7 +27,7 @@ use OCA\Files\Share; */ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase { - function setUp() { + protected function setUp() { parent::setUp(); $this->folder = '/folder_share_storage_test'; @@ -42,7 +42,7 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase { $this->view->file_put_contents($this->folder . $this->filename, "file in subfolder"); } - function tearDown() { + protected function tearDown() { $this->view->unlink($this->folder); $this->view->unlink($this->filename); diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index 034baa785da..65fbfac7d1d 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -30,7 +30,7 @@ use OCA\Files\Share; * * Base class for sharing tests. */ -abstract class TestCase extends \PHPUnit_Framework_TestCase { +abstract class TestCase extends \Test\TestCase { const TEST_FILES_SHARING_API_USER1 = "test-share-user1"; const TEST_FILES_SHARING_API_USER2 = "test-share-user2"; @@ -49,6 +49,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { public $subfolder; public static function setUpBeforeClass() { + parent::setUpBeforeClass(); // remember files_encryption state self::$stateFilesEncryption = \OC_App::isEnabled('files_encryption'); @@ -84,7 +85,8 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { } - function setUp() { + protected function setUp() { + parent::setUp(); $this->assertFalse(\OC_App::isEnabled('files_encryption')); @@ -95,13 +97,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { $this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files'); } - function tearDown() { + protected function tearDown() { $query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`'); $query->execute(); + + parent::tearDown(); } public static function tearDownAfterClass() { - // cleanup users \OC_User::deleteUser(self::TEST_FILES_SHARING_API_USER1); \OC_User::deleteUser(self::TEST_FILES_SHARING_API_USER2); @@ -120,6 +123,8 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { \OC_Util::tearDownFS(); \OC_User::setUserId(''); Filesystem::tearDown(); + + parent::tearDownAfterClass(); } /** diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php index 861516dff7f..bc8deaf19b0 100644 --- a/apps/files_sharing/tests/updater.php +++ b/apps/files_sharing/tests/updater.php @@ -33,7 +33,7 @@ class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase { \OCA\Files_Sharing\Helper::registerHooks(); } - function setUp() { + protected function setUp() { parent::setUp(); $this->folder = self::TEST_FOLDER_NAME; @@ -46,7 +46,7 @@ class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase { $this->view->file_put_contents($this->folder . '/' . $this->filename, $this->data); } - function tearDown() { + protected function tearDown() { $this->view->unlink($this->filename); $this->view->deleteAll($this->folder); diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php index 67f55394ae8..254b30c6470 100644 --- a/apps/files_sharing/tests/watcher.php +++ b/apps/files_sharing/tests/watcher.php @@ -42,7 +42,7 @@ class Test_Files_Sharing_Watcher extends OCA\Files_sharing\Tests\TestCase { */ private $sharedCache; - function setUp() { + protected function setUp() { parent::setUp(); self::loginHelper(self::TEST_FILES_SHARING_API_USER1); @@ -71,7 +71,7 @@ class Test_Files_Sharing_Watcher extends OCA\Files_sharing\Tests\TestCase { $this->sharedCache = $this->sharedStorage->getCache(); } - function tearDown() { + protected function tearDown() { $this->sharedCache->clear(); self::loginHelper(self::TEST_FILES_SHARING_API_USER1); diff --git a/apps/files_trashbin/l10n/de_CH.js b/apps/files_trashbin/l10n/de_CH.js deleted file mode 100644 index 70a428d4c93..00000000000 --- a/apps/files_trashbin/l10n/de_CH.js +++ /dev/null @@ -1,15 +0,0 @@ -OC.L10N.register( - "files_trashbin", - { - "Couldn't delete %s permanently" : "Konnte %s nicht dauerhaft löschen", - "Couldn't restore %s" : "Konnte %s nicht wiederherstellen", - "Deleted files" : "Gelöschte Dateien", - "Restore" : "Wiederherstellen", - "Error" : "Fehler", - "restored" : "Wiederhergestellt", - "Nothing in here. Your trash bin is empty!" : "Nichts zu löschen, Ihr Papierkorb ist leer!", - "Name" : "Name", - "Deleted" : "Gelöscht", - "Delete" : "Löschen" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files_trashbin/l10n/de_CH.json b/apps/files_trashbin/l10n/de_CH.json deleted file mode 100644 index 497b6c35d55..00000000000 --- a/apps/files_trashbin/l10n/de_CH.json +++ /dev/null @@ -1,13 +0,0 @@ -{ "translations": { - "Couldn't delete %s permanently" : "Konnte %s nicht dauerhaft löschen", - "Couldn't restore %s" : "Konnte %s nicht wiederherstellen", - "Deleted files" : "Gelöschte Dateien", - "Restore" : "Wiederherstellen", - "Error" : "Fehler", - "restored" : "Wiederhergestellt", - "Nothing in here. Your trash bin is empty!" : "Nichts zu löschen, Ihr Papierkorb ist leer!", - "Name" : "Name", - "Deleted" : "Gelöscht", - "Delete" : "Löschen" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files_trashbin/l10n/sk.js b/apps/files_trashbin/l10n/sk.js deleted file mode 100644 index 1b73b5f3afa..00000000000 --- a/apps/files_trashbin/l10n/sk.js +++ /dev/null @@ -1,6 +0,0 @@ -OC.L10N.register( - "files_trashbin", - { - "Delete" : "Odstrániť" -}, -"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_trashbin/l10n/sk.json b/apps/files_trashbin/l10n/sk.json deleted file mode 100644 index 418f8874a6f..00000000000 --- a/apps/files_trashbin/l10n/sk.json +++ /dev/null @@ -1,4 +0,0 @@ -{ "translations": { - "Delete" : "Odstrániť" -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" -}
\ No newline at end of file diff --git a/apps/files_trashbin/l10n/sk.php b/apps/files_trashbin/l10n/sk.php deleted file mode 100644 index 3129cf5c411..00000000000 --- a/apps/files_trashbin/l10n/sk.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php -$TRANSLATIONS = array( -"Delete" => "Odstrániť" -); -$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files_trashbin/l10n/ur.js b/apps/files_trashbin/l10n/ur.js deleted file mode 100644 index cfdfd802748..00000000000 --- a/apps/files_trashbin/l10n/ur.js +++ /dev/null @@ -1,6 +0,0 @@ -OC.L10N.register( - "files_trashbin", - { - "Error" : "خرابی" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files_trashbin/l10n/ur.json b/apps/files_trashbin/l10n/ur.json deleted file mode 100644 index 1c1fc3d16c1..00000000000 --- a/apps/files_trashbin/l10n/ur.json +++ /dev/null @@ -1,4 +0,0 @@ -{ "translations": { - "Error" : "خرابی" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files_trashbin/l10n/ur.php b/apps/files_trashbin/l10n/ur.php deleted file mode 100644 index 1b41db1d679..00000000000 --- a/apps/files_trashbin/l10n/ur.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php -$TRANSLATIONS = array( -"Error" => "خرابی" -); -$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php index 6fdb53f7271..f572e22623e 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/trashbin.php @@ -25,7 +25,7 @@ use OCA\Files_Trashbin; /** * Class Test_Encryption_Crypt */ -class Test_Trashbin extends \PHPUnit_Framework_TestCase { +class Test_Trashbin extends \Test\TestCase { const TEST_TRASHBIN_USER1 = "test-trashbin-user1"; const TEST_TRASHBIN_USER2 = "test-trashbin-user2"; @@ -43,6 +43,8 @@ class Test_Trashbin extends \PHPUnit_Framework_TestCase { private $rootView; public static function setUpBeforeClass() { + parent::setUpBeforeClass(); + // reset backend \OC_User::clearBackends(); \OC_User::useBackend('database'); @@ -85,18 +87,24 @@ class Test_Trashbin extends \PHPUnit_Framework_TestCase { \OC_Config::setValue('trashbin_auto_expire', self::$rememberAutoExpire); \OC_Hook::clear(); + + parent::tearDownAfterClass(); } - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->trashRoot1 = '/' . self::TEST_TRASHBIN_USER1 . '/files_trashbin'; $this->trashRoot2 = '/' . self::TEST_TRASHBIN_USER2 . '/files_trashbin'; $this->rootView = new \OC\Files\View(); self::loginHelper(self::TEST_TRASHBIN_USER1); } - public function tearDown() { + protected function tearDown() { $this->rootView->deleteAll($this->trashRoot1); $this->rootView->deleteAll($this->trashRoot2); + + parent::tearDown(); } /** diff --git a/apps/files_versions/l10n/de_CH.js b/apps/files_versions/l10n/de_CH.js deleted file mode 100644 index 9e970501fb7..00000000000 --- a/apps/files_versions/l10n/de_CH.js +++ /dev/null @@ -1,11 +0,0 @@ -OC.L10N.register( - "files_versions", - { - "Could not revert: %s" : "Konnte %s nicht zurücksetzen", - "Versions" : "Versionen", - "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgänging machen.", - "More versions..." : "Mehrere Versionen...", - "No other versions available" : "Keine anderen Versionen verfügbar", - "Restore" : "Wiederherstellen" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/files_versions/l10n/de_CH.json b/apps/files_versions/l10n/de_CH.json deleted file mode 100644 index 8d4b76f8c2c..00000000000 --- a/apps/files_versions/l10n/de_CH.json +++ /dev/null @@ -1,9 +0,0 @@ -{ "translations": { - "Could not revert: %s" : "Konnte %s nicht zurücksetzen", - "Versions" : "Versionen", - "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgänging machen.", - "More versions..." : "Mehrere Versionen...", - "No other versions available" : "Keine anderen Versionen verfügbar", - "Restore" : "Wiederherstellen" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php index a3b8595a34b..436863b28dc 100644 --- a/apps/files_versions/tests/versions.php +++ b/apps/files_versions/tests/versions.php @@ -27,7 +27,7 @@ require_once __DIR__ . '/../lib/versions.php'; * Class Test_Files_versions * this class provide basic files versions test */ -class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { +class Test_Files_Versioning extends \Test\TestCase { const TEST_VERSIONS_USER = 'test-versions-user'; const TEST_VERSIONS_USER2 = 'test-versions-user2'; @@ -39,6 +39,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { private $rootView; public static function setUpBeforeClass() { + parent::setUpBeforeClass(); // clear share hooks \OC_Hook::clear('OCP\\Share'); @@ -55,9 +56,13 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { // cleanup test user \OC_User::deleteUser(self::TEST_VERSIONS_USER); \OC_User::deleteUser(self::TEST_VERSIONS_USER2); + + parent::tearDownAfterClass(); } - function setUp() { + protected function setUp() { + parent::setUp(); + self::loginHelper(self::TEST_VERSIONS_USER); $this->rootView = new \OC\Files\View(); if (!$this->rootView->file_exists(self::USERS_VERSIONS_ROOT)) { @@ -65,8 +70,10 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { } } - function tearDown() { + protected function tearDown() { $this->rootView->deleteAll(self::USERS_VERSIONS_ROOT); + + parent::tearDown(); } /** @@ -74,7 +81,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { * test expire logic * @dataProvider versionsProvider */ - function testGetExpireList($versions, $sizeOfAllDeletedFiles) { + public function testGetExpireList($versions, $sizeOfAllDeletedFiles) { // last interval end at 2592000 $startTime = 5000000; @@ -216,7 +223,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { ); } - function testRename() { + public function testRename() { \OC\Files\Filesystem::file_put_contents("test.txt", "test file"); @@ -247,7 +254,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { \OC\Files\Filesystem::unlink('test2.txt'); } - function testRenameInSharedFolder() { + public function testRenameInSharedFolder() { \OC\Files\Filesystem::mkdir('folder1'); \OC\Files\Filesystem::mkdir('folder1/folder2'); @@ -291,7 +298,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { \OC\Files\Filesystem::unlink('/folder1/folder2/test.txt'); } - function testRenameSharedFile() { + public function testRenameSharedFile() { \OC\Files\Filesystem::file_put_contents("test.txt", "test file"); @@ -334,7 +341,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { \OC\Files\Filesystem::unlink('/test.txt'); } - function testCopy() { + public function testCopy() { \OC\Files\Filesystem::file_put_contents("test.txt", "test file"); diff --git a/apps/user_ldap/l10n/de_CH.js b/apps/user_ldap/l10n/de_CH.js deleted file mode 100644 index a1028b1678a..00000000000 --- a/apps/user_ldap/l10n/de_CH.js +++ /dev/null @@ -1,82 +0,0 @@ -OC.L10N.register( - "user_ldap", - { - "Failed to clear the mappings." : "Löschen der Zuordnung fehlgeschlagen.", - "Failed to delete the server configuration" : "Löschen der Serverkonfiguration fehlgeschlagen", - "The configuration is valid and the connection could be established!" : "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!", - "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.", - "Deletion failed" : "Löschen fehlgeschlagen", - "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?", - "Keep settings?" : "Einstellungen beibehalten?", - "Cannot add server configuration" : "Das Hinzufügen der Serverkonfiguration schlug fehl", - "mappings cleared" : "Zuordnungen gelöscht", - "Success" : "Erfolg", - "Error" : "Fehler", - "Select groups" : "Wähle Gruppen", - "Connection test succeeded" : "Verbindungstest erfolgreich", - "Connection test failed" : "Verbindungstest fehlgeschlagen", - "Do you really want to delete the current Server Configuration?" : "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?", - "Confirm Deletion" : "Löschung bestätigen", - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""], - "Group Filter" : "Gruppen-Filter", - "Save" : "Speichern", - "Test Configuration" : "Testkonfiguration", - "Help" : "Hilfe", - "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"", - "Add Server Configuration" : "Serverkonfiguration hinzufügen", - "Host" : "Host", - "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, ausser wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://", - "Port" : "Port", - "User DN" : "Benutzer-DN", - "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.", - "Password" : "Passwort", - "For anonymous access, leave DN and Password empty." : "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.", - "One Base DN per line" : "Ein Basis-DN pro Zeile", - "You can specify Base DN for users and groups in the Advanced tab" : "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reiter konfigurieren", - "Advanced" : "Erweitert", - "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.", - "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.", - "Connection Settings" : "Verbindungseinstellungen", - "Configuration Active" : "Konfiguration aktiv", - "When unchecked, this configuration will be skipped." : "Wenn nicht angehakt, wird diese Konfiguration übersprungen.", - "Backup (Replica) Host" : "Backup Host (Kopie)", - "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.", - "Backup (Replica) Port" : "Backup Port", - "Disable Main Server" : "Hauptserver deaktivieren", - "Only connect to the replica server." : "Nur zum Replikat-Server verbinden.", - "Turn off SSL certificate validation." : "Schalten Sie die SSL-Zertifikatsprüfung aus.", - "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.", - "Cache Time-To-Live" : "Speichere Time-To-Live zwischen", - "in seconds. A change empties the cache." : "in Sekunden. Eine Änderung leert den Cache.", - "Directory Settings" : "Ordnereinstellungen", - "User Display Name Field" : "Feld für den Anzeigenamen des Benutzers", - "The LDAP attribute to use to generate the user's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.", - "Base User Tree" : "Basis-Benutzerbaum", - "One User Base DN per line" : "Ein Benutzer Basis-DN pro Zeile", - "User Search Attributes" : "Benutzersucheigenschaften", - "Optional; one attribute per line" : "Optional; ein Attribut pro Zeile", - "Group Display Name Field" : "Feld für den Anzeigenamen der Gruppe", - "The LDAP attribute to use to generate the groups's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen.", - "Base Group Tree" : "Basis-Gruppenbaum", - "One Group Base DN per line" : "Ein Gruppen Basis-DN pro Zeile", - "Group Search Attributes" : "Gruppensucheigenschaften", - "Group-Member association" : "Assoziation zwischen Gruppe und Benutzer", - "Special Attributes" : "Spezielle Eigenschaften", - "Quota Field" : "Kontingent-Feld", - "Quota Default" : "Standard-Kontingent", - "in bytes" : "in Bytes", - "Email Field" : "E-Mail-Feld", - "User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers", - "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.", - "Internal Username" : "Interner Benutzername", - "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.", - "Internal Username Attribute:" : "Interne Eigenschaften des Benutzers:", - "Override UUID detection" : "UUID-Erkennung überschreiben", - "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.", - "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung", - "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.", - "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung", - "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/user_ldap/l10n/de_CH.json b/apps/user_ldap/l10n/de_CH.json deleted file mode 100644 index 3560581d270..00000000000 --- a/apps/user_ldap/l10n/de_CH.json +++ /dev/null @@ -1,80 +0,0 @@ -{ "translations": { - "Failed to clear the mappings." : "Löschen der Zuordnung fehlgeschlagen.", - "Failed to delete the server configuration" : "Löschen der Serverkonfiguration fehlgeschlagen", - "The configuration is valid and the connection could be established!" : "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!", - "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.", - "Deletion failed" : "Löschen fehlgeschlagen", - "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?", - "Keep settings?" : "Einstellungen beibehalten?", - "Cannot add server configuration" : "Das Hinzufügen der Serverkonfiguration schlug fehl", - "mappings cleared" : "Zuordnungen gelöscht", - "Success" : "Erfolg", - "Error" : "Fehler", - "Select groups" : "Wähle Gruppen", - "Connection test succeeded" : "Verbindungstest erfolgreich", - "Connection test failed" : "Verbindungstest fehlgeschlagen", - "Do you really want to delete the current Server Configuration?" : "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?", - "Confirm Deletion" : "Löschung bestätigen", - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""], - "Group Filter" : "Gruppen-Filter", - "Save" : "Speichern", - "Test Configuration" : "Testkonfiguration", - "Help" : "Hilfe", - "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"", - "Add Server Configuration" : "Serverkonfiguration hinzufügen", - "Host" : "Host", - "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, ausser wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://", - "Port" : "Port", - "User DN" : "Benutzer-DN", - "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.", - "Password" : "Passwort", - "For anonymous access, leave DN and Password empty." : "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.", - "One Base DN per line" : "Ein Basis-DN pro Zeile", - "You can specify Base DN for users and groups in the Advanced tab" : "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reiter konfigurieren", - "Advanced" : "Erweitert", - "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.", - "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.", - "Connection Settings" : "Verbindungseinstellungen", - "Configuration Active" : "Konfiguration aktiv", - "When unchecked, this configuration will be skipped." : "Wenn nicht angehakt, wird diese Konfiguration übersprungen.", - "Backup (Replica) Host" : "Backup Host (Kopie)", - "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.", - "Backup (Replica) Port" : "Backup Port", - "Disable Main Server" : "Hauptserver deaktivieren", - "Only connect to the replica server." : "Nur zum Replikat-Server verbinden.", - "Turn off SSL certificate validation." : "Schalten Sie die SSL-Zertifikatsprüfung aus.", - "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.", - "Cache Time-To-Live" : "Speichere Time-To-Live zwischen", - "in seconds. A change empties the cache." : "in Sekunden. Eine Änderung leert den Cache.", - "Directory Settings" : "Ordnereinstellungen", - "User Display Name Field" : "Feld für den Anzeigenamen des Benutzers", - "The LDAP attribute to use to generate the user's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.", - "Base User Tree" : "Basis-Benutzerbaum", - "One User Base DN per line" : "Ein Benutzer Basis-DN pro Zeile", - "User Search Attributes" : "Benutzersucheigenschaften", - "Optional; one attribute per line" : "Optional; ein Attribut pro Zeile", - "Group Display Name Field" : "Feld für den Anzeigenamen der Gruppe", - "The LDAP attribute to use to generate the groups's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen.", - "Base Group Tree" : "Basis-Gruppenbaum", - "One Group Base DN per line" : "Ein Gruppen Basis-DN pro Zeile", - "Group Search Attributes" : "Gruppensucheigenschaften", - "Group-Member association" : "Assoziation zwischen Gruppe und Benutzer", - "Special Attributes" : "Spezielle Eigenschaften", - "Quota Field" : "Kontingent-Feld", - "Quota Default" : "Standard-Kontingent", - "in bytes" : "in Bytes", - "Email Field" : "E-Mail-Feld", - "User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers", - "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.", - "Internal Username" : "Interner Benutzername", - "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.", - "Internal Username Attribute:" : "Interne Eigenschaften des Benutzers:", - "Override UUID detection" : "UUID-Erkennung überschreiben", - "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.", - "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung", - "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.", - "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung", - "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/user_ldap/l10n/hi_IN.js b/apps/user_ldap/l10n/hi_IN.js deleted file mode 100644 index 37042a4f412..00000000000 --- a/apps/user_ldap/l10n/hi_IN.js +++ /dev/null @@ -1,7 +0,0 @@ -OC.L10N.register( - "user_ldap", - { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/user_ldap/l10n/hi_IN.json b/apps/user_ldap/l10n/hi_IN.json deleted file mode 100644 index 521de7ba1a8..00000000000 --- a/apps/user_ldap/l10n/hi_IN.json +++ /dev/null @@ -1,5 +0,0 @@ -{ "translations": { - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/user_ldap/l10n/hi_IN.php b/apps/user_ldap/l10n/hi_IN.php deleted file mode 100644 index 3a1e002311c..00000000000 --- a/apps/user_ldap/l10n/hi_IN.php +++ /dev/null @@ -1,6 +0,0 @@ -<?php -$TRANSLATIONS = array( -"_%s group found_::_%s groups found_" => array("",""), -"_%s user found_::_%s users found_" => array("","") -); -$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/l10n/sk.js b/apps/user_ldap/l10n/sk.js deleted file mode 100644 index 5060d7d4168..00000000000 --- a/apps/user_ldap/l10n/sk.js +++ /dev/null @@ -1,9 +0,0 @@ -OC.L10N.register( - "user_ldap", - { - "_%s group found_::_%s groups found_" : ["","",""], - "_%s user found_::_%s users found_" : ["","",""], - "Save" : "Uložiť", - "Advanced" : "Pokročilé" -}, -"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/user_ldap/l10n/sk.json b/apps/user_ldap/l10n/sk.json deleted file mode 100644 index 4b98da63fc2..00000000000 --- a/apps/user_ldap/l10n/sk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "translations": { - "_%s group found_::_%s groups found_" : ["","",""], - "_%s user found_::_%s users found_" : ["","",""], - "Save" : "Uložiť", - "Advanced" : "Pokročilé" -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" -}
\ No newline at end of file diff --git a/apps/user_ldap/l10n/sk.php b/apps/user_ldap/l10n/sk.php deleted file mode 100644 index e258ffac223..00000000000 --- a/apps/user_ldap/l10n/sk.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -$TRANSLATIONS = array( -"_%s group found_::_%s groups found_" => array("","",""), -"_%s user found_::_%s users found_" => array("","",""), -"Save" => "Uložiť", -"Advanced" => "Pokročilé" -); -$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/user_ldap/l10n/ur.js b/apps/user_ldap/l10n/ur.js deleted file mode 100644 index 60c3f87f855..00000000000 --- a/apps/user_ldap/l10n/ur.js +++ /dev/null @@ -1,8 +0,0 @@ -OC.L10N.register( - "user_ldap", - { - "Error" : "خرابی", - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/user_ldap/l10n/ur.json b/apps/user_ldap/l10n/ur.json deleted file mode 100644 index 8e1b732acc9..00000000000 --- a/apps/user_ldap/l10n/ur.json +++ /dev/null @@ -1,6 +0,0 @@ -{ "translations": { - "Error" : "خرابی", - "_%s group found_::_%s groups found_" : ["",""], - "_%s user found_::_%s users found_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/user_ldap/l10n/ur.php b/apps/user_ldap/l10n/ur.php deleted file mode 100644 index c29e4dba209..00000000000 --- a/apps/user_ldap/l10n/ur.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php -$TRANSLATIONS = array( -"Error" => "خرابی", -"_%s group found_::_%s groups found_" => array("",""), -"_%s user found_::_%s users found_" => array("","") -); -$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php index 8ff39800808..85849229152 100644 --- a/apps/user_ldap/tests/access.php +++ b/apps/user_ldap/tests/access.php @@ -26,7 +26,7 @@ use \OCA\user_ldap\lib\Access; use \OCA\user_ldap\lib\Connection; use \OCA\user_ldap\lib\ILDAPWrapper; -class Test_Access extends \PHPUnit_Framework_TestCase { +class Test_Access extends \Test\TestCase { private function getConnecterAndLdapMock() { static $conMethods; static $accMethods; diff --git a/apps/user_ldap/tests/connection.php b/apps/user_ldap/tests/connection.php index f51b0c83017..e3f29cec982 100644 --- a/apps/user_ldap/tests/connection.php +++ b/apps/user_ldap/tests/connection.php @@ -22,7 +22,7 @@ namespace OCA\user_ldap\tests; -class Test_Connection extends \PHPUnit_Framework_TestCase { +class Test_Connection extends \Test\TestCase { public function testOriginalAgentUnchangedOnClone() { //background: upon login a bind is done with the user credentials diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php index d1262e4f5b8..0e01eb3ba6f 100644 --- a/apps/user_ldap/tests/group_ldap.php +++ b/apps/user_ldap/tests/group_ldap.php @@ -22,14 +22,12 @@ namespace OCA\user_ldap\tests; -namespace OCA\user_ldap\tests; - use \OCA\user_ldap\GROUP_LDAP as GroupLDAP; use \OCA\user_ldap\lib\Access; use \OCA\user_ldap\lib\Connection; use \OCA\user_ldap\lib\ILDAPWrapper; -class Test_Group_Ldap extends \PHPUnit_Framework_TestCase { +class Test_Group_Ldap extends \Test\TestCase { private function getAccessMock() { static $conMethods; static $accMethods; diff --git a/apps/user_ldap/tests/helper.php b/apps/user_ldap/tests/helper.php index 07c24d64499..a70a57051c8 100644 --- a/apps/user_ldap/tests/helper.php +++ b/apps/user_ldap/tests/helper.php @@ -11,7 +11,7 @@ namespace OCA\user_ldap\tests; use OCA\user_ldap\lib\Helper; -class Test_Helper extends \PHPUnit_Framework_TestCase { +class Test_Helper extends \Test\TestCase { public function testTableTruncate() { diff --git a/apps/user_ldap/tests/user/manager.php b/apps/user_ldap/tests/user/manager.php index 7d687867213..b3e52084dba 100644 --- a/apps/user_ldap/tests/user/manager.php +++ b/apps/user_ldap/tests/user/manager.php @@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests; use OCA\user_ldap\lib\user\Manager; -class Test_User_Manager extends \PHPUnit_Framework_TestCase { +class Test_User_Manager extends \Test\TestCase { private function getTestInstances() { $access = $this->getMock('\OCA\user_ldap\lib\user\IUserTools'); diff --git a/apps/user_ldap/tests/user/user.php b/apps/user_ldap/tests/user/user.php index b66a9237266..e110921d2d3 100644 --- a/apps/user_ldap/tests/user/user.php +++ b/apps/user_ldap/tests/user/user.php @@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests; use OCA\user_ldap\lib\user\User; -class Test_User_User extends \PHPUnit_Framework_TestCase { +class Test_User_User extends \Test\TestCase { private function getTestInstances() { $access = $this->getMock('\OCA\user_ldap\lib\user\IUserTools'); diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php index c89edc33fa9..e91404d47f2 100644 --- a/apps/user_ldap/tests/user_ldap.php +++ b/apps/user_ldap/tests/user_ldap.php @@ -27,11 +27,13 @@ use \OCA\user_ldap\lib\Access; use \OCA\user_ldap\lib\Connection; use \OCA\user_ldap\lib\ILDAPWrapper; -class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase { +class Test_User_Ldap_Direct extends \Test\TestCase { protected $backend; protected $access; - public function setUp() { + protected function setUp() { + parent::setUp(); + \OC_User::clearBackends(); \OC_Group::clearBackends(); } diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php index 1f420f9ee8a..7284e466536 100644 --- a/apps/user_ldap/tests/wizard.php +++ b/apps/user_ldap/tests/wizard.php @@ -29,8 +29,9 @@ use \OCA\user_ldap\lib\Wizard; // use \OCA\user_ldap\lib\Configuration; // use \OCA\user_ldap\lib\ILDAPWrapper; -class Test_Wizard extends \PHPUnit_Framework_TestCase { - public function setUp() { +class Test_Wizard extends \Test\TestCase { + protected function setUp() { + parent::setUp(); //we need to make sure the consts are defined, otherwise tests will fail //on systems without php5_ldap $ldapConsts = array('LDAP_OPT_PROTOCOL_VERSION', diff --git a/apps/user_webdavauth/l10n/de_CH.js b/apps/user_webdavauth/l10n/de_CH.js deleted file mode 100644 index 84bcb9d4efb..00000000000 --- a/apps/user_webdavauth/l10n/de_CH.js +++ /dev/null @@ -1,8 +0,0 @@ -OC.L10N.register( - "user_webdavauth", - { - "WebDAV Authentication" : "WebDAV-Authentifizierung", - "Save" : "Speichern", - "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten." -}, -"nplurals=2; plural=(n != 1);"); diff --git a/apps/user_webdavauth/l10n/de_CH.json b/apps/user_webdavauth/l10n/de_CH.json deleted file mode 100644 index 1c47d57a349..00000000000 --- a/apps/user_webdavauth/l10n/de_CH.json +++ /dev/null @@ -1,6 +0,0 @@ -{ "translations": { - "WebDAV Authentication" : "WebDAV-Authentifizierung", - "Save" : "Speichern", - "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten." -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/apps/user_webdavauth/l10n/sk.js b/apps/user_webdavauth/l10n/sk.js deleted file mode 100644 index 299b57be670..00000000000 --- a/apps/user_webdavauth/l10n/sk.js +++ /dev/null @@ -1,6 +0,0 @@ -OC.L10N.register( - "user_webdavauth", - { - "Save" : "Uložiť" -}, -"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/user_webdavauth/l10n/sk.json b/apps/user_webdavauth/l10n/sk.json deleted file mode 100644 index 48cd128194e..00000000000 --- a/apps/user_webdavauth/l10n/sk.json +++ /dev/null @@ -1,4 +0,0 @@ -{ "translations": { - "Save" : "Uložiť" -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" -}
\ No newline at end of file diff --git a/apps/user_webdavauth/l10n/sk.php b/apps/user_webdavauth/l10n/sk.php deleted file mode 100644 index 9efe9fe6549..00000000000 --- a/apps/user_webdavauth/l10n/sk.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php -$TRANSLATIONS = array( -"Save" => "Uložiť" -); -$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/config/config.sample.php b/config/config.sample.php index daca5aed362..2287b7af7dd 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -71,7 +71,7 @@ $CONFIG = array( 'trusted_domains' => array ( 'demo.example.org', - 'otherdomain.example.org:8080', + 'otherdomain.example.org', ), diff --git a/core/application.php b/core/application.php index 33801847758..c36ab559c27 100644 --- a/core/application.php +++ b/core/application.php @@ -10,13 +10,22 @@ namespace OC\Core; +use OC\AppFramework\Utility\SimpleContainer; use \OCP\AppFramework\App; use OC\Core\LostPassword\Controller\LostController; use OC\Core\User\UserController; +use \OCP\Util; +/** + * Class Application + * + * @package OC\Core + */ class Application extends App { - + /** + * @param array $urlParams + */ public function __construct(array $urlParams=array()){ parent::__construct('core', $urlParams); @@ -25,29 +34,56 @@ class Application extends App { /** * Controllers */ - $container->registerService('LostController', function($c) { + $container->registerService('LostController', function(SimpleContainer $c) { return new LostController( $c->query('AppName'), $c->query('Request'), - $c->query('ServerContainer')->getURLGenerator(), - $c->query('ServerContainer')->getUserManager(), - new \OC_Defaults(), - $c->query('ServerContainer')->getL10N('core'), - $c->query('ServerContainer')->getConfig(), - $c->query('ServerContainer')->getUserSession(), - \OCP\Util::getDefaultEmailAddress('lostpassword-noreply'), - \OC_App::isEnabled('files_encryption') + $c->query('URLGenerator'), + $c->query('UserManager'), + $c->query('Defaults'), + $c->query('L10N'), + $c->query('Config'), + $c->query('SecureRandom'), + $c->query('DefaultEmailAddress'), + $c->query('IsEncryptionEnabled') ); }); - $container->registerService('UserController', function($c) { + $container->registerService('UserController', function(SimpleContainer $c) { return new UserController( $c->query('AppName'), $c->query('Request'), - $c->query('ServerContainer')->getUserManager(), - new \OC_Defaults() + $c->query('UserManager'), + $c->query('Defaults') ); }); - } + /** + * Core class wrappers + */ + $container->registerService('IsEncryptionEnabled', function() { + return \OC_App::isEnabled('files_encryption'); + }); + $container->registerService('URLGenerator', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getURLGenerator(); + }); + $container->registerService('UserManager', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getUserManager(); + }); + $container->registerService('Config', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getConfig(); + }); + $container->registerService('L10N', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getL10N('core'); + }); + $container->registerService('SecureRandom', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getSecureRandom(); + }); + $container->registerService('Defaults', function() { + return new \OC_Defaults; + }); + $container->registerService('DefaultEmailAddress', function() { + return Util::getDefaultEmailAddress('lostpassword-noreply'); + }); + } } diff --git a/core/css/styles.css b/core/css/styles.css index c45588cece6..2859399b59e 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -353,6 +353,12 @@ input[type="submit"].enabled { filter: alpha(opacity=60); opacity: .6; } +/* overrides another !important statement that sets this to unreadable black */ +#body-login form .warning input[type="checkbox"]:hover+label, +#body-login form .warning input[type="checkbox"]:focus+label, +#body-login form .warning input[type="checkbox"]+label { + color: #fff !important; +} #body-login .update h2 { font-size: 20px; diff --git a/core/js/js.js b/core/js/js.js index 39e382b544b..eb2f10b51f0 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -253,6 +253,17 @@ var OC={ }, /** + * Loads translations for the given app asynchronously. + * + * @param {String} app app name + * @param {Function} callback callback to call after loading + * @return {Promise} + */ + addTranslations: function(app, callback) { + return OC.L10N.load(app, callback); + }, + + /** * Returns the base name of the given path. * For example for "/abc/somefile.txt" it will return "somefile.txt" * @@ -475,6 +486,15 @@ var OC={ return window.matchMedia(media); } return false; + }, + + /** + * Returns the user's locale + * + * @return {String} locale string + */ + getLocale: function() { + return $('html').prop('lang'); } }; @@ -869,9 +889,9 @@ function object(o) { function initCore() { /** - * Set users local to moment.js as soon as possible + * Set users locale to moment.js as soon as possible */ - moment.locale($('html').prop('lang')); + moment.locale(OC.getLocale()); /** diff --git a/core/js/l10n.js b/core/js/l10n.js index e375b7eca80..0c660584322 100644 --- a/core/js/l10n.js +++ b/core/js/l10n.js @@ -27,6 +27,38 @@ OC.L10N = { _pluralFunctions: {}, /** + * Load an app's translation bundle if not loaded already. + * + * @param {String} appName name of the app + * @param {Function} callback callback to be called when + * the translations are loaded + * @return {Promise} promise + */ + load: function(appName, callback) { + // already available ? + if (this._bundles[appName] || OC.getLocale() === 'en') { + var deferred = $.Deferred(); + var promise = deferred.promise(); + promise.then(callback); + deferred.resolve(); + return promise; + } + + var self = this; + var url = OC.filePath(appName, 'l10n', OC.getLocale() + '.json'); + + // load JSON translation bundle per AJAX + return $.get(url) + .then( + function(result) { + if (result.translations) { + self.register(appName, result.translations, result.pluralForm); + } + }) + .then(callback); + }, + + /** * Register an app's translation bundle. * * @param {String} appName name of the app diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js index ad221cb30fc..35173fd3d33 100644 --- a/core/js/lostpassword.js +++ b/core/js/lostpassword.js @@ -8,19 +8,12 @@ OC.Lostpassword = { + ('<br /><input type="checkbox" id="encrypted-continue" value="Yes" />') + '<label for="encrypted-continue">' + t('core', 'I know what I\'m doing') - + '</label><br />' - + '<a id="lost-password-encryption" href>' - + t('core', 'Reset password') - + '</a>', + + '</label><br />', resetErrorMsg : t('core', 'Password can not be changed. Please contact your administrator.'), init : function() { - if ($('#lost-password-encryption').length){ - $('#lost-password-encryption').click(OC.Lostpassword.sendLink); - } else { - $('#lost-password').click(OC.Lostpassword.sendLink); - } + $('#lost-password').click(OC.Lostpassword.sendLink); $('#reset-password #submit').click(OC.Lostpassword.resetPassword); }, @@ -32,8 +25,7 @@ OC.Lostpassword = { $.post( OC.generateUrl('/lostpassword/email'), { - user : $('#user').val(), - proceed: $('#encrypted-continue').attr('checked') ? 'Yes' : 'No' + user : $('#user').val() }, OC.Lostpassword.sendLinkDone ); @@ -84,11 +76,16 @@ OC.Lostpassword = { $.post( $('#password').parents('form').attr('action'), { - password : $('#password').val() + password : $('#password').val(), + proceed: $('#encrypted-continue').attr('checked') ? 'true' : 'false' }, OC.Lostpassword.resetDone ); } + if($('#encrypted-continue').attr('checked')) { + $('#reset-password #submit').hide(); + $('#reset-password #float-spinner').removeClass('hidden'); + } }, resetDone : function(result){ @@ -126,7 +123,7 @@ OC.Lostpassword = { getResetStatusNode : function (){ if (!$('#lost-password').length){ - $('<p id="lost-password"></p>').insertAfter($('#submit')); + $('<p id="lost-password"></p>').insertBefore($('#reset-password fieldset')); } else { $('#lost-password').replaceWith($('<p id="lost-password"></p>')); } diff --git a/core/js/tests/specs/l10nSpec.js b/core/js/tests/specs/l10nSpec.js index d5b0363ea38..cf7c8b11b1c 100644 --- a/core/js/tests/specs/l10nSpec.js +++ b/core/js/tests/specs/l10nSpec.js @@ -11,8 +11,12 @@ describe('OC.L10N tests', function() { var TEST_APP = 'jsunittestapp'; + beforeEach(function() { + OC.appswebroots[TEST_APP] = OC.webroot + '/apps3/jsunittestapp'; + }); afterEach(function() { delete OC.L10N._bundles[TEST_APP]; + delete OC.appswebroots[TEST_APP]; }); describe('text translation', function() { @@ -98,4 +102,52 @@ describe('OC.L10N tests', function() { checkPlurals(); }); }); + describe('async loading of translations', function() { + it('loads bundle for given app and calls callback', function() { + var localeStub = sinon.stub(OC, 'getLocale').returns('zh_CN'); + var callbackStub = sinon.stub(); + var promiseStub = sinon.stub(); + OC.L10N.load(TEST_APP, callbackStub).then(promiseStub); + expect(callbackStub.notCalled).toEqual(true); + expect(promiseStub.notCalled).toEqual(true); + expect(fakeServer.requests.length).toEqual(1); + var req = fakeServer.requests[0]; + expect(req.url).toEqual( + OC.webroot + '/apps3/' + TEST_APP + '/l10n/zh_CN.json' + ); + req.respond( + 200, + { 'Content-Type': 'application/json' }, + JSON.stringify({ + translations: {'Hello world!': '你好世界!'}, + pluralForm: 'nplurals=2; plural=(n != 1);' + }) + ); + + expect(callbackStub.calledOnce).toEqual(true); + expect(promiseStub.calledOnce).toEqual(true); + expect(t(TEST_APP, 'Hello world!')).toEqual('你好世界!'); + localeStub.restore(); + }); + it('calls callback if translation already available', function() { + var promiseStub = sinon.stub(); + var callbackStub = sinon.stub(); + OC.L10N.register(TEST_APP, { + 'Hello world!': 'Hallo Welt!' + }); + OC.L10N.load(TEST_APP, callbackStub).then(promiseStub); + expect(callbackStub.calledOnce).toEqual(true); + expect(promiseStub.calledOnce).toEqual(true); + expect(fakeServer.requests.length).toEqual(0); + }); + it('calls callback if locale is en', function() { + var localeStub = sinon.stub(OC, 'getLocale').returns('en'); + var promiseStub = sinon.stub(); + var callbackStub = sinon.stub(); + OC.L10N.load(TEST_APP, callbackStub).then(promiseStub); + expect(callbackStub.calledOnce).toEqual(true); + expect(promiseStub.calledOnce).toEqual(true); + expect(fakeServer.requests.length).toEqual(0); + }); + }); }); diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js index bb9b876ae73..8250b9c9d7f 100644 --- a/core/l10n/af_ZA.js +++ b/core/l10n/af_ZA.js @@ -38,7 +38,6 @@ OC.L10N.register( "Couldn't send reset email. Please contact your administrator." : "Die herstel epos kon nie gestuur word nie. Kontak asseblief die stelsel administrateur.", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Die \"link\" vir die herstel van jou wagwoord is na jou epos gestuur. As jy dit nie binne 'n redelike tyd ontvang nie, soek deur jou \"spam/junk\" omslagte.<br>As dit nie daar is nie vra jou administrateur vir hulp.", "I know what I'm doing" : "Ek weet wat ek doen", - "Reset password" : "Herstel wagwoord", "Password can not be changed. Please contact your administrator." : "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.", "No" : "Nee", "Yes" : "Ja", @@ -90,10 +89,8 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.", "%s password reset" : "%s wagwoord herstel", "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}", - "You will receive a link to reset your password via Email." : "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.", - "Username" : "Gebruikersnaam", - "Yes, I really want to reset my password now" : "Ja, Ek wil regtig my wagwoord herstel", "New password" : "Nuwe wagwoord", + "Reset password" : "Herstel wagwoord", "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.", "Personal" : "Persoonlik", "Users" : "Gebruikers", @@ -107,6 +104,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.", "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>", + "Username" : "Gebruikersnaam", "Password" : "Wagwoord", "Data folder" : "Data omslag", "Configure the database" : "Stel databasis op", diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json index 373d3dff8b4..f95495870e8 100644 --- a/core/l10n/af_ZA.json +++ b/core/l10n/af_ZA.json @@ -36,7 +36,6 @@ "Couldn't send reset email. Please contact your administrator." : "Die herstel epos kon nie gestuur word nie. Kontak asseblief die stelsel administrateur.", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Die \"link\" vir die herstel van jou wagwoord is na jou epos gestuur. As jy dit nie binne 'n redelike tyd ontvang nie, soek deur jou \"spam/junk\" omslagte.<br>As dit nie daar is nie vra jou administrateur vir hulp.", "I know what I'm doing" : "Ek weet wat ek doen", - "Reset password" : "Herstel wagwoord", "Password can not be changed. Please contact your administrator." : "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.", "No" : "Nee", "Yes" : "Ja", @@ -88,10 +87,8 @@ "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.", "%s password reset" : "%s wagwoord herstel", "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}", - "You will receive a link to reset your password via Email." : "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.", - "Username" : "Gebruikersnaam", - "Yes, I really want to reset my password now" : "Ja, Ek wil regtig my wagwoord herstel", "New password" : "Nuwe wagwoord", + "Reset password" : "Herstel wagwoord", "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.", "Personal" : "Persoonlik", "Users" : "Gebruikers", @@ -105,6 +102,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.", "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>", + "Username" : "Gebruikersnaam", "Password" : "Wagwoord", "Data folder" : "Data omslag", "Configure the database" : "Stel databasis op", diff --git a/core/l10n/ar.js b/core/l10n/ar.js index 2d7bcda9398..c48414bfdfe 100644 --- a/core/l10n/ar.js +++ b/core/l10n/ar.js @@ -25,7 +25,6 @@ OC.L10N.register( "December" : "كانون الاول", "Settings" : "إعدادات", "Saving..." : "جاري الحفظ...", - "Reset password" : "تعديل كلمة السر", "No" : "لا", "Yes" : "نعم", "Choose" : "اختيار", @@ -76,10 +75,8 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud", "%s password reset" : "تمت إعادة ضبط كلمة مرور %s", "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}", - "You will receive a link to reset your password via Email." : "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.", - "Username" : "إسم المستخدم", - "Yes, I really want to reset my password now" : "نعم، أريد إعادة ضبظ كلمة مروري", "New password" : "كلمات سر جديدة", + "Reset password" : "تعديل كلمة السر", "Personal" : "شخصي", "Users" : "المستخدمين", "Apps" : "التطبيقات", @@ -92,6 +89,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess لا يعمل بشكل صحيح.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.", "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>", + "Username" : "إسم المستخدم", "Password" : "كلمة المرور", "Data folder" : "مجلد المعلومات", "Configure the database" : "أسس قاعدة البيانات", diff --git a/core/l10n/ar.json b/core/l10n/ar.json index fd5c1275e41..439a60aec2a 100644 --- a/core/l10n/ar.json +++ b/core/l10n/ar.json @@ -23,7 +23,6 @@ "December" : "كانون الاول", "Settings" : "إعدادات", "Saving..." : "جاري الحفظ...", - "Reset password" : "تعديل كلمة السر", "No" : "لا", "Yes" : "نعم", "Choose" : "اختيار", @@ -74,10 +73,8 @@ "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud", "%s password reset" : "تمت إعادة ضبط كلمة مرور %s", "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}", - "You will receive a link to reset your password via Email." : "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.", - "Username" : "إسم المستخدم", - "Yes, I really want to reset my password now" : "نعم، أريد إعادة ضبظ كلمة مروري", "New password" : "كلمات سر جديدة", + "Reset password" : "تعديل كلمة السر", "Personal" : "شخصي", "Users" : "المستخدمين", "Apps" : "التطبيقات", @@ -90,6 +87,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess لا يعمل بشكل صحيح.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.", "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>", + "Username" : "إسم المستخدم", "Password" : "كلمة المرور", "Data folder" : "مجلد المعلومات", "Configure the database" : "أسس قاعدة البيانات", diff --git a/core/l10n/ast.js b/core/l10n/ast.js index be95fb45e5c..9bf258b0f60 100644 --- a/core/l10n/ast.js +++ b/core/l10n/ast.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Unviósete al corréu l'enllaz pa reaniciar la to contraseña. Si nun lu recibes nuna cantidá razonable de tiempu, comprueba les tos carpetes de corréu puxarra. <br>Si nun ta ehí, entruga al to alministrador llocal", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Los tos ficheros tán crifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que se reanicie la to contraseña.<br />Si nun tas seguru de qué facer, por favor contauta col to alministrador enantes que sigas. <br />¿De xuru quies siguir?", "I know what I'm doing" : "Sé lo que toi faciendo", - "Reset password" : "Restablecer contraseña", "Password can not be changed. Please contact your administrator." : "Nun pue camudase la contraseña. Por favor, contauta col alministrador.", "No" : "Non", "Yes" : "Sí", @@ -118,13 +117,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador", "%s password reset" : "%s restablecer contraseña", "Use the following link to reset your password: {link}" : "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}", - "You will receive a link to reset your password via Email." : "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña", - "Username" : "Nome d'usuariu", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?", - "Yes, I really want to reset my password now" : "Sí, quiero reaniciar daveres la mio contraseña agora", - "Reset" : "Reaniciar", "New password" : "Contraseña nueva", "New Password" : "Contraseña nueva", + "Reset password" : "Restablecer contraseña", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!", "For the best results, please consider using a GNU/Linux server instead." : "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.", "Personal" : "Personal", @@ -149,6 +144,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>", + "Username" : "Nome d'usuariu", "Password" : "Contraseña", "Storage & database" : "Almacenamientu y Base de datos", "Data folder" : "Carpeta de datos", diff --git a/core/l10n/ast.json b/core/l10n/ast.json index 42558bd76ef..8422c2948ee 100644 --- a/core/l10n/ast.json +++ b/core/l10n/ast.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Unviósete al corréu l'enllaz pa reaniciar la to contraseña. Si nun lu recibes nuna cantidá razonable de tiempu, comprueba les tos carpetes de corréu puxarra. <br>Si nun ta ehí, entruga al to alministrador llocal", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Los tos ficheros tán crifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que se reanicie la to contraseña.<br />Si nun tas seguru de qué facer, por favor contauta col to alministrador enantes que sigas. <br />¿De xuru quies siguir?", "I know what I'm doing" : "Sé lo que toi faciendo", - "Reset password" : "Restablecer contraseña", "Password can not be changed. Please contact your administrator." : "Nun pue camudase la contraseña. Por favor, contauta col alministrador.", "No" : "Non", "Yes" : "Sí", @@ -116,13 +115,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador", "%s password reset" : "%s restablecer contraseña", "Use the following link to reset your password: {link}" : "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}", - "You will receive a link to reset your password via Email." : "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña", - "Username" : "Nome d'usuariu", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?", - "Yes, I really want to reset my password now" : "Sí, quiero reaniciar daveres la mio contraseña agora", - "Reset" : "Reaniciar", "New password" : "Contraseña nueva", "New Password" : "Contraseña nueva", + "Reset password" : "Restablecer contraseña", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!", "For the best results, please consider using a GNU/Linux server instead." : "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.", "Personal" : "Personal", @@ -147,6 +142,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>", + "Username" : "Nome d'usuariu", "Password" : "Contraseña", "Storage & database" : "Almacenamientu y Base de datos", "Data folder" : "Carpeta de datos", diff --git a/core/l10n/az.js b/core/l10n/az.js index f3a5b138641..10316b67f2a 100644 --- a/core/l10n/az.js +++ b/core/l10n/az.js @@ -35,13 +35,12 @@ OC.L10N.register( "Delete" : "Sil", "Add" : "Əlavə etmək", "_download %n file_::_download %n files_" : ["",""], - "Username" : "İstifadəçi adı", - "Reset" : "Sıfırla", "Personal" : "Şəxsi", "Users" : "İstifadəçilər", "Admin" : "İnzibatçı", "Help" : "Kömək", "Security Warning" : "Təhlükəsizlik xəbərdarlığı", + "Username" : "İstifadəçi adı", "Password" : "Şifrə", "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.", "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin. Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir." diff --git a/core/l10n/az.json b/core/l10n/az.json index 7f4f7d8bb95..7a0c92543f3 100644 --- a/core/l10n/az.json +++ b/core/l10n/az.json @@ -33,13 +33,12 @@ "Delete" : "Sil", "Add" : "Əlavə etmək", "_download %n file_::_download %n files_" : ["",""], - "Username" : "İstifadəçi adı", - "Reset" : "Sıfırla", "Personal" : "Şəxsi", "Users" : "İstifadəçilər", "Admin" : "İnzibatçı", "Help" : "Kömək", "Security Warning" : "Təhlükəsizlik xəbərdarlığı", + "Username" : "İstifadəçi adı", "Password" : "Şifrə", "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.", "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin. Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir." diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js index b69319c2911..cf7369129ba 100644 --- a/core/l10n/bg_BG.js +++ b/core/l10n/bg_BG.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Връзката за възстановяване на паролата е изпратена на твоя имейл. Ако не я получиш в разумен период от време, провери папката си за спам.<br>Ако не е там се свържи с администратора.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата.<br /> Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш.<br/>Наистина ли си сигурен, че искаш да продължиш?", "I know what I'm doing" : "Знам какво правя!", - "Reset password" : "Възстановяване на парола", "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.", "No" : "Не", "Yes" : "Да", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Неуспешно изпращане на имейл за възстановяване на паролата, защото липсва имейл свързан с това потребителско име. Моля свържи се с админстратора.", "%s password reset" : "Паролата на %s е променена.", "Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}", - "You will receive a link to reset your password via Email." : "Ще получиш връзка за възстановяване на паролата посредством емейл.", - "Username" : "Потребител", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата. Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш. Наистина ли си сигурен, че искаш да продължиш?", - "Yes, I really want to reset my password now" : "Да, наистина желая да възстановя паролата си сега.", - "Reset" : "Възстанови", "New password" : "Нова парола", "New Password" : "Нова Парола", + "Reset password" : "Възстановяване на парола", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!", "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.", "Personal" : "Лични", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Твоята директория за данни и файлове вероятно са достъпни от интернет поради това, че .htaccess файла не функционира.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.", "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.", + "Username" : "Потребител", "Password" : "Парола", "Storage & database" : "Дисково пространство и база данни", "Data folder" : "Директория за данни", diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json index 51b2ba5fc76..8b6b7e057d2 100644 --- a/core/l10n/bg_BG.json +++ b/core/l10n/bg_BG.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Връзката за възстановяване на паролата е изпратена на твоя имейл. Ако не я получиш в разумен период от време, провери папката си за спам.<br>Ако не е там се свържи с администратора.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата.<br /> Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш.<br/>Наистина ли си сигурен, че искаш да продължиш?", "I know what I'm doing" : "Знам какво правя!", - "Reset password" : "Възстановяване на парола", "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.", "No" : "Не", "Yes" : "Да", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Неуспешно изпращане на имейл за възстановяване на паролата, защото липсва имейл свързан с това потребителско име. Моля свържи се с админстратора.", "%s password reset" : "Паролата на %s е променена.", "Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}", - "You will receive a link to reset your password via Email." : "Ще получиш връзка за възстановяване на паролата посредством емейл.", - "Username" : "Потребител", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата. Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш. Наистина ли си сигурен, че искаш да продължиш?", - "Yes, I really want to reset my password now" : "Да, наистина желая да възстановя паролата си сега.", - "Reset" : "Възстанови", "New password" : "Нова парола", "New Password" : "Нова Парола", + "Reset password" : "Възстановяване на парола", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!", "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.", "Personal" : "Лични", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Твоята директория за данни и файлове вероятно са достъпни от интернет поради това, че .htaccess файла не функционира.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.", "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.", + "Username" : "Потребител", "Password" : "Парола", "Storage & database" : "Дисково пространство и база данни", "Data folder" : "Директория за данни", diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js index ac4ba299468..422175f9e81 100644 --- a/core/l10n/bn_BD.js +++ b/core/l10n/bn_BD.js @@ -29,7 +29,6 @@ OC.L10N.register( "December" : "ডিসেম্বর", "Settings" : "নিয়ামকসমূহ", "Saving..." : "সংরক্ষণ করা হচ্ছে..", - "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর", "No" : "না", "Yes" : "হ্যাঁ", "Choose" : "বেছে নিন", @@ -80,11 +79,9 @@ OC.L10N.register( "_download %n file_::_download %n files_" : ["",""], "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।", "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}", - "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।", - "Username" : "ব্যবহারকারী", - "Reset" : "পূণঃনির্ধানণ", "New password" : "নতুন কূটশব্দ", "New Password" : "নতুন কূটশব্দ", + "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর", "Personal" : "ব্যক্তিগত", "Users" : "ব্যবহারকারী", "Apps" : "অ্যাপ", @@ -99,6 +96,7 @@ OC.L10N.register( "Cheers!" : "শুভেচ্ছা!", "Security Warning" : "নিরাপত্তাজনিত সতর্কতা", "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন", + "Username" : "ব্যবহারকারী", "Password" : "কূটশব্দ", "Data folder" : "ডাটা ফোল্ডার ", "Configure the database" : "ডাটাবেচ কনফিগার করুন", diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json index 9eee32ba3c2..811c1087002 100644 --- a/core/l10n/bn_BD.json +++ b/core/l10n/bn_BD.json @@ -27,7 +27,6 @@ "December" : "ডিসেম্বর", "Settings" : "নিয়ামকসমূহ", "Saving..." : "সংরক্ষণ করা হচ্ছে..", - "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর", "No" : "না", "Yes" : "হ্যাঁ", "Choose" : "বেছে নিন", @@ -78,11 +77,9 @@ "_download %n file_::_download %n files_" : ["",""], "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।", "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}", - "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।", - "Username" : "ব্যবহারকারী", - "Reset" : "পূণঃনির্ধানণ", "New password" : "নতুন কূটশব্দ", "New Password" : "নতুন কূটশব্দ", + "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর", "Personal" : "ব্যক্তিগত", "Users" : "ব্যবহারকারী", "Apps" : "অ্যাপ", @@ -97,6 +94,7 @@ "Cheers!" : "শুভেচ্ছা!", "Security Warning" : "নিরাপত্তাজনিত সতর্কতা", "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন", + "Username" : "ব্যবহারকারী", "Password" : "কূটশব্দ", "Data folder" : "ডাটা ফোল্ডার ", "Configure the database" : "ডাটাবেচ কনফিগার করুন", diff --git a/core/l10n/bn_IN.js b/core/l10n/bn_IN.js index a72a91078ae..0cd405630cb 100644 --- a/core/l10n/bn_IN.js +++ b/core/l10n/bn_IN.js @@ -11,7 +11,6 @@ OC.L10N.register( "Delete" : "মুছে ফেলা", "Add" : "যোগ করা", "_download %n file_::_download %n files_" : ["",""], - "Username" : "ইউজারনেম", - "Reset" : "রিসেট করুন" + "Username" : "ইউজারনেম" }, "nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/bn_IN.json b/core/l10n/bn_IN.json index 4e29d0774f6..5c7ce4ef0d7 100644 --- a/core/l10n/bn_IN.json +++ b/core/l10n/bn_IN.json @@ -9,7 +9,6 @@ "Delete" : "মুছে ফেলা", "Add" : "যোগ করা", "_download %n file_::_download %n files_" : ["",""], - "Username" : "ইউজারনেম", - "Reset" : "রিসেট করুন" + "Username" : "ইউজারনেম" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/core/l10n/ca.js b/core/l10n/ca.js index afa434d3570..ee837ea7b7f 100644 --- a/core/l10n/ca.js +++ b/core/l10n/ca.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu. Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. <br />Si sabeu què fer, contacteu amb l'administrador abans de continuar.<br />Voleu continuar?", "I know what I'm doing" : "Sé el que faig", - "Reset password" : "Reinicialitza la contrasenya", "Password can not be changed. Please contact your administrator." : "La contrasenya no es pot canviar. Contacteu amb l'administrador.", "No" : "No", "Yes" : "Sí", @@ -120,13 +119,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No s'ha pogut enviar el correu de restabliment perquè no hi ha cap correu electrònic per aquest usuari. Contacteu amb l'administrador.", "%s password reset" : "restableix la contrasenya %s", "Use the following link to reset your password: {link}" : "Useu l'enllaç següent per restablir la contrasenya: {link}", - "You will receive a link to reset your password via Email." : "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.", - "Username" : "Nom d'usuari", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?", - "Yes, I really want to reset my password now" : "Sí, vull restablir ara la contrasenya", - "Reset" : "Estableix de nou", "New password" : "Contrasenya nova", "New Password" : "Contrasenya nova", + "Reset password" : "Reinicialitza la contrasenya", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!", "For the best results, please consider using a GNU/Linux server instead." : "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.", "Personal" : "Personal", @@ -161,6 +156,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.", "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>", + "Username" : "Nom d'usuari", "Password" : "Contrasenya", "Storage & database" : "Emmagatzematge i base de dades", "Data folder" : "Carpeta de dades", diff --git a/core/l10n/ca.json b/core/l10n/ca.json index c1ea86b4223..374e9a51440 100644 --- a/core/l10n/ca.json +++ b/core/l10n/ca.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu. Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. <br />Si sabeu què fer, contacteu amb l'administrador abans de continuar.<br />Voleu continuar?", "I know what I'm doing" : "Sé el que faig", - "Reset password" : "Reinicialitza la contrasenya", "Password can not be changed. Please contact your administrator." : "La contrasenya no es pot canviar. Contacteu amb l'administrador.", "No" : "No", "Yes" : "Sí", @@ -118,13 +117,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No s'ha pogut enviar el correu de restabliment perquè no hi ha cap correu electrònic per aquest usuari. Contacteu amb l'administrador.", "%s password reset" : "restableix la contrasenya %s", "Use the following link to reset your password: {link}" : "Useu l'enllaç següent per restablir la contrasenya: {link}", - "You will receive a link to reset your password via Email." : "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.", - "Username" : "Nom d'usuari", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?", - "Yes, I really want to reset my password now" : "Sí, vull restablir ara la contrasenya", - "Reset" : "Estableix de nou", "New password" : "Contrasenya nova", "New Password" : "Contrasenya nova", + "Reset password" : "Reinicialitza la contrasenya", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!", "For the best results, please consider using a GNU/Linux server instead." : "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.", "Personal" : "Personal", @@ -159,6 +154,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.", "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>", + "Username" : "Nom d'usuari", "Password" : "Contrasenya", "Storage & database" : "Emmagatzematge i base de dades", "Data folder" : "Carpeta de dades", diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index e858dede737..787b0b10e4a 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte složku nevyžádané pošty a koš.<br>Pokud jej nenaleznete, kontaktujte svého správce systému.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data zpět.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce systému, než budete pokračovat. <br />Opravdu si přejete pokračovat?", "I know what I'm doing" : "Vím co dělám", - "Reset password" : "Obnovit heslo", "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého správce systému.", "No" : "Ne", "Yes" : "Ano", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nelze odeslat email pro změnu hesla, protože u tohoto uživatelského jména není uvedena e-mailová adresa. Kontaktujte prosím svého správce systému.", "%s password reset" : "reset hesla %s", "Use the following link to reset your password: {link}" : "Heslo obnovíte použitím následujícího odkazu: {link}", - "You will receive a link to reset your password via Email." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.", - "Username" : "Uživatelské jméno", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?", - "Yes, I really want to reset my password now" : "Ano, opravdu si nyní přeji obnovit mé heslo", - "Reset" : "Restartovat složku", "New password" : "Nové heslo", "New Password" : "Nové heslo", + "Reset password" : "Obnovit heslo", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!", "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.", "Personal" : "Osobní", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.", "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>", + "Username" : "Uživatelské jméno", "Password" : "Heslo", "Storage & database" : "Úložiště & databáze", "Data folder" : "Složka s daty", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index 7d0b3ada708..8de2fd338c1 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte složku nevyžádané pošty a koš.<br>Pokud jej nenaleznete, kontaktujte svého správce systému.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data zpět.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce systému, než budete pokračovat. <br />Opravdu si přejete pokračovat?", "I know what I'm doing" : "Vím co dělám", - "Reset password" : "Obnovit heslo", "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého správce systému.", "No" : "Ne", "Yes" : "Ano", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nelze odeslat email pro změnu hesla, protože u tohoto uživatelského jména není uvedena e-mailová adresa. Kontaktujte prosím svého správce systému.", "%s password reset" : "reset hesla %s", "Use the following link to reset your password: {link}" : "Heslo obnovíte použitím následujícího odkazu: {link}", - "You will receive a link to reset your password via Email." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.", - "Username" : "Uživatelské jméno", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?", - "Yes, I really want to reset my password now" : "Ano, opravdu si nyní přeji obnovit mé heslo", - "Reset" : "Restartovat složku", "New password" : "Nové heslo", "New Password" : "Nové heslo", + "Reset password" : "Obnovit heslo", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!", "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.", "Personal" : "Osobní", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.", "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>", + "Username" : "Uživatelské jméno", "Password" : "Heslo", "Storage & database" : "Úložiště & databáze", "Data folder" : "Složka s daty", diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js index b5fbab1efb6..06d8b6a1817 100644 --- a/core/l10n/cy_GB.js +++ b/core/l10n/cy_GB.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "Rhagfyr", "Settings" : "Gosodiadau", "Saving..." : "Yn cadw...", - "Reset password" : "Ailosod cyfrinair", "No" : "Na", "Yes" : "Ie", "Choose" : "Dewisiwch", @@ -64,9 +63,8 @@ OC.L10N.register( "_download %n file_::_download %n files_" : ["","","",""], "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.", "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}", - "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.", - "Username" : "Enw defnyddiwr", "New password" : "Cyfrinair newydd", + "Reset password" : "Ailosod cyfrinair", "Personal" : "Personol", "Users" : "Defnyddwyr", "Apps" : "Pecynnau", @@ -77,6 +75,7 @@ OC.L10N.register( "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ", "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>", + "Username" : "Enw defnyddiwr", "Password" : "Cyfrinair", "Data folder" : "Plygell data", "Configure the database" : "Cyflunio'r gronfa ddata", diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json index c3749e52468..a2df02a5e75 100644 --- a/core/l10n/cy_GB.json +++ b/core/l10n/cy_GB.json @@ -20,7 +20,6 @@ "December" : "Rhagfyr", "Settings" : "Gosodiadau", "Saving..." : "Yn cadw...", - "Reset password" : "Ailosod cyfrinair", "No" : "Na", "Yes" : "Ie", "Choose" : "Dewisiwch", @@ -62,9 +61,8 @@ "_download %n file_::_download %n files_" : ["","","",""], "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.", "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}", - "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.", - "Username" : "Enw defnyddiwr", "New password" : "Cyfrinair newydd", + "Reset password" : "Ailosod cyfrinair", "Personal" : "Personol", "Users" : "Defnyddwyr", "Apps" : "Pecynnau", @@ -75,6 +73,7 @@ "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ", "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>", + "Username" : "Enw defnyddiwr", "Password" : "Cyfrinair", "Data folder" : "Plygell data", "Configure the database" : "Cyflunio'r gronfa ddata", diff --git a/core/l10n/da.js b/core/l10n/da.js index 64bd64582a7..a1222792fc5 100644 --- a/core/l10n/da.js +++ b/core/l10n/da.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?", "I know what I'm doing" : "Jeg ved, hvad jeg har gang i", - "Reset password" : "Nulstil kodeord", "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.", "No" : "Nej", "Yes" : "Ja", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren", "%s password reset" : "%s adgangskode nulstillet", "Use the following link to reset your password: {link}" : "Anvend følgende link til at nulstille din adgangskode: {link}", - "You will receive a link to reset your password via Email." : "Du vil modtage et link til at nulstille dit kodeord via e-mail.", - "Username" : "Brugernavn", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?", - "Yes, I really want to reset my password now" : "Ja, Jeg ønsker virkelig at nulstille mit kodeord", - "Reset" : "Nulstil", "New password" : "Nyt kodeord", "New Password" : "Ny adgangskode", + "Reset password" : "Nulstil kodeord", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!", "For the best results, please consider using a GNU/Linux server instead." : "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.", "Personal" : "Personligt", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.", "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>", + "Username" : "Brugernavn", "Password" : "Adgangskode", "Storage & database" : "Lager & database", "Data folder" : "Datamappe", diff --git a/core/l10n/da.json b/core/l10n/da.json index ed40172a698..5111e5d3e05 100644 --- a/core/l10n/da.json +++ b/core/l10n/da.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?", "I know what I'm doing" : "Jeg ved, hvad jeg har gang i", - "Reset password" : "Nulstil kodeord", "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.", "No" : "Nej", "Yes" : "Ja", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren", "%s password reset" : "%s adgangskode nulstillet", "Use the following link to reset your password: {link}" : "Anvend følgende link til at nulstille din adgangskode: {link}", - "You will receive a link to reset your password via Email." : "Du vil modtage et link til at nulstille dit kodeord via e-mail.", - "Username" : "Brugernavn", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?", - "Yes, I really want to reset my password now" : "Ja, Jeg ønsker virkelig at nulstille mit kodeord", - "Reset" : "Nulstil", "New password" : "Nyt kodeord", "New Password" : "Ny adgangskode", + "Reset password" : "Nulstil kodeord", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!", "For the best results, please consider using a GNU/Linux server instead." : "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.", "Personal" : "Personligt", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.", "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>", + "Username" : "Brugernavn", "Password" : "Adgangskode", "Storage & database" : "Lager & database", "Data folder" : "Datamappe", diff --git a/core/l10n/de.js b/core/l10n/de.js index 1258cf40251..6b603f3b68a 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?", "I know what I'm doing" : "Ich weiß, was ich mache", - "Reset password" : "Passwort zurücksetzen", "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.", "No" : "Nein", "Yes" : "Ja", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.", "%s password reset" : "%s-Passwort zurücksetzen", "Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}", - "You will receive a link to reset your password via Email." : "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.", - "Username" : "Benutzername", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?", - "Yes, I really want to reset my password now" : "Ja, ich will mein Passwort jetzt zurücksetzen", - "Reset" : "Zurücksetzen", "New password" : "Neues Passwort", "New Password" : "Neues Passwort", + "Reset password" : "Passwort zurücksetzen", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!", "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.", "Personal" : "Persönlich", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.", "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen", + "Username" : "Benutzername", "Password" : "Passwort", "Storage & database" : "Speicher & Datenbank", "Data folder" : "Datenverzeichnis", diff --git a/core/l10n/de.json b/core/l10n/de.json index 09a77d2ee9a..c1260e70618 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?", "I know what I'm doing" : "Ich weiß, was ich mache", - "Reset password" : "Passwort zurücksetzen", "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.", "No" : "Nein", "Yes" : "Ja", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.", "%s password reset" : "%s-Passwort zurücksetzen", "Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}", - "You will receive a link to reset your password via Email." : "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.", - "Username" : "Benutzername", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?", - "Yes, I really want to reset my password now" : "Ja, ich will mein Passwort jetzt zurücksetzen", - "Reset" : "Zurücksetzen", "New password" : "Neues Passwort", "New Password" : "Neues Passwort", + "Reset password" : "Passwort zurücksetzen", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!", "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.", "Personal" : "Persönlich", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.", "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen", + "Username" : "Benutzername", "Password" : "Passwort", "Storage & database" : "Speicher & Datenbank", "Data folder" : "Datenverzeichnis", diff --git a/core/l10n/de_CH.js b/core/l10n/de_CH.js deleted file mode 100644 index 5a383c104cb..00000000000 --- a/core/l10n/de_CH.js +++ /dev/null @@ -1,107 +0,0 @@ -OC.L10N.register( - "core", - { - "Turned on maintenance mode" : "Wartungsmodus eingeschaltet", - "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet", - "Updated database" : "Datenbank aktualisiert", - "Sunday" : "Sonntag", - "Monday" : "Montag", - "Tuesday" : "Dienstag", - "Wednesday" : "Mittwoch", - "Thursday" : "Donnerstag", - "Friday" : "Freitag", - "Saturday" : "Samstag", - "January" : "Januar", - "February" : "Februar", - "March" : "März", - "April" : "April", - "May" : "Mai", - "June" : "Juni", - "July" : "Juli", - "August" : "August", - "September" : "September", - "October" : "Oktober", - "November" : "November", - "December" : "Dezember", - "Settings" : "Einstellungen", - "Saving..." : "Speichern...", - "Reset password" : "Passwort zurücksetzen", - "No" : "Nein", - "Yes" : "Ja", - "Choose" : "Auswählen", - "Ok" : "OK", - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "New Files" : "Neue Dateien", - "Cancel" : "Abbrechen", - "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.", - "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.", - "Shared" : "Geteilt", - "Share" : "Teilen", - "Error" : "Fehler", - "Error while sharing" : "Fehler beim Teilen", - "Error while unsharing" : "Fehler beim Aufheben der Freigabe", - "Error while changing permissions" : "Fehler bei der Änderung der Rechte", - "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.", - "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.", - "Password protect" : "Passwortschutz", - "Allow Public Upload" : "Öffentliches Hochladen erlauben", - "Email link to person" : "Link per E-Mail verschicken", - "Send" : "Senden", - "Set expiration date" : "Ein Ablaufdatum setzen", - "Expiration date" : "Ablaufdatum", - "group" : "Gruppe", - "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt", - "Shared in {item} with {user}" : "Freigegeben in {item} von {user}", - "Unshare" : "Freigabe aufheben", - "can edit" : "kann bearbeiten", - "access control" : "Zugriffskontrolle", - "create" : "erstellen", - "update" : "aktualisieren", - "delete" : "löschen", - "Password protected" : "Passwortgeschützt", - "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums", - "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums", - "Sending ..." : "Sende ...", - "Email sent" : "Email gesendet", - "Warning" : "Warnung", - "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", - "Delete" : "Löschen", - "Add" : "Hinzufügen", - "_download %n file_::_download %n files_" : ["",""], - "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", - "%s password reset" : "%s-Passwort zurücksetzen", - "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}", - "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.", - "Username" : "Benutzername", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?", - "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.", - "Reset" : "Zurücksetzen", - "New password" : "Neues Passwort", - "Personal" : "Persönlich", - "Users" : "Benutzer", - "Apps" : "Apps", - "Admin" : "Administrator", - "Help" : "Hilfe", - "Access forbidden" : "Zugriff verboten", - "Security Warning" : "Sicherheitshinweis", - "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar", - "Please update your PHP installation to use %s securely." : "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.", - "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", - "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.", - "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen", - "Password" : "Passwort", - "Data folder" : "Datenverzeichnis", - "Configure the database" : "Datenbank einrichten", - "Database user" : "Datenbank-Benutzer", - "Database password" : "Datenbank-Passwort", - "Database name" : "Datenbank-Name", - "Database tablespace" : "Datenbank-Tablespace", - "Database host" : "Datenbank-Host", - "Finish setup" : "Installation abschliessen", - "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", - "Log out" : "Abmelden", - "remember" : "merken", - "Log in" : "Einloggen", - "Alternative Logins" : "Alternative Logins" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/de_CH.json b/core/l10n/de_CH.json deleted file mode 100644 index aa69c7355e0..00000000000 --- a/core/l10n/de_CH.json +++ /dev/null @@ -1,105 +0,0 @@ -{ "translations": { - "Turned on maintenance mode" : "Wartungsmodus eingeschaltet", - "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet", - "Updated database" : "Datenbank aktualisiert", - "Sunday" : "Sonntag", - "Monday" : "Montag", - "Tuesday" : "Dienstag", - "Wednesday" : "Mittwoch", - "Thursday" : "Donnerstag", - "Friday" : "Freitag", - "Saturday" : "Samstag", - "January" : "Januar", - "February" : "Februar", - "March" : "März", - "April" : "April", - "May" : "Mai", - "June" : "Juni", - "July" : "Juli", - "August" : "August", - "September" : "September", - "October" : "Oktober", - "November" : "November", - "December" : "Dezember", - "Settings" : "Einstellungen", - "Saving..." : "Speichern...", - "Reset password" : "Passwort zurücksetzen", - "No" : "Nein", - "Yes" : "Ja", - "Choose" : "Auswählen", - "Ok" : "OK", - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "New Files" : "Neue Dateien", - "Cancel" : "Abbrechen", - "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.", - "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.", - "Shared" : "Geteilt", - "Share" : "Teilen", - "Error" : "Fehler", - "Error while sharing" : "Fehler beim Teilen", - "Error while unsharing" : "Fehler beim Aufheben der Freigabe", - "Error while changing permissions" : "Fehler bei der Änderung der Rechte", - "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.", - "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.", - "Password protect" : "Passwortschutz", - "Allow Public Upload" : "Öffentliches Hochladen erlauben", - "Email link to person" : "Link per E-Mail verschicken", - "Send" : "Senden", - "Set expiration date" : "Ein Ablaufdatum setzen", - "Expiration date" : "Ablaufdatum", - "group" : "Gruppe", - "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt", - "Shared in {item} with {user}" : "Freigegeben in {item} von {user}", - "Unshare" : "Freigabe aufheben", - "can edit" : "kann bearbeiten", - "access control" : "Zugriffskontrolle", - "create" : "erstellen", - "update" : "aktualisieren", - "delete" : "löschen", - "Password protected" : "Passwortgeschützt", - "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums", - "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums", - "Sending ..." : "Sende ...", - "Email sent" : "Email gesendet", - "Warning" : "Warnung", - "The object type is not specified." : "Der Objekttyp ist nicht angegeben.", - "Delete" : "Löschen", - "Add" : "Hinzufügen", - "_download %n file_::_download %n files_" : ["",""], - "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.", - "%s password reset" : "%s-Passwort zurücksetzen", - "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}", - "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.", - "Username" : "Benutzername", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?", - "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.", - "Reset" : "Zurücksetzen", - "New password" : "Neues Passwort", - "Personal" : "Persönlich", - "Users" : "Benutzer", - "Apps" : "Apps", - "Admin" : "Administrator", - "Help" : "Hilfe", - "Access forbidden" : "Zugriff verboten", - "Security Warning" : "Sicherheitshinweis", - "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar", - "Please update your PHP installation to use %s securely." : "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.", - "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", - "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.", - "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen", - "Password" : "Passwort", - "Data folder" : "Datenverzeichnis", - "Configure the database" : "Datenbank einrichten", - "Database user" : "Datenbank-Benutzer", - "Database password" : "Datenbank-Passwort", - "Database name" : "Datenbank-Name", - "Database tablespace" : "Datenbank-Tablespace", - "Database host" : "Datenbank-Host", - "Finish setup" : "Installation abschliessen", - "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.", - "Log out" : "Abmelden", - "remember" : "merken", - "Log in" : "Einloggen", - "Alternative Logins" : "Alternative Logins" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 017ecd1c4fa..aaf21aaf95e 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link, zum Zurücksetzen Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?", "I know what I'm doing" : "Ich weiß, was ich mache", - "Reset password" : "Passwort zurücksetzen", "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.", "No" : "Nein", "Yes" : "Ja", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail, zum Zurücksetzen, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.", "%s password reset" : "%s-Passwort zurücksetzen", "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}", - "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.", - "Username" : "Benutzername", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?", - "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.", - "Reset" : "Zurücksetzen", "New password" : "Neues Passwort", "New Password" : "Neues Passwort", + "Reset password" : "Passwort zurücksetzen", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!", "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.", "Personal" : "Persönlich", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.", "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen", + "Username" : "Benutzername", "Password" : "Passwort", "Storage & database" : "Speicher & Datenbank", "Data folder" : "Datenverzeichnis", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index d6d0c73a777..39e3fd53719 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link, zum Zurücksetzen Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?", "I know what I'm doing" : "Ich weiß, was ich mache", - "Reset password" : "Passwort zurücksetzen", "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.", "No" : "Nein", "Yes" : "Ja", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail, zum Zurücksetzen, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.", "%s password reset" : "%s-Passwort zurücksetzen", "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}", - "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.", - "Username" : "Benutzername", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?", - "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.", - "Reset" : "Zurücksetzen", "New password" : "Neues Passwort", "New Password" : "Neues Passwort", + "Reset password" : "Passwort zurücksetzen", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!", "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.", "Personal" : "Persönlich", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.", "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen", + "Username" : "Benutzername", "Password" : "Passwort", "Storage & database" : "Speicher & Datenbank", "Data folder" : "Datenverzeichnis", diff --git a/core/l10n/el.js b/core/l10n/el.js index a73750695a3..c41928116ba 100644 --- a/core/l10n/el.js +++ b/core/l10n/el.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;", "I know what I'm doing" : "Γνωρίζω τι κάνω", - "Reset password" : "Επαναφορά συνθηματικού", "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.", "No" : "Όχι", "Yes" : "Ναι", @@ -121,13 +120,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.", "%s password reset" : "%s επαναφορά κωδικού πρόσβασης", "Use the following link to reset your password: {link}" : "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}", - "You will receive a link to reset your password via Email." : "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.", - "Username" : "Όνομα χρήστη", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;", - "Yes, I really want to reset my password now" : "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.", - "Reset" : "Επαναφορά", "New password" : "Νέο συνθηματικό", "New Password" : "Νέος Κωδικός", + "Reset password" : "Επαναφορά συνθηματικού", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!", "For the best results, please consider using a GNU/Linux server instead." : "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.", "Personal" : "Προσωπικά", @@ -167,6 +162,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.", "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>", + "Username" : "Όνομα χρήστη", "Password" : "Συνθηματικό", "Storage & database" : "Αποθήκευση & βάση δεδομένων", "Data folder" : "Φάκελος δεδομένων", diff --git a/core/l10n/el.json b/core/l10n/el.json index 010d43cc2c8..6b08b8262c8 100644 --- a/core/l10n/el.json +++ b/core/l10n/el.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;", "I know what I'm doing" : "Γνωρίζω τι κάνω", - "Reset password" : "Επαναφορά συνθηματικού", "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.", "No" : "Όχι", "Yes" : "Ναι", @@ -119,13 +118,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.", "%s password reset" : "%s επαναφορά κωδικού πρόσβασης", "Use the following link to reset your password: {link}" : "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}", - "You will receive a link to reset your password via Email." : "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.", - "Username" : "Όνομα χρήστη", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;", - "Yes, I really want to reset my password now" : "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.", - "Reset" : "Επαναφορά", "New password" : "Νέο συνθηματικό", "New Password" : "Νέος Κωδικός", + "Reset password" : "Επαναφορά συνθηματικού", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!", "For the best results, please consider using a GNU/Linux server instead." : "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.", "Personal" : "Προσωπικά", @@ -165,6 +160,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.", "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>", + "Username" : "Όνομα χρήστη", "Password" : "Συνθηματικό", "Storage & database" : "Αποθήκευση & βάση δεδομένων", "Data folder" : "Φάκελος δεδομένων", diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js index 0c80072e67d..27f28c84908 100644 --- a/core/l10n/en_GB.js +++ b/core/l10n/en_GB.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?", "I know what I'm doing" : "I know what I'm doing", - "Reset password" : "Reset password", "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.", "No" : "No", "Yes" : "Yes", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Couldn't send reset email because there is no email address for this username. Please contact your administrator.", "%s password reset" : "%s password reset", "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}", - "You will receive a link to reset your password via Email." : "You will receive a link to reset your password via email.", - "Username" : "Username", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?", - "Yes, I really want to reset my password now" : "Yes, I really want to reset my password now", - "Reset" : "Reset", "New password" : "New password", "New Password" : "New Password", + "Reset password" : "Reset password", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ", "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.", "Personal" : "Personal", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.", "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>", + "Username" : "Username", "Password" : "Password", "Storage & database" : "Storage & database", "Data folder" : "Data folder", diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json index 4a20f00dd6a..c4daf4bbb97 100644 --- a/core/l10n/en_GB.json +++ b/core/l10n/en_GB.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?", "I know what I'm doing" : "I know what I'm doing", - "Reset password" : "Reset password", "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.", "No" : "No", "Yes" : "Yes", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Couldn't send reset email because there is no email address for this username. Please contact your administrator.", "%s password reset" : "%s password reset", "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}", - "You will receive a link to reset your password via Email." : "You will receive a link to reset your password via email.", - "Username" : "Username", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?", - "Yes, I really want to reset my password now" : "Yes, I really want to reset my password now", - "Reset" : "Reset", "New password" : "New password", "New Password" : "New Password", + "Reset password" : "Reset password", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ", "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.", "Personal" : "Personal", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.", "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>", + "Username" : "Username", "Password" : "Password", "Storage & database" : "Storage & database", "Data folder" : "Data folder", diff --git a/core/l10n/eo.js b/core/l10n/eo.js index cc814c41e35..813d872a640 100644 --- a/core/l10n/eo.js +++ b/core/l10n/eo.js @@ -25,7 +25,6 @@ OC.L10N.register( "December" : "Decembro", "Settings" : "Agordo", "Saving..." : "Konservante...", - "Reset password" : "Rekomenci la pasvorton", "No" : "Ne", "Yes" : "Jes", "Choose" : "Elekti", @@ -86,10 +85,8 @@ OC.L10N.register( "Please reload the page." : "Bonvolu reŝargi la paĝon.", "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.", "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}", - "You will receive a link to reset your password via Email." : "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.", - "Username" : "Uzantonomo", - "Yes, I really want to reset my password now" : "Jes, mi vere volas restarigi mian pasvorton nun", "New password" : "Nova pasvorto", + "Reset password" : "Rekomenci la pasvorton", "Personal" : "Persona", "Users" : "Uzantoj", "Apps" : "Aplikaĵoj", @@ -105,6 +102,7 @@ OC.L10N.register( "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)", "Please update your PHP installation to use %s securely." : "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.", "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>", + "Username" : "Uzantonomo", "Password" : "Pasvorto", "Data folder" : "Datuma dosierujo", "Configure the database" : "Agordi la datumbazon", diff --git a/core/l10n/eo.json b/core/l10n/eo.json index dc4d9d6eefc..64e2da42ecb 100644 --- a/core/l10n/eo.json +++ b/core/l10n/eo.json @@ -23,7 +23,6 @@ "December" : "Decembro", "Settings" : "Agordo", "Saving..." : "Konservante...", - "Reset password" : "Rekomenci la pasvorton", "No" : "Ne", "Yes" : "Jes", "Choose" : "Elekti", @@ -84,10 +83,8 @@ "Please reload the page." : "Bonvolu reŝargi la paĝon.", "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.", "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}", - "You will receive a link to reset your password via Email." : "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.", - "Username" : "Uzantonomo", - "Yes, I really want to reset my password now" : "Jes, mi vere volas restarigi mian pasvorton nun", "New password" : "Nova pasvorto", + "Reset password" : "Rekomenci la pasvorton", "Personal" : "Persona", "Users" : "Uzantoj", "Apps" : "Aplikaĵoj", @@ -103,6 +100,7 @@ "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)", "Please update your PHP installation to use %s securely." : "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.", "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>", + "Username" : "Uzantonomo", "Password" : "Pasvorto", "Data folder" : "Datuma dosierujo", "Configure the database" : "Agordi la datumbazon", diff --git a/core/l10n/es.js b/core/l10n/es.js index b963b9d3f01..be1bb9ffe72 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte a su administrador local.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sus archivos están cifrados. Si no has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?", "I know what I'm doing" : "Yo se lo que estoy haciendo", - "Reset password" : "Restablecer contraseña", "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.", "No" : "No", "Yes" : "Sí", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar la reiniciación del correo electrónico, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.", "%s password reset" : "%s restablecer contraseña", "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}", - "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña", - "Username" : "Nombre de usuario", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?", - "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora", - "Reset" : "Reiniciar", "New password" : "Nueva contraseña", "New Password" : "Nueva contraseña", + "Reset password" : "Restablecer contraseña", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ", "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.", "Personal" : "Personal", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>", + "Username" : "Nombre de usuario", "Password" : "Contraseña", "Storage & database" : "Almacenamiento y base de datos", "Data folder" : "Directorio de datos", diff --git a/core/l10n/es.json b/core/l10n/es.json index 008891d5c98..742703e87c9 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte a su administrador local.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sus archivos están cifrados. Si no has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?", "I know what I'm doing" : "Yo se lo que estoy haciendo", - "Reset password" : "Restablecer contraseña", "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.", "No" : "No", "Yes" : "Sí", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar la reiniciación del correo electrónico, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.", "%s password reset" : "%s restablecer contraseña", "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}", - "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña", - "Username" : "Nombre de usuario", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?", - "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora", - "Reset" : "Reiniciar", "New password" : "Nueva contraseña", "New Password" : "Nueva contraseña", + "Reset password" : "Restablecer contraseña", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ", "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.", "Personal" : "Personal", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>", + "Username" : "Nombre de usuario", "Password" : "Contraseña", "Storage & database" : "Almacenamiento y base de datos", "Data folder" : "Directorio de datos", diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js index f37377f465c..fae6284acf7 100644 --- a/core/l10n/es_AR.js +++ b/core/l10n/es_AR.js @@ -31,7 +31,6 @@ OC.L10N.register( "December" : "diciembre", "Settings" : "Configuración", "Saving..." : "Guardando...", - "Reset password" : "Restablecer contraseña", "No" : "No", "Yes" : "Sí", "Choose" : "Elegir", @@ -100,12 +99,8 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.", "%s password reset" : "%s restablecer contraseña", "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}", - "You will receive a link to reset your password via Email." : "Vas a recibir un enlace por e-mail para restablecer tu contraseña.", - "Username" : "Nombre de usuario", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?", - "Yes, I really want to reset my password now" : "Sí, definitivamente quiero restablecer mi contraseña ahora", - "Reset" : "Resetear", "New password" : "Nueva contraseña:", + "Reset password" : "Restablecer contraseña", "Personal" : "Personal", "Users" : "Usuarios", "Apps" : "Apps", @@ -128,6 +123,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>", + "Username" : "Nombre de usuario", "Password" : "Contraseña", "Data folder" : "Directorio de almacenamiento", "Configure the database" : "Configurar la base de datos", diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json index 219139245a3..c5649a1630a 100644 --- a/core/l10n/es_AR.json +++ b/core/l10n/es_AR.json @@ -29,7 +29,6 @@ "December" : "diciembre", "Settings" : "Configuración", "Saving..." : "Guardando...", - "Reset password" : "Restablecer contraseña", "No" : "No", "Yes" : "Sí", "Choose" : "Elegir", @@ -98,12 +97,8 @@ "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.", "%s password reset" : "%s restablecer contraseña", "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}", - "You will receive a link to reset your password via Email." : "Vas a recibir un enlace por e-mail para restablecer tu contraseña.", - "Username" : "Nombre de usuario", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?", - "Yes, I really want to reset my password now" : "Sí, definitivamente quiero restablecer mi contraseña ahora", - "Reset" : "Resetear", "New password" : "Nueva contraseña:", + "Reset password" : "Restablecer contraseña", "Personal" : "Personal", "Users" : "Usuarios", "Apps" : "Apps", @@ -126,6 +121,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>", + "Username" : "Nombre de usuario", "Password" : "Contraseña", "Data folder" : "Directorio de almacenamiento", "Configure the database" : "Configurar la base de datos", diff --git a/core/l10n/es_CL.js b/core/l10n/es_CL.js index 3808c2cb7c4..98115643cd7 100644 --- a/core/l10n/es_CL.js +++ b/core/l10n/es_CL.js @@ -37,11 +37,11 @@ OC.L10N.register( "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos", "The object type is not specified." : "El tipo de objeto no está especificado.", "_download %n file_::_download %n files_" : ["",""], - "Username" : "Usuario", "Personal" : "Personal", "Users" : "Usuarios", "Admin" : "Administración", "Help" : "Ayuda", + "Username" : "Usuario", "Password" : "Clave", "You are accessing the server from an untrusted domain." : "Usted está accediendo al servidor desde un dominio no confiable.", "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php" diff --git a/core/l10n/es_CL.json b/core/l10n/es_CL.json index 1760e39c6c6..e54689d44b2 100644 --- a/core/l10n/es_CL.json +++ b/core/l10n/es_CL.json @@ -35,11 +35,11 @@ "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos", "The object type is not specified." : "El tipo de objeto no está especificado.", "_download %n file_::_download %n files_" : ["",""], - "Username" : "Usuario", "Personal" : "Personal", "Users" : "Usuarios", "Admin" : "Administración", "Help" : "Ayuda", + "Username" : "Usuario", "Password" : "Clave", "You are accessing the server from an untrusted domain." : "Usted está accediendo al servidor desde un dominio no confiable.", "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php" diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js index d830538bed3..66fc3efb9a6 100644 --- a/core/l10n/es_MX.js +++ b/core/l10n/es_MX.js @@ -31,7 +31,6 @@ OC.L10N.register( "December" : "Diciembre", "Settings" : "Ajustes", "Saving..." : "Guardando...", - "Reset password" : "Restablecer contraseña", "No" : "No", "Yes" : "Sí", "Choose" : "Seleccionar", @@ -94,12 +93,8 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", "%s password reset" : "%s restablecer contraseña", "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}", - "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña", - "Username" : "Nombre de usuario", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?", - "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora", - "Reset" : "Reiniciar", "New password" : "Nueva contraseña", + "Reset password" : "Restablecer contraseña", "Personal" : "Personal", "Users" : "Usuarios", "Apps" : "Aplicaciones", @@ -122,6 +117,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>", + "Username" : "Nombre de usuario", "Password" : "Contraseña", "Data folder" : "Directorio de datos", "Configure the database" : "Configurar la base de datos", diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json index 99da53b91fe..df3f3aa655a 100644 --- a/core/l10n/es_MX.json +++ b/core/l10n/es_MX.json @@ -29,7 +29,6 @@ "December" : "Diciembre", "Settings" : "Ajustes", "Saving..." : "Guardando...", - "Reset password" : "Restablecer contraseña", "No" : "No", "Yes" : "Sí", "Choose" : "Seleccionar", @@ -92,12 +91,8 @@ "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", "%s password reset" : "%s restablecer contraseña", "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}", - "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña", - "Username" : "Nombre de usuario", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?", - "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora", - "Reset" : "Reiniciar", "New password" : "Nueva contraseña", + "Reset password" : "Restablecer contraseña", "Personal" : "Personal", "Users" : "Usuarios", "Apps" : "Aplicaciones", @@ -120,6 +115,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>", + "Username" : "Nombre de usuario", "Password" : "Contraseña", "Data folder" : "Directorio de datos", "Configure the database" : "Configurar la base de datos", diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js index 7325c6478d8..25681f3486b 100644 --- a/core/l10n/et_EE.js +++ b/core/l10n/et_EE.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?", "I know what I'm doing" : "Ma tean mida teen", - "Reset password" : "Nulli parool", "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.", "No" : "Ei", "Yes" : "Jah", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.", "%s password reset" : "%s parooli lähtestus", "Use the following link to reset your password: {link}" : "Kasuta järgnevat linki oma parooli taastamiseks: {link}", - "You will receive a link to reset your password via Email." : "Sinu parooli taastamise link saadetakse sulle e-postile.", - "Username" : "Kasutajanimi", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?", - "Yes, I really want to reset my password now" : "Jah, ma tõesti soovin oma parooli praegu taastada", - "Reset" : "Algseaded", "New password" : "Uus parool", "New Password" : "Uus parool", + "Reset password" : "Nulli parool", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!", "For the best results, please consider using a GNU/Linux server instead." : "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.", "Personal" : "Isiklik", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.", "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>", + "Username" : "Kasutajanimi", "Password" : "Parool", "Storage & database" : "Andmehoidla ja andmebaas", "Data folder" : "Andmete kaust", diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json index 56ede97196a..eeb51ed5f85 100644 --- a/core/l10n/et_EE.json +++ b/core/l10n/et_EE.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?", "I know what I'm doing" : "Ma tean mida teen", - "Reset password" : "Nulli parool", "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.", "No" : "Ei", "Yes" : "Jah", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.", "%s password reset" : "%s parooli lähtestus", "Use the following link to reset your password: {link}" : "Kasuta järgnevat linki oma parooli taastamiseks: {link}", - "You will receive a link to reset your password via Email." : "Sinu parooli taastamise link saadetakse sulle e-postile.", - "Username" : "Kasutajanimi", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?", - "Yes, I really want to reset my password now" : "Jah, ma tõesti soovin oma parooli praegu taastada", - "Reset" : "Algseaded", "New password" : "Uus parool", "New Password" : "Uus parool", + "Reset password" : "Nulli parool", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!", "For the best results, please consider using a GNU/Linux server instead." : "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.", "Personal" : "Isiklik", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.", "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>", + "Username" : "Kasutajanimi", "Password" : "Parool", "Storage & database" : "Andmehoidla ja andmebaas", "Data folder" : "Andmete kaust", diff --git a/core/l10n/eu.js b/core/l10n/eu.js index e90e458a193..7186216bf15 100644 --- a/core/l10n/eu.js +++ b/core/l10n/eu.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora epe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan jarri.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. <br />Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik.<br /> Ziur zaude aurrera jarraitu nahi duzula?", "I know what I'm doing" : "Badakit zer ari naizen egiten", - "Reset password" : "Berrezarri pasahitza", "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.", "No" : "Ez", "Yes" : "Bai", @@ -120,13 +119,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.", "%s password reset" : "%s pasahitza berrezarri", "Use the following link to reset your password: {link}" : "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}", - "You will receive a link to reset your password via Email." : "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.", - "Username" : "Erabiltzaile izena", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?", - "Yes, I really want to reset my password now" : "Bai, nire pasahitza orain berrabiarazi nahi dut", - "Reset" : "Berrezarri", "New password" : "Pasahitz berria", "New Password" : "Pasahitz Berria", + "Reset password" : "Berrezarri pasahitza", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.", "For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.", "Personal" : "Pertsonala", @@ -166,6 +161,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.", "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat", + "Username" : "Erabiltzaile izena", "Password" : "Pasahitza", "Storage & database" : "Biltegia & datubasea", "Data folder" : "Datuen karpeta", diff --git a/core/l10n/eu.json b/core/l10n/eu.json index d851c6e942d..0579dd2dbad 100644 --- a/core/l10n/eu.json +++ b/core/l10n/eu.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora epe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan jarri.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. <br />Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik.<br /> Ziur zaude aurrera jarraitu nahi duzula?", "I know what I'm doing" : "Badakit zer ari naizen egiten", - "Reset password" : "Berrezarri pasahitza", "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.", "No" : "Ez", "Yes" : "Bai", @@ -118,13 +117,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.", "%s password reset" : "%s pasahitza berrezarri", "Use the following link to reset your password: {link}" : "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}", - "You will receive a link to reset your password via Email." : "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.", - "Username" : "Erabiltzaile izena", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?", - "Yes, I really want to reset my password now" : "Bai, nire pasahitza orain berrabiarazi nahi dut", - "Reset" : "Berrezarri", "New password" : "Pasahitz berria", "New Password" : "Pasahitz Berria", + "Reset password" : "Berrezarri pasahitza", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.", "For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.", "Personal" : "Pertsonala", @@ -164,6 +159,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.", "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat", + "Username" : "Erabiltzaile izena", "Password" : "Pasahitza", "Storage & database" : "Biltegia & datubasea", "Data folder" : "Datuen karpeta", diff --git a/core/l10n/fa.js b/core/l10n/fa.js index e280bae0f58..9b93ede5f05 100644 --- a/core/l10n/fa.js +++ b/core/l10n/fa.js @@ -35,7 +35,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟", "I know what I'm doing" : "اطلاع از انجام این کار دارم", - "Reset password" : "تنظیم مجدد رمز عبور", "Password can not be changed. Please contact your administrator." : "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .", "No" : "نه", "Yes" : "بله", @@ -102,12 +101,8 @@ OC.L10N.register( "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.", "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.", "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}", - "You will receive a link to reset your password via Email." : "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.", - "Username" : "نام کاربری", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟", - "Yes, I really want to reset my password now" : "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.", - "Reset" : "تنظیم مجدد", "New password" : "گذرواژه جدید", + "Reset password" : "تنظیم مجدد رمز عبور", "Personal" : "شخصی", "Users" : "کاربران", "Apps" : " برنامه ها", @@ -126,6 +121,7 @@ OC.L10N.register( "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.", "Create an <strong>admin account</strong>" : "لطفا یک <strong> شناسه برای مدیر</strong> بسازید", + "Username" : "نام کاربری", "Password" : "گذرواژه", "Storage & database" : "انبارش و پایگاه داده", "Data folder" : "پوشه اطلاعاتی", diff --git a/core/l10n/fa.json b/core/l10n/fa.json index e7687a02b4c..7914b15ce20 100644 --- a/core/l10n/fa.json +++ b/core/l10n/fa.json @@ -33,7 +33,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟", "I know what I'm doing" : "اطلاع از انجام این کار دارم", - "Reset password" : "تنظیم مجدد رمز عبور", "Password can not be changed. Please contact your administrator." : "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .", "No" : "نه", "Yes" : "بله", @@ -100,12 +99,8 @@ "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.", "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.", "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}", - "You will receive a link to reset your password via Email." : "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.", - "Username" : "نام کاربری", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟", - "Yes, I really want to reset my password now" : "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.", - "Reset" : "تنظیم مجدد", "New password" : "گذرواژه جدید", + "Reset password" : "تنظیم مجدد رمز عبور", "Personal" : "شخصی", "Users" : "کاربران", "Apps" : " برنامه ها", @@ -124,6 +119,7 @@ "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.", "Create an <strong>admin account</strong>" : "لطفا یک <strong> شناسه برای مدیر</strong> بسازید", + "Username" : "نام کاربری", "Password" : "گذرواژه", "Storage & database" : "انبارش و پایگاه داده", "Data folder" : "پوشه اطلاعاتی", diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js index cc9fad66f8b..3d635a8b866 100644 --- a/core/l10n/fi_FI.js +++ b/core/l10n/fi_FI.js @@ -38,7 +38,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?", "I know what I'm doing" : "Tiedän mitä teen", - "Reset password" : "Palauta salasana", "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.", "No" : "Ei", "Yes" : "Kyllä", @@ -123,13 +122,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.", "%s password reset" : "%s salasanan palautus", "Use the following link to reset your password: {link}" : "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}", - "You will receive a link to reset your password via Email." : "Saat sähköpostitse linkin palauttaaksesi salasanan.", - "Username" : "Käyttäjätunnus", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?", - "Yes, I really want to reset my password now" : "Kyllä, haluan palauttaa salasanani nyt", - "Reset" : "Palauta salasana", "New password" : "Uusi salasana", "New Password" : "Uusi salasana", + "Reset password" : "Palauta salasana", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!", "For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.", "Personal" : "Henkilökohtainen", @@ -169,6 +164,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.", "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>", + "Username" : "Käyttäjätunnus", "Password" : "Salasana", "Storage & database" : "Tallennus ja tietokanta", "Data folder" : "Datakansio", diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json index 32ad46587e2..d1554c2a356 100644 --- a/core/l10n/fi_FI.json +++ b/core/l10n/fi_FI.json @@ -36,7 +36,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?", "I know what I'm doing" : "Tiedän mitä teen", - "Reset password" : "Palauta salasana", "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.", "No" : "Ei", "Yes" : "Kyllä", @@ -121,13 +120,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.", "%s password reset" : "%s salasanan palautus", "Use the following link to reset your password: {link}" : "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}", - "You will receive a link to reset your password via Email." : "Saat sähköpostitse linkin palauttaaksesi salasanan.", - "Username" : "Käyttäjätunnus", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?", - "Yes, I really want to reset my password now" : "Kyllä, haluan palauttaa salasanani nyt", - "Reset" : "Palauta salasana", "New password" : "Uusi salasana", "New Password" : "Uusi salasana", + "Reset password" : "Palauta salasana", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!", "For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.", "Personal" : "Henkilökohtainen", @@ -167,6 +162,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.", "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>", + "Username" : "Käyttäjätunnus", "Password" : "Salasana", "Storage & database" : "Tallennus ja tietokanta", "Data folder" : "Datakansio", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 0ff630f70ba..87e8b017832 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", "I know what I'm doing" : "Je sais ce que je fais", - "Reset password" : "Réinitialiser le mot de passe", "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.", "No" : "Non", "Yes" : "Oui", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.", "%s password reset" : "Réinitialisation de votre mot de passe %s", "Use the following link to reset your password: {link}" : "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}", - "You will receive a link to reset your password via Email." : "Vous allez recevoir un courriel contenant un lien pour réinitialiser votre mot de passe.", - "Username" : "Nom d'utilisateur", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?", - "Yes, I really want to reset my password now" : "Oui, je veux vraiment réinitialiser mon mot de passe maintenant", - "Reset" : "Réinitialiser", "New password" : "Nouveau mot de passe", "New Password" : "Nouveau mot de passe", + "Reset password" : "Réinitialiser le mot de passe", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !", "For the best results, please consider using a GNU/Linux server instead." : "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.", "Personal" : "Personnel", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.", "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>", + "Username" : "Nom d'utilisateur", "Password" : "Mot de passe", "Storage & database" : "Stockage & base de données", "Data folder" : "Répertoire des données", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 0fed5b79ab7..5b57d86f532 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?", "I know what I'm doing" : "Je sais ce que je fais", - "Reset password" : "Réinitialiser le mot de passe", "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.", "No" : "Non", "Yes" : "Oui", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.", "%s password reset" : "Réinitialisation de votre mot de passe %s", "Use the following link to reset your password: {link}" : "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}", - "You will receive a link to reset your password via Email." : "Vous allez recevoir un courriel contenant un lien pour réinitialiser votre mot de passe.", - "Username" : "Nom d'utilisateur", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?", - "Yes, I really want to reset my password now" : "Oui, je veux vraiment réinitialiser mon mot de passe maintenant", - "Reset" : "Réinitialiser", "New password" : "Nouveau mot de passe", "New Password" : "Nouveau mot de passe", + "Reset password" : "Réinitialiser le mot de passe", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !", "For the best results, please consider using a GNU/Linux server instead." : "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.", "Personal" : "Personnel", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.", "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>", + "Username" : "Nom d'utilisateur", "Password" : "Mot de passe", "Storage & database" : "Stockage & base de données", "Data folder" : "Répertoire des données", diff --git a/core/l10n/gl.js b/core/l10n/gl.js index 724775644dc..b7a43addec9 100644 --- a/core/l10n/gl.js +++ b/core/l10n/gl.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A ligazón para restabelecer o seu contrasinal foi enviada ao seu correo. Se non a recibe nun prazo razoábel de tempo, vexa o seu cartafol de correo lixo. <br> Se non está ali pregúntelle ao administrador local.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros están cifrados. Se non activou a chave de recuperación, non haberá maneira de recuperar os datos após o restabelecemento do contrasinal. <br />Se non está seguro de que facer, póñase en contacto co administrador antes de continuar. <br /> Confirma que quere?", "I know what I'm doing" : "Sei o estou a facer", - "Reset password" : "Restabelecer o contrasinal", "Password can not be changed. Please contact your administrator." : "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.", "No" : "Non", "Yes" : "Si", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.", "%s password reset" : "Restabelecer o contrasinal %s", "Use the following link to reset your password: {link}" : "Usa a seguinte ligazón para restabelecer o contrasinal: {link}", - "You will receive a link to reset your password via Email." : "Recibirá unha ligazón por correo para restabelecer o contrasinal", - "Username" : "Nome de usuario", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?", - "Yes, I really want to reset my password now" : "Si, confirmo que quero restabelecer agora o meu contrasinal", - "Reset" : "Restabelecer", "New password" : "Novo contrasinal", "New Password" : "Novo contrasinal", + "Reset password" : "Restabelecer o contrasinal", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!", "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.", "Personal" : "Persoal", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>", + "Username" : "Nome de usuario", "Password" : "Contrasinal", "Storage & database" : "Almacenamento e base de datos", "Data folder" : "Cartafol de datos", diff --git a/core/l10n/gl.json b/core/l10n/gl.json index 7715f3bebbf..82157285cd3 100644 --- a/core/l10n/gl.json +++ b/core/l10n/gl.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A ligazón para restabelecer o seu contrasinal foi enviada ao seu correo. Se non a recibe nun prazo razoábel de tempo, vexa o seu cartafol de correo lixo. <br> Se non está ali pregúntelle ao administrador local.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros están cifrados. Se non activou a chave de recuperación, non haberá maneira de recuperar os datos após o restabelecemento do contrasinal. <br />Se non está seguro de que facer, póñase en contacto co administrador antes de continuar. <br /> Confirma que quere?", "I know what I'm doing" : "Sei o estou a facer", - "Reset password" : "Restabelecer o contrasinal", "Password can not be changed. Please contact your administrator." : "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.", "No" : "Non", "Yes" : "Si", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.", "%s password reset" : "Restabelecer o contrasinal %s", "Use the following link to reset your password: {link}" : "Usa a seguinte ligazón para restabelecer o contrasinal: {link}", - "You will receive a link to reset your password via Email." : "Recibirá unha ligazón por correo para restabelecer o contrasinal", - "Username" : "Nome de usuario", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?", - "Yes, I really want to reset my password now" : "Si, confirmo que quero restabelecer agora o meu contrasinal", - "Reset" : "Restabelecer", "New password" : "Novo contrasinal", "New Password" : "Novo contrasinal", + "Reset password" : "Restabelecer o contrasinal", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!", "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.", "Personal" : "Persoal", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.", "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>", + "Username" : "Nome de usuario", "Password" : "Contrasinal", "Storage & database" : "Almacenamento e base de datos", "Data folder" : "Cartafol de datos", diff --git a/core/l10n/he.js b/core/l10n/he.js index 206e0c0de01..015f5843ac9 100644 --- a/core/l10n/he.js +++ b/core/l10n/he.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "דצמבר", "Settings" : "הגדרות", "Saving..." : "שמירה…", - "Reset password" : "איפוס ססמה", "No" : "לא", "Yes" : "כן", "Choose" : "בחירה", @@ -67,10 +66,8 @@ OC.L10N.register( "_download %n file_::_download %n files_" : ["",""], "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.", "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}", - "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.", - "Username" : "שם משתמש", - "Yes, I really want to reset my password now" : "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.", "New password" : "ססמה חדשה", + "Reset password" : "איפוס ססמה", "Personal" : "אישי", "Users" : "משתמשים", "Apps" : "יישומים", @@ -82,6 +79,7 @@ OC.L10N.register( "Please update your PHP installation to use %s securely." : "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.", "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>", + "Username" : "שם משתמש", "Password" : "סיסמא", "Data folder" : "תיקיית נתונים", "Configure the database" : "הגדרת מסד הנתונים", diff --git a/core/l10n/he.json b/core/l10n/he.json index 437098c104f..47d5d82ad99 100644 --- a/core/l10n/he.json +++ b/core/l10n/he.json @@ -20,7 +20,6 @@ "December" : "דצמבר", "Settings" : "הגדרות", "Saving..." : "שמירה…", - "Reset password" : "איפוס ססמה", "No" : "לא", "Yes" : "כן", "Choose" : "בחירה", @@ -65,10 +64,8 @@ "_download %n file_::_download %n files_" : ["",""], "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.", "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}", - "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.", - "Username" : "שם משתמש", - "Yes, I really want to reset my password now" : "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.", "New password" : "ססמה חדשה", + "Reset password" : "איפוס ססמה", "Personal" : "אישי", "Users" : "משתמשים", "Apps" : "יישומים", @@ -80,6 +77,7 @@ "Please update your PHP installation to use %s securely." : "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.", "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>", + "Username" : "שם משתמש", "Password" : "סיסמא", "Data folder" : "תיקיית נתונים", "Configure the database" : "הגדרת מסד הנתונים", diff --git a/core/l10n/hi.js b/core/l10n/hi.js index bd74076a739..787b2031f4e 100644 --- a/core/l10n/hi.js +++ b/core/l10n/hi.js @@ -32,8 +32,6 @@ OC.L10N.register( "Add" : "डाले", "_download %n file_::_download %n files_" : ["",""], "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}", - "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|", - "Username" : "प्रयोक्ता का नाम", "New password" : "नया पासवर्ड", "Personal" : "यक्तिगत", "Users" : "उपयोगकर्ता", @@ -41,6 +39,7 @@ OC.L10N.register( "Help" : "सहयोग", "Security Warning" : "सुरक्षा चेतावनी ", "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ", + "Username" : "प्रयोक्ता का नाम", "Password" : "पासवर्ड", "Data folder" : "डाटा फोल्डर", "Configure the database" : "डेटाबेस कॉन्फ़िगर करें ", diff --git a/core/l10n/hi.json b/core/l10n/hi.json index 82f27644e93..d2b5fefbf4e 100644 --- a/core/l10n/hi.json +++ b/core/l10n/hi.json @@ -30,8 +30,6 @@ "Add" : "डाले", "_download %n file_::_download %n files_" : ["",""], "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}", - "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|", - "Username" : "प्रयोक्ता का नाम", "New password" : "नया पासवर्ड", "Personal" : "यक्तिगत", "Users" : "उपयोगकर्ता", @@ -39,6 +37,7 @@ "Help" : "सहयोग", "Security Warning" : "सुरक्षा चेतावनी ", "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ", + "Username" : "प्रयोक्ता का नाम", "Password" : "पासवर्ड", "Data folder" : "डाटा फोल्डर", "Configure the database" : "डेटाबेस कॉन्फ़िगर करें ", diff --git a/core/l10n/hi_IN.js b/core/l10n/hi_IN.js deleted file mode 100644 index c483b4ab65d..00000000000 --- a/core/l10n/hi_IN.js +++ /dev/null @@ -1,6 +0,0 @@ -OC.L10N.register( - "core", - { - "_{count} file conflict_::_{count} file conflicts_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/hi_IN.json b/core/l10n/hi_IN.json deleted file mode 100644 index 52ecaf565a9..00000000000 --- a/core/l10n/hi_IN.json +++ /dev/null @@ -1,4 +0,0 @@ -{ "translations": { - "_{count} file conflict_::_{count} file conflicts_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/core/l10n/hi_IN.php b/core/l10n/hi_IN.php deleted file mode 100644 index aff098dff1f..00000000000 --- a/core/l10n/hi_IN.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php -$TRANSLATIONS = array( -"_{count} file conflict_::_{count} file conflicts_" => array("","") -); -$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/hr.js b/core/l10n/hr.js index 38de4e13cd3..449c9b248a8 100644 --- a/core/l10n/hr.js +++ b/core/l10n/hr.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Veza za resetiranje vaše lozinke poslana je na vašu adresu e-pošte. Ako je ne primite unekom razumnom vremenskom roku, provjerite svoje spam/junk mape. <br> Ako nije tamo, kontaktirajtesvoga lokalnog administratora.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka,svoje podatke nećete moći dohvatitinakon što vaša lozinka bude resetirana.<br />Ako ne znate što učiniti, prije nego linastavite, molimo kontaktirajte svog administratora. <br />Želite li doista nastaviti?", "I know what I'm doing" : "Znam što radim", - "Reset password" : "Resetirajte lozinku", "Password can not be changed. Please contact your administrator." : "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.", "No" : "Ne", "Yes" : "Da", @@ -118,13 +117,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.", "%s password reset" : "%s lozinka resetirana", "Use the following link to reset your password: {link}" : "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}", - "You will receive a link to reset your password via Email." : "Vezu za resetiranje svoje lozinke primit ćete e-poštom.", - "Username" : "Korisničko ime", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?", - "Yes, I really want to reset my password now" : "Da, ja doista želim sada resetirati svojju lozinku.", - "Reset" : "Resetirajte", "New password" : "Nova lozinka", "New Password" : "Nova lozinka", + "Reset password" : "Resetirajte lozinku", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s na ovoj platformi neće raditi kako treba.", "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.", "Personal" : "Osobno", @@ -149,6 +144,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.", "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>", + "Username" : "Korisničko ime", "Password" : "Lozinka", "Storage & database" : "Pohrana & baza podataka", "Data folder" : "Mapa za podatke", diff --git a/core/l10n/hr.json b/core/l10n/hr.json index fbcc57054e3..21141abc30e 100644 --- a/core/l10n/hr.json +++ b/core/l10n/hr.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Veza za resetiranje vaše lozinke poslana je na vašu adresu e-pošte. Ako je ne primite unekom razumnom vremenskom roku, provjerite svoje spam/junk mape. <br> Ako nije tamo, kontaktirajtesvoga lokalnog administratora.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka,svoje podatke nećete moći dohvatitinakon što vaša lozinka bude resetirana.<br />Ako ne znate što učiniti, prije nego linastavite, molimo kontaktirajte svog administratora. <br />Želite li doista nastaviti?", "I know what I'm doing" : "Znam što radim", - "Reset password" : "Resetirajte lozinku", "Password can not be changed. Please contact your administrator." : "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.", "No" : "Ne", "Yes" : "Da", @@ -116,13 +115,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.", "%s password reset" : "%s lozinka resetirana", "Use the following link to reset your password: {link}" : "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}", - "You will receive a link to reset your password via Email." : "Vezu za resetiranje svoje lozinke primit ćete e-poštom.", - "Username" : "Korisničko ime", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?", - "Yes, I really want to reset my password now" : "Da, ja doista želim sada resetirati svojju lozinku.", - "Reset" : "Resetirajte", "New password" : "Nova lozinka", "New Password" : "Nova lozinka", + "Reset password" : "Resetirajte lozinku", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s na ovoj platformi neće raditi kako treba.", "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.", "Personal" : "Osobno", @@ -147,6 +142,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.", "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>", + "Username" : "Korisničko ime", "Password" : "Lozinka", "Storage & database" : "Pohrana & baza podataka", "Data folder" : "Mapa za podatke", diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js index 867d47cda68..c19ecc457df 100644 --- a/core/l10n/hu_HU.js +++ b/core/l10n/hu_HU.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A jelszó felülírásához a linket e-mailben elküldtük. Ha a levél elfogadható időn belül nem érkezik meg, ellenőrizze a spam/levélszemét mappát.<br>Ha nincs ott, kérdezze meg a helyi rendszergazdát.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?", "I know what I'm doing" : "Tudom mit csinálok.", - "Reset password" : "Jelszó-visszaállítás", "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.", "No" : "Nem", "Yes" : "Igen", @@ -120,13 +119,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.", "%s password reset" : "%s jelszó visszaállítás", "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}", - "You will receive a link to reset your password via Email." : "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.", - "Username" : "Felhasználónév", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?", - "Yes, I really want to reset my password now" : "Igen, tényleg meg akarom változtatni a jelszavam", - "Reset" : "Visszaállítás", "New password" : "Az új jelszó", "New Password" : "Új jelszó", + "Reset password" : "Jelszó-visszaállítás", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!", "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.", "Personal" : "Személyes", @@ -162,6 +157,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.", "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása", + "Username" : "Felhasználónév", "Password" : "Jelszó", "Storage & database" : "Tárolás és adatbázis", "Data folder" : "Adatkönyvtár", diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json index 3ab7d5d2e97..fd4a2e66680 100644 --- a/core/l10n/hu_HU.json +++ b/core/l10n/hu_HU.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A jelszó felülírásához a linket e-mailben elküldtük. Ha a levél elfogadható időn belül nem érkezik meg, ellenőrizze a spam/levélszemét mappát.<br>Ha nincs ott, kérdezze meg a helyi rendszergazdát.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?", "I know what I'm doing" : "Tudom mit csinálok.", - "Reset password" : "Jelszó-visszaállítás", "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.", "No" : "Nem", "Yes" : "Igen", @@ -118,13 +117,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.", "%s password reset" : "%s jelszó visszaállítás", "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}", - "You will receive a link to reset your password via Email." : "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.", - "Username" : "Felhasználónév", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?", - "Yes, I really want to reset my password now" : "Igen, tényleg meg akarom változtatni a jelszavam", - "Reset" : "Visszaállítás", "New password" : "Az új jelszó", "New Password" : "Új jelszó", + "Reset password" : "Jelszó-visszaállítás", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!", "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.", "Personal" : "Személyes", @@ -160,6 +155,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.", "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása", + "Username" : "Felhasználónév", "Password" : "Jelszó", "Storage & database" : "Tárolás és adatbázis", "Data folder" : "Adatkönyvtár", diff --git a/core/l10n/ia.js b/core/l10n/ia.js index 8bac55ebfab..791e6910b37 100644 --- a/core/l10n/ia.js +++ b/core/l10n/ia.js @@ -36,7 +36,6 @@ OC.L10N.register( "Saving..." : "Salveguardante...", "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.", "I know what I'm doing" : "Io sape lo que io es facente", - "Reset password" : "Reinitialisar contrasigno", "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.", "No" : "No", "Yes" : "Si", @@ -103,12 +102,9 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.", "%s password reset" : "%s contrasigno re-fixate", "Use the following link to reset your password: {link}" : "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}", - "You will receive a link to reset your password via Email." : "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.", - "Username" : "Nomine de usator", - "Yes, I really want to reset my password now" : "Si, io vermente vole re-configurar mi contrasigno nunc", - "Reset" : "Re-fixar", "New password" : "Nove contrasigno", "New Password" : "Nove contrasigno", + "Reset password" : "Reinitialisar contrasigno", "For the best results, please consider using a GNU/Linux server instead." : "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux.", "Personal" : "Personal", "Users" : "Usatores", @@ -133,6 +129,7 @@ OC.L10N.register( "Security Warning" : "Aviso de securitate", "Please update your PHP installation to use %s securely." : "Pro favor actualisa tu installation de PHP pro usar %s con securitate.", "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>", + "Username" : "Nomine de usator", "Password" : "Contrasigno", "Storage & database" : "Immagazinage & base de datos", "Data folder" : "Dossier de datos", diff --git a/core/l10n/ia.json b/core/l10n/ia.json index 60ece2f9425..80a9b47c0ea 100644 --- a/core/l10n/ia.json +++ b/core/l10n/ia.json @@ -34,7 +34,6 @@ "Saving..." : "Salveguardante...", "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.", "I know what I'm doing" : "Io sape lo que io es facente", - "Reset password" : "Reinitialisar contrasigno", "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.", "No" : "No", "Yes" : "Si", @@ -101,12 +100,9 @@ "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.", "%s password reset" : "%s contrasigno re-fixate", "Use the following link to reset your password: {link}" : "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}", - "You will receive a link to reset your password via Email." : "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.", - "Username" : "Nomine de usator", - "Yes, I really want to reset my password now" : "Si, io vermente vole re-configurar mi contrasigno nunc", - "Reset" : "Re-fixar", "New password" : "Nove contrasigno", "New Password" : "Nove contrasigno", + "Reset password" : "Reinitialisar contrasigno", "For the best results, please consider using a GNU/Linux server instead." : "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux.", "Personal" : "Personal", "Users" : "Usatores", @@ -131,6 +127,7 @@ "Security Warning" : "Aviso de securitate", "Please update your PHP installation to use %s securely." : "Pro favor actualisa tu installation de PHP pro usar %s con securitate.", "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>", + "Username" : "Nomine de usator", "Password" : "Contrasigno", "Storage & database" : "Immagazinage & base de datos", "Data folder" : "Dossier de datos", diff --git a/core/l10n/id.js b/core/l10n/id.js index 7182162297e..47566bb627b 100644 --- a/core/l10n/id.js +++ b/core/l10n/id.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?", "I know what I'm doing" : "Saya tahu apa yang saya lakukan", - "Reset password" : "Setel ulang sandi", "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda", "No" : "Tidak", "Yes" : "Ya", @@ -120,13 +119,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Tidak dapat menyetel ulang email karena tidak ada alamat email untuk nama pengguna ini. Silakan hubungi Administrator Anda.", "%s password reset" : "%s sandi disetel ulang", "Use the following link to reset your password: {link}" : "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}", - "You will receive a link to reset your password via Email." : "Anda akan menerima tautan penyetelan ulang sandi lewat Email.", - "Username" : "Nama pengguna", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?", - "Yes, I really want to reset my password now" : "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang", - "Reset" : "Atur Ulang", "New password" : "Sandi baru", "New Password" : "Sandi Baru", + "Reset password" : "Setel ulang sandi", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!", "For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ", "Personal" : "Pribadi", @@ -166,6 +161,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.", "Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>", + "Username" : "Nama pengguna", "Password" : "Sandi", "Storage & database" : "Penyimpanan & Basis data", "Data folder" : "Folder data", diff --git a/core/l10n/id.json b/core/l10n/id.json index 79e90900d0f..d3327460f31 100644 --- a/core/l10n/id.json +++ b/core/l10n/id.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?", "I know what I'm doing" : "Saya tahu apa yang saya lakukan", - "Reset password" : "Setel ulang sandi", "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda", "No" : "Tidak", "Yes" : "Ya", @@ -118,13 +117,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Tidak dapat menyetel ulang email karena tidak ada alamat email untuk nama pengguna ini. Silakan hubungi Administrator Anda.", "%s password reset" : "%s sandi disetel ulang", "Use the following link to reset your password: {link}" : "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}", - "You will receive a link to reset your password via Email." : "Anda akan menerima tautan penyetelan ulang sandi lewat Email.", - "Username" : "Nama pengguna", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?", - "Yes, I really want to reset my password now" : "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang", - "Reset" : "Atur Ulang", "New password" : "Sandi baru", "New Password" : "Sandi Baru", + "Reset password" : "Setel ulang sandi", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!", "For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ", "Personal" : "Pribadi", @@ -164,6 +159,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.", "Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>", + "Username" : "Nama pengguna", "Password" : "Sandi", "Storage & database" : "Penyimpanan & Basis data", "Data folder" : "Folder data", diff --git a/core/l10n/is.js b/core/l10n/is.js index 8f1f7d09eec..0ac56e51181 100644 --- a/core/l10n/is.js +++ b/core/l10n/is.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "Desember", "Settings" : "Stillingar", "Saving..." : "Er að vista ...", - "Reset password" : "Endursetja lykilorð", "No" : "Nei", "Yes" : "Já", "Choose" : "Veldu", @@ -62,9 +61,8 @@ OC.L10N.register( "_download %n file_::_download %n files_" : ["",""], "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.", "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}", - "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.", - "Username" : "Notendanafn", "New password" : "Nýtt lykilorð", + "Reset password" : "Endursetja lykilorð", "Personal" : "Um mig", "Users" : "Notendur", "Apps" : "Forrit", @@ -73,6 +71,7 @@ OC.L10N.register( "Access forbidden" : "Aðgangur bannaður", "Security Warning" : "Öryggis aðvörun", "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>", + "Username" : "Notendanafn", "Password" : "Lykilorð", "Data folder" : "Gagnamappa", "Configure the database" : "Stilla gagnagrunn", diff --git a/core/l10n/is.json b/core/l10n/is.json index ff69c133fa6..d56e4bbd3d7 100644 --- a/core/l10n/is.json +++ b/core/l10n/is.json @@ -20,7 +20,6 @@ "December" : "Desember", "Settings" : "Stillingar", "Saving..." : "Er að vista ...", - "Reset password" : "Endursetja lykilorð", "No" : "Nei", "Yes" : "Já", "Choose" : "Veldu", @@ -60,9 +59,8 @@ "_download %n file_::_download %n files_" : ["",""], "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.", "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}", - "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.", - "Username" : "Notendanafn", "New password" : "Nýtt lykilorð", + "Reset password" : "Endursetja lykilorð", "Personal" : "Um mig", "Users" : "Notendur", "Apps" : "Forrit", @@ -71,6 +69,7 @@ "Access forbidden" : "Aðgangur bannaður", "Security Warning" : "Öryggis aðvörun", "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>", + "Username" : "Notendanafn", "Password" : "Lykilorð", "Data folder" : "Gagnamappa", "Configure the database" : "Stilla gagnagrunn", diff --git a/core/l10n/it.js b/core/l10n/it.js index dcc221bf885..ed23ad7df28 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, per favore contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?", "I know what I'm doing" : "So cosa sto facendo", - "Reset password" : "Ripristina la password", "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.", "No" : "No", "Yes" : "Sì", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.", "%s password reset" : "Ripristino password di %s", "Use the following link to reset your password: {link}" : "Usa il collegamento seguente per ripristinare la password: {link}", - "You will receive a link to reset your password via Email." : "Riceverai un collegamento per ripristinare la tua password via email", - "Username" : "Nome utente", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?", - "Yes, I really want to reset my password now" : "Sì, voglio davvero ripristinare la mia password adesso", - "Reset" : "Ripristina", "New password" : "Nuova password", "New Password" : "Nuova password", + "Reset password" : "Ripristina la password", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!", "For the best results, please consider using a GNU/Linux server instead." : "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.", "Personal" : "Personale", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.", "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>", + "Username" : "Nome utente", "Password" : "Password", "Storage & database" : "Archiviazione e database", "Data folder" : "Cartella dati", diff --git a/core/l10n/it.json b/core/l10n/it.json index 599c613828b..59073aafaf2 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, per favore contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?", "I know what I'm doing" : "So cosa sto facendo", - "Reset password" : "Ripristina la password", "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.", "No" : "No", "Yes" : "Sì", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.", "%s password reset" : "Ripristino password di %s", "Use the following link to reset your password: {link}" : "Usa il collegamento seguente per ripristinare la password: {link}", - "You will receive a link to reset your password via Email." : "Riceverai un collegamento per ripristinare la tua password via email", - "Username" : "Nome utente", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?", - "Yes, I really want to reset my password now" : "Sì, voglio davvero ripristinare la mia password adesso", - "Reset" : "Ripristina", "New password" : "Nuova password", "New Password" : "Nuova password", + "Reset password" : "Ripristina la password", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!", "For the best results, please consider using a GNU/Linux server instead." : "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.", "Personal" : "Personale", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.", "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>", + "Username" : "Nome utente", "Password" : "Password", "Storage & database" : "Archiviazione e database", "Data folder" : "Cartella dati", diff --git a/core/l10n/ja.js b/core/l10n/ja.js index bba306dafc6..f6a7aa1f846 100644 --- a/core/l10n/ja.js +++ b/core/l10n/ja.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?", "I know what I'm doing" : "どういう操作をしているか理解しています", - "Reset password" : "パスワードをリセット", "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。", "No" : "いいえ", "Yes" : "はい", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "このユーザー名に紐付けられたメールアドレスがないため、リセットメールを送信できませんでした。管理者に問い合わせてください。", "%s password reset" : "%s パスワードリセット", "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}", - "You will receive a link to reset your password via Email." : "メールでパスワードをリセットするリンクが届きます。", - "Username" : "ユーザー名", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？", - "Yes, I really want to reset my password now" : "はい、今すぐパスワードをリセットします。", - "Reset" : "リセット", "New password" : "新しいパスワードを入力", "New Password" : "新しいパスワード", + "Reset password" : "パスワードをリセット", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。", "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。", "Personal" : "個人", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccessファイルが動作していないため、おそらくあなたのデータディレクトリまたはファイルはインターネットからアクセス可能になっています。", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。", "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください", + "Username" : "ユーザー名", "Password" : "パスワード", "Storage & database" : "ストレージとデータベース", "Data folder" : "データフォルダー", diff --git a/core/l10n/ja.json b/core/l10n/ja.json index 706d6bcfc29..c5f1ba49368 100644 --- a/core/l10n/ja.json +++ b/core/l10n/ja.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?", "I know what I'm doing" : "どういう操作をしているか理解しています", - "Reset password" : "パスワードをリセット", "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。", "No" : "いいえ", "Yes" : "はい", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "このユーザー名に紐付けられたメールアドレスがないため、リセットメールを送信できませんでした。管理者に問い合わせてください。", "%s password reset" : "%s パスワードリセット", "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}", - "You will receive a link to reset your password via Email." : "メールでパスワードをリセットするリンクが届きます。", - "Username" : "ユーザー名", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？", - "Yes, I really want to reset my password now" : "はい、今すぐパスワードをリセットします。", - "Reset" : "リセット", "New password" : "新しいパスワードを入力", "New Password" : "新しいパスワード", + "Reset password" : "パスワードをリセット", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。", "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。", "Personal" : "個人", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccessファイルが動作していないため、おそらくあなたのデータディレクトリまたはファイルはインターネットからアクセス可能になっています。", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。", "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください", + "Username" : "ユーザー名", "Password" : "パスワード", "Storage & database" : "ストレージとデータベース", "Data folder" : "データフォルダー", diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js index 699065f6c50..782cd54cf33 100644 --- a/core/l10n/ka_GE.js +++ b/core/l10n/ka_GE.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "დეკემბერი", "Settings" : "პარამეტრები", "Saving..." : "შენახვა...", - "Reset password" : "პაროლის შეცვლა", "No" : "არა", "Yes" : "კი", "Choose" : "არჩევა", @@ -65,9 +64,8 @@ OC.L10N.register( "_download %n file_::_download %n files_" : [""], "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.", "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}", - "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე", - "Username" : "მომხმარებლის სახელი", "New password" : "ახალი პაროლი", + "Reset password" : "პაროლის შეცვლა", "Personal" : "პირადი", "Users" : "მომხმარებელი", "Apps" : "აპლიკაციები", @@ -78,6 +76,7 @@ OC.L10N.register( "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "თქვენი PHP ვერსია შეიცავს საფრთხეს NULL Byte შეტევებისთვის (CVE-2006-7243)", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან .htaccess ფაილი არ მუშაობს.", "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>", + "Username" : "მომხმარებლის სახელი", "Password" : "პაროლი", "Data folder" : "მონაცემთა საქაღალდე", "Configure the database" : "მონაცემთა ბაზის კონფიგურირება", diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json index c7d8d774620..648f71af987 100644 --- a/core/l10n/ka_GE.json +++ b/core/l10n/ka_GE.json @@ -20,7 +20,6 @@ "December" : "დეკემბერი", "Settings" : "პარამეტრები", "Saving..." : "შენახვა...", - "Reset password" : "პაროლის შეცვლა", "No" : "არა", "Yes" : "კი", "Choose" : "არჩევა", @@ -63,9 +62,8 @@ "_download %n file_::_download %n files_" : [""], "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.", "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}", - "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე", - "Username" : "მომხმარებლის სახელი", "New password" : "ახალი პაროლი", + "Reset password" : "პაროლის შეცვლა", "Personal" : "პირადი", "Users" : "მომხმარებელი", "Apps" : "აპლიკაციები", @@ -76,6 +74,7 @@ "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "თქვენი PHP ვერსია შეიცავს საფრთხეს NULL Byte შეტევებისთვის (CVE-2006-7243)", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან .htaccess ფაილი არ მუშაობს.", "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>", + "Username" : "მომხმარებლის სახელი", "Password" : "პაროლი", "Data folder" : "მონაცემთა საქაღალდე", "Configure the database" : "მონაცემთა ბაზის კონფიგურირება", diff --git a/core/l10n/km.js b/core/l10n/km.js index 80b25cbe34c..4b23b1f8a2a 100644 --- a/core/l10n/km.js +++ b/core/l10n/km.js @@ -24,7 +24,6 @@ OC.L10N.register( "December" : "ខែធ្នូ", "Settings" : "ការកំណត់", "Saving..." : "កំពុងរក្សាទុក", - "Reset password" : "កំណត់ពាក្យសម្ងាត់ម្ដងទៀត", "No" : "ទេ", "Yes" : "ព្រម", "Choose" : "ជ្រើស", @@ -74,8 +73,8 @@ OC.L10N.register( "Add" : "បញ្ចូល", "_download %n file_::_download %n files_" : [""], "Please reload the page." : "សូមផ្ទុកទំព័រនេះឡើងវិញ។", - "Username" : "ឈ្មោះអ្នកប្រើ", "New password" : "ពាក្យសម្ងាត់ថ្មី", + "Reset password" : "កំណត់ពាក្យសម្ងាត់ម្ដងទៀត", "Personal" : "ផ្ទាល់ខ្លួន", "Users" : "អ្នកប្រើ", "Apps" : "កម្មវិធី", @@ -84,6 +83,7 @@ OC.L10N.register( "Access forbidden" : "បានហាមឃាត់ការចូល", "Security Warning" : "បម្រាមសុវត្ថិភាព", "Create an <strong>admin account</strong>" : "បង្កើត<strong>គណនីអភិបាល</strong>", + "Username" : "ឈ្មោះអ្នកប្រើ", "Password" : "ពាក្យសម្ងាត់", "Storage & database" : "ឃ្លាំងផ្ទុក & មូលដ្ឋានទិន្នន័យ", "Data folder" : "ថតទិន្នន័យ", diff --git a/core/l10n/km.json b/core/l10n/km.json index 50f693d3620..ccaf0576f2c 100644 --- a/core/l10n/km.json +++ b/core/l10n/km.json @@ -22,7 +22,6 @@ "December" : "ខែធ្នូ", "Settings" : "ការកំណត់", "Saving..." : "កំពុងរក្សាទុក", - "Reset password" : "កំណត់ពាក្យសម្ងាត់ម្ដងទៀត", "No" : "ទេ", "Yes" : "ព្រម", "Choose" : "ជ្រើស", @@ -72,8 +71,8 @@ "Add" : "បញ្ចូល", "_download %n file_::_download %n files_" : [""], "Please reload the page." : "សូមផ្ទុកទំព័រនេះឡើងវិញ។", - "Username" : "ឈ្មោះអ្នកប្រើ", "New password" : "ពាក្យសម្ងាត់ថ្មី", + "Reset password" : "កំណត់ពាក្យសម្ងាត់ម្ដងទៀត", "Personal" : "ផ្ទាល់ខ្លួន", "Users" : "អ្នកប្រើ", "Apps" : "កម្មវិធី", @@ -82,6 +81,7 @@ "Access forbidden" : "បានហាមឃាត់ការចូល", "Security Warning" : "បម្រាមសុវត្ថិភាព", "Create an <strong>admin account</strong>" : "បង្កើត<strong>គណនីអភិបាល</strong>", + "Username" : "ឈ្មោះអ្នកប្រើ", "Password" : "ពាក្យសម្ងាត់", "Storage & database" : "ឃ្លាំងផ្ទុក & មូលដ្ឋានទិន្នន័យ", "Data folder" : "ថតទិន្នន័យ", diff --git a/core/l10n/ko.js b/core/l10n/ko.js index a4c637cec83..91ed8a0fde6 100644 --- a/core/l10n/ko.js +++ b/core/l10n/ko.js @@ -32,7 +32,6 @@ OC.L10N.register( "Settings" : "설정", "Saving..." : "저장 중...", "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.", - "Reset password" : "암호 재설정", "Password can not be changed. Please contact your administrator." : "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.", "No" : "아니요", "Yes" : "예", @@ -103,13 +102,9 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.", "%s password reset" : "%s 암호 재설정", "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}", - "You will receive a link to reset your password via Email." : "이메일로 암호 재설정 링크를 보냈습니다.", - "Username" : "사용자 이름", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?", - "Yes, I really want to reset my password now" : "예, 지금 내 암호를 재설정합니다", - "Reset" : "재설정", "New password" : "새 암호", "New Password" : "새 암호", + "Reset password" : "암호 재설정", "Personal" : "개인", "Users" : "사용자", "Apps" : "앱", @@ -132,6 +127,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.", "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기", + "Username" : "사용자 이름", "Password" : "암호", "Storage & database" : "스토리지 & 데이터베이스", "Data folder" : "데이터 폴더", diff --git a/core/l10n/ko.json b/core/l10n/ko.json index b068150f590..769bc98315b 100644 --- a/core/l10n/ko.json +++ b/core/l10n/ko.json @@ -30,7 +30,6 @@ "Settings" : "설정", "Saving..." : "저장 중...", "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.", - "Reset password" : "암호 재설정", "Password can not be changed. Please contact your administrator." : "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.", "No" : "아니요", "Yes" : "예", @@ -101,13 +100,9 @@ "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.", "%s password reset" : "%s 암호 재설정", "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}", - "You will receive a link to reset your password via Email." : "이메일로 암호 재설정 링크를 보냈습니다.", - "Username" : "사용자 이름", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?", - "Yes, I really want to reset my password now" : "예, 지금 내 암호를 재설정합니다", - "Reset" : "재설정", "New password" : "새 암호", "New Password" : "새 암호", + "Reset password" : "암호 재설정", "Personal" : "개인", "Users" : "사용자", "Apps" : "앱", @@ -130,6 +125,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.", "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기", + "Username" : "사용자 이름", "Password" : "암호", "Storage & database" : "스토리지 & 데이터베이스", "Data folder" : "데이터 폴더", diff --git a/core/l10n/ku_IQ.js b/core/l10n/ku_IQ.js index 7f249580986..1c780a6a019 100644 --- a/core/l10n/ku_IQ.js +++ b/core/l10n/ku_IQ.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Settings" : "دهستكاری", "Saving..." : "پاشکهوتدهکات...", - "Reset password" : "دووباره كردنهوهی وشهی نهێنی", "No" : "نەخێر", "Yes" : "بەڵێ", "_{count} file conflict_::_{count} file conflicts_" : ["",""], @@ -13,12 +12,13 @@ OC.L10N.register( "Warning" : "ئاگاداری", "Add" : "زیادکردن", "_download %n file_::_download %n files_" : ["",""], - "Username" : "ناوی بهکارهێنهر", "New password" : "وشەی نهێنی نوێ", + "Reset password" : "دووباره كردنهوهی وشهی نهێنی", "Users" : "بهكارهێنهر", "Apps" : "بهرنامهكان", "Admin" : "بهڕێوهبهری سهرهكی", "Help" : "یارمەتی", + "Username" : "ناوی بهکارهێنهر", "Password" : "وشەی تێپەربو", "Data folder" : "زانیاری فۆڵدهر", "Database user" : "بهكارهێنهری داتابهیس", diff --git a/core/l10n/ku_IQ.json b/core/l10n/ku_IQ.json index 2772a2895a2..3dcea4b4fa2 100644 --- a/core/l10n/ku_IQ.json +++ b/core/l10n/ku_IQ.json @@ -1,7 +1,6 @@ { "translations": { "Settings" : "دهستكاری", "Saving..." : "پاشکهوتدهکات...", - "Reset password" : "دووباره كردنهوهی وشهی نهێنی", "No" : "نەخێر", "Yes" : "بەڵێ", "_{count} file conflict_::_{count} file conflicts_" : ["",""], @@ -11,12 +10,13 @@ "Warning" : "ئاگاداری", "Add" : "زیادکردن", "_download %n file_::_download %n files_" : ["",""], - "Username" : "ناوی بهکارهێنهر", "New password" : "وشەی نهێنی نوێ", + "Reset password" : "دووباره كردنهوهی وشهی نهێنی", "Users" : "بهكارهێنهر", "Apps" : "بهرنامهكان", "Admin" : "بهڕێوهبهری سهرهكی", "Help" : "یارمەتی", + "Username" : "ناوی بهکارهێنهر", "Password" : "وشەی تێپەربو", "Data folder" : "زانیاری فۆڵدهر", "Database user" : "بهكارهێنهری داتابهیس", diff --git a/core/l10n/lb.js b/core/l10n/lb.js index 90ceb4cd8b8..cb918f1e87e 100644 --- a/core/l10n/lb.js +++ b/core/l10n/lb.js @@ -28,7 +28,6 @@ OC.L10N.register( "December" : "Dezember", "Settings" : "Astellungen", "Saving..." : "Speicheren...", - "Reset password" : "Passwuert zréck setzen", "No" : "Nee", "Yes" : "Jo", "Choose" : "Auswielen", @@ -80,12 +79,8 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet.", "%s password reset" : "%s Passwuert ass nei gesat", "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}", - "You will receive a link to reset your password via Email." : "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.", - "Username" : "Benotzernumm", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?", - "Yes, I really want to reset my password now" : "Jo, ech wëll mäi Passwuert elo zrécksetzen", - "Reset" : "Zeréck setzen", "New password" : "Neit Passwuert", + "Reset password" : "Passwuert zréck setzen", "Personal" : "Perséinlech", "Users" : "Benotzer", "Apps" : "Applikatiounen", @@ -100,6 +95,7 @@ OC.L10N.register( "Please update your PHP installation to use %s securely." : "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.", "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën", + "Username" : "Benotzernumm", "Password" : "Passwuert", "Data folder" : "Daten-Dossier", "Configure the database" : "D'Datebank konfiguréieren", diff --git a/core/l10n/lb.json b/core/l10n/lb.json index 9a1be1e4dd9..f20d81a44cf 100644 --- a/core/l10n/lb.json +++ b/core/l10n/lb.json @@ -26,7 +26,6 @@ "December" : "Dezember", "Settings" : "Astellungen", "Saving..." : "Speicheren...", - "Reset password" : "Passwuert zréck setzen", "No" : "Nee", "Yes" : "Jo", "Choose" : "Auswielen", @@ -78,12 +77,8 @@ "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet.", "%s password reset" : "%s Passwuert ass nei gesat", "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}", - "You will receive a link to reset your password via Email." : "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.", - "Username" : "Benotzernumm", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?", - "Yes, I really want to reset my password now" : "Jo, ech wëll mäi Passwuert elo zrécksetzen", - "Reset" : "Zeréck setzen", "New password" : "Neit Passwuert", + "Reset password" : "Passwuert zréck setzen", "Personal" : "Perséinlech", "Users" : "Benotzer", "Apps" : "Applikatiounen", @@ -98,6 +93,7 @@ "Please update your PHP installation to use %s securely." : "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.", "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën", + "Username" : "Benotzernumm", "Password" : "Passwuert", "Data folder" : "Daten-Dossier", "Configure the database" : "D'Datebank konfiguréieren", diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js index e3796940fbe..5f7f1e3e4e1 100644 --- a/core/l10n/lt_LT.js +++ b/core/l10n/lt_LT.js @@ -31,7 +31,6 @@ OC.L10N.register( "December" : "Gruodis", "Settings" : "Nustatymai", "Saving..." : "Saugoma...", - "Reset password" : "Atkurti slaptažodį", "No" : "Ne", "Yes" : "Taip", "Choose" : "Pasirinkite", @@ -94,12 +93,8 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.", "%s password reset" : "%s slaptažodžio atnaujinimas", "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}", - "You will receive a link to reset your password via Email." : "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.", - "Username" : "Prisijungimo vardas", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?", - "Yes, I really want to reset my password now" : "Taip, aš tikrai noriu atnaujinti slaptažodį", - "Reset" : "Atstatyti", "New password" : "Naujas slaptažodis", + "Reset password" : "Atkurti slaptažodį", "Personal" : "Asmeniniai", "Users" : "Vartotojai", "Apps" : "Programos", @@ -122,6 +117,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.", "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>", + "Username" : "Prisijungimo vardas", "Password" : "Slaptažodis", "Data folder" : "Duomenų katalogas", "Configure the database" : "Nustatyti duomenų bazę", diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json index a70b966aae2..781373ec76e 100644 --- a/core/l10n/lt_LT.json +++ b/core/l10n/lt_LT.json @@ -29,7 +29,6 @@ "December" : "Gruodis", "Settings" : "Nustatymai", "Saving..." : "Saugoma...", - "Reset password" : "Atkurti slaptažodį", "No" : "Ne", "Yes" : "Taip", "Choose" : "Pasirinkite", @@ -92,12 +91,8 @@ "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.", "%s password reset" : "%s slaptažodžio atnaujinimas", "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}", - "You will receive a link to reset your password via Email." : "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.", - "Username" : "Prisijungimo vardas", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?", - "Yes, I really want to reset my password now" : "Taip, aš tikrai noriu atnaujinti slaptažodį", - "Reset" : "Atstatyti", "New password" : "Naujas slaptažodis", + "Reset password" : "Atkurti slaptažodį", "Personal" : "Asmeniniai", "Users" : "Vartotojai", "Apps" : "Programos", @@ -120,6 +115,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.", "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>", + "Username" : "Prisijungimo vardas", "Password" : "Slaptažodis", "Data folder" : "Duomenų katalogas", "Configure the database" : "Nustatyti duomenų bazę", diff --git a/core/l10n/lv.js b/core/l10n/lv.js index 16bb3007e4c..e71b24a060e 100644 --- a/core/l10n/lv.js +++ b/core/l10n/lv.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "Decembris", "Settings" : "Iestatījumi", "Saving..." : "Saglabā...", - "Reset password" : "Mainīt paroli", "No" : "Nē", "Yes" : "Jā", "Choose" : "Izvēlieties", @@ -68,11 +67,8 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.", "%s password reset" : "%s paroles maiņa", "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}", - "You will receive a link to reset your password via Email." : "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.", - "Username" : "Lietotājvārds", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?", - "Yes, I really want to reset my password now" : "Jā, Es tiešām vēlos mainīt savu paroli", "New password" : "Jauna parole", + "Reset password" : "Mainīt paroli", "Personal" : "Personīgi", "Users" : "Lietotāji", "Apps" : "Lietotnes", @@ -85,6 +81,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.", "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>", + "Username" : "Lietotājvārds", "Password" : "Parole", "Data folder" : "Datu mape", "Configure the database" : "Konfigurēt datubāzi", diff --git a/core/l10n/lv.json b/core/l10n/lv.json index afeb3f82a17..684c659d844 100644 --- a/core/l10n/lv.json +++ b/core/l10n/lv.json @@ -20,7 +20,6 @@ "December" : "Decembris", "Settings" : "Iestatījumi", "Saving..." : "Saglabā...", - "Reset password" : "Mainīt paroli", "No" : "Nē", "Yes" : "Jā", "Choose" : "Izvēlieties", @@ -66,11 +65,8 @@ "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.", "%s password reset" : "%s paroles maiņa", "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}", - "You will receive a link to reset your password via Email." : "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.", - "Username" : "Lietotājvārds", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?", - "Yes, I really want to reset my password now" : "Jā, Es tiešām vēlos mainīt savu paroli", "New password" : "Jauna parole", + "Reset password" : "Mainīt paroli", "Personal" : "Personīgi", "Users" : "Lietotāji", "Apps" : "Lietotnes", @@ -83,6 +79,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.", "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>", + "Username" : "Lietotājvārds", "Password" : "Parole", "Data folder" : "Datu mape", "Configure the database" : "Konfigurēt datubāzi", diff --git a/core/l10n/mk.js b/core/l10n/mk.js index 0b1e993a8f4..20ad24d1e38 100644 --- a/core/l10n/mk.js +++ b/core/l10n/mk.js @@ -28,7 +28,6 @@ OC.L10N.register( "December" : "Декември", "Settings" : "Подесувања", "Saving..." : "Снимам...", - "Reset password" : "Ресетирај лозинка", "No" : "Не", "Yes" : "Да", "Choose" : "Избери", @@ -86,11 +85,8 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.", "%s password reset" : "%s ресетирање на лозинката", "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}", - "You will receive a link to reset your password via Email." : "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.", - "Username" : "Корисничко име", - "Yes, I really want to reset my password now" : "Да, јас сега навистина сакам да ја поништам својата лозинка", - "Reset" : "Поништи", "New password" : "Нова лозинка", + "Reset password" : "Ресетирај лозинка", "Personal" : "Лично", "Users" : "Корисници", "Apps" : "Аппликации", @@ -109,6 +105,7 @@ OC.L10N.register( "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.", "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>", + "Username" : "Корисничко име", "Password" : "Лозинка", "Data folder" : "Фолдер со податоци", "Configure the database" : "Конфигурирај ја базата", diff --git a/core/l10n/mk.json b/core/l10n/mk.json index 2da6b74e601..19fbf344532 100644 --- a/core/l10n/mk.json +++ b/core/l10n/mk.json @@ -26,7 +26,6 @@ "December" : "Декември", "Settings" : "Подесувања", "Saving..." : "Снимам...", - "Reset password" : "Ресетирај лозинка", "No" : "Не", "Yes" : "Да", "Choose" : "Избери", @@ -84,11 +83,8 @@ "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.", "%s password reset" : "%s ресетирање на лозинката", "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}", - "You will receive a link to reset your password via Email." : "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.", - "Username" : "Корисничко име", - "Yes, I really want to reset my password now" : "Да, јас сега навистина сакам да ја поништам својата лозинка", - "Reset" : "Поништи", "New password" : "Нова лозинка", + "Reset password" : "Ресетирај лозинка", "Personal" : "Лично", "Users" : "Корисници", "Apps" : "Аппликации", @@ -107,6 +103,7 @@ "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.", "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>", + "Username" : "Корисничко име", "Password" : "Лозинка", "Data folder" : "Фолдер со податоци", "Configure the database" : "Конфигурирај ја базата", diff --git a/core/l10n/ms_MY.js b/core/l10n/ms_MY.js index 612641fe748..7bf41489825 100644 --- a/core/l10n/ms_MY.js +++ b/core/l10n/ms_MY.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "Disember", "Settings" : "Tetapan", "Saving..." : "Simpan...", - "Reset password" : "Penetapan semula kata laluan", "No" : "Tidak", "Yes" : "Ya", "Ok" : "Ok", @@ -38,9 +37,8 @@ OC.L10N.register( "Add" : "Tambah", "_download %n file_::_download %n files_" : [""], "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}", - "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel", - "Username" : "Nama pengguna", "New password" : "Kata laluan baru", + "Reset password" : "Penetapan semula kata laluan", "Personal" : "Peribadi", "Users" : "Pengguna", "Apps" : "Aplikasi", @@ -49,6 +47,7 @@ OC.L10N.register( "Access forbidden" : "Larangan akses", "Security Warning" : "Amaran keselamatan", "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>", + "Username" : "Nama pengguna", "Password" : "Kata laluan", "Data folder" : "Fail data", "Configure the database" : "Konfigurasi pangkalan data", diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json index c1323607c8c..3f23b40e847 100644 --- a/core/l10n/ms_MY.json +++ b/core/l10n/ms_MY.json @@ -20,7 +20,6 @@ "December" : "Disember", "Settings" : "Tetapan", "Saving..." : "Simpan...", - "Reset password" : "Penetapan semula kata laluan", "No" : "Tidak", "Yes" : "Ya", "Ok" : "Ok", @@ -36,9 +35,8 @@ "Add" : "Tambah", "_download %n file_::_download %n files_" : [""], "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}", - "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel", - "Username" : "Nama pengguna", "New password" : "Kata laluan baru", + "Reset password" : "Penetapan semula kata laluan", "Personal" : "Peribadi", "Users" : "Pengguna", "Apps" : "Aplikasi", @@ -47,6 +45,7 @@ "Access forbidden" : "Larangan akses", "Security Warning" : "Amaran keselamatan", "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>", + "Username" : "Nama pengguna", "Password" : "Kata laluan", "Data folder" : "Fail data", "Configure the database" : "Konfigurasi pangkalan data", diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js index ff87f52a5e2..4865ebd319e 100644 --- a/core/l10n/my_MM.js +++ b/core/l10n/my_MM.js @@ -28,8 +28,6 @@ OC.L10N.register( "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်", "Add" : "ပေါင်းထည့်", "_download %n file_::_download %n files_" : [""], - "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။", - "Username" : "သုံးစွဲသူအမည်", "New password" : "စကားဝှက်အသစ်", "Users" : "သုံးစွဲသူ", "Apps" : "Apps", @@ -37,6 +35,7 @@ OC.L10N.register( "Help" : "အကူအညီ", "Security Warning" : "လုံခြုံရေးသတိပေးချက်", "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်", + "Username" : "သုံးစွဲသူအမည်", "Password" : "စကားဝှက်", "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်", "Database user" : "Database သုံးစွဲသူ", diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json index 086e14cdad0..fd30a3df74b 100644 --- a/core/l10n/my_MM.json +++ b/core/l10n/my_MM.json @@ -26,8 +26,6 @@ "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်", "Add" : "ပေါင်းထည့်", "_download %n file_::_download %n files_" : [""], - "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။", - "Username" : "သုံးစွဲသူအမည်", "New password" : "စကားဝှက်အသစ်", "Users" : "သုံးစွဲသူ", "Apps" : "Apps", @@ -35,6 +33,7 @@ "Help" : "အကူအညီ", "Security Warning" : "လုံခြုံရေးသတိပေးချက်", "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်", + "Username" : "သုံးစွဲသူအမည်", "Password" : "စကားဝှက်", "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်", "Database user" : "Database သုံးစွဲသူ", diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js index a033c38aa77..5bb81e3f7a1 100644 --- a/core/l10n/nb_NO.js +++ b/core/l10n/nb_NO.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?", "I know what I'm doing" : "Jeg vet hva jeg gjør", - "Reset password" : "Tilbakestill passord", "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.", "No" : "Nei", "Yes" : "Ja", @@ -120,13 +119,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.", "%s password reset" : "%s tilbakestilling av passord", "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}", - "You will receive a link to reset your password via Email." : "Du burde motta detaljer om å tilbakestille passordet ditt via epost.", - "Username" : "Brukernavn", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?", - "Yes, I really want to reset my password now" : "Ja, jeg vil virkelig tilbakestille passordet mitt nå", - "Reset" : "Tilbakestill", "New password" : "Nytt passord", "New Password" : "Nytt passord", + "Reset password" : "Tilbakestill passord", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!", "For the best results, please consider using a GNU/Linux server instead." : "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.", "Personal" : "Personlig", @@ -165,6 +160,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.", "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>", + "Username" : "Brukernavn", "Password" : "Passord", "Storage & database" : "Lagring og database", "Data folder" : "Datamappe", diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json index 9ad2c468000..14c4ce0de01 100644 --- a/core/l10n/nb_NO.json +++ b/core/l10n/nb_NO.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?", "I know what I'm doing" : "Jeg vet hva jeg gjør", - "Reset password" : "Tilbakestill passord", "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.", "No" : "Nei", "Yes" : "Ja", @@ -118,13 +117,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.", "%s password reset" : "%s tilbakestilling av passord", "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}", - "You will receive a link to reset your password via Email." : "Du burde motta detaljer om å tilbakestille passordet ditt via epost.", - "Username" : "Brukernavn", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?", - "Yes, I really want to reset my password now" : "Ja, jeg vil virkelig tilbakestille passordet mitt nå", - "Reset" : "Tilbakestill", "New password" : "Nytt passord", "New Password" : "Nytt passord", + "Reset password" : "Tilbakestill passord", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!", "For the best results, please consider using a GNU/Linux server instead." : "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.", "Personal" : "Personlig", @@ -163,6 +158,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.", "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>", + "Username" : "Brukernavn", "Password" : "Passord", "Storage & database" : "Lagring og database", "Data folder" : "Datamappe", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index 011b04fd790..a3def91c894 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammap. <br>Als het daar niet in zit, neem dan contact op met uw beheerder.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?", "I know what I'm doing" : "Ik weet wat ik doe", - "Reset password" : "Reset wachtwoord", "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.", "No" : "Nee", "Yes" : "Ja", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met uw beheerder.", "%s password reset" : "%s wachtwoord reset", "Use the following link to reset your password: {link}" : "Gebruik de volgende link om uw wachtwoord te resetten: {link}", - "You will receive a link to reset your password via Email." : "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.", - "Username" : "Gebruikersnaam", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?", - "Yes, I really want to reset my password now" : "Ja, ik wil mijn wachtwoord nu echt resetten", - "Reset" : "Reset", "New password" : "Nieuw wachtwoord", "New Password" : "Nieuw wachtwoord", + "Reset password" : "Reset wachtwoord", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!", "For the best results, please consider using a GNU/Linux server instead." : "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.", "Personal" : "Persoonlijk", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.", "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan", + "Username" : "Gebruikersnaam", "Password" : "Wachtwoord", "Storage & database" : "Opslag & database", "Data folder" : "Gegevensmap", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index b59c04e73ff..6a5e2dccab3 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammap. <br>Als het daar niet in zit, neem dan contact op met uw beheerder.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?", "I know what I'm doing" : "Ik weet wat ik doe", - "Reset password" : "Reset wachtwoord", "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.", "No" : "Nee", "Yes" : "Ja", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met uw beheerder.", "%s password reset" : "%s wachtwoord reset", "Use the following link to reset your password: {link}" : "Gebruik de volgende link om uw wachtwoord te resetten: {link}", - "You will receive a link to reset your password via Email." : "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.", - "Username" : "Gebruikersnaam", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?", - "Yes, I really want to reset my password now" : "Ja, ik wil mijn wachtwoord nu echt resetten", - "Reset" : "Reset", "New password" : "Nieuw wachtwoord", "New Password" : "Nieuw wachtwoord", + "Reset password" : "Reset wachtwoord", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!", "For the best results, please consider using a GNU/Linux server instead." : "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.", "Personal" : "Persoonlijk", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.", "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan", + "Username" : "Gebruikersnaam", "Password" : "Wachtwoord", "Storage & database" : "Opslag & database", "Data folder" : "Gegevensmap", diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js index d6ba6612f0e..2dccb25d657 100644 --- a/core/l10n/nn_NO.js +++ b/core/l10n/nn_NO.js @@ -32,7 +32,6 @@ OC.L10N.register( "Settings" : "Innstillingar", "Saving..." : "Lagrar …", "I know what I'm doing" : "Eg veit kva eg gjer", - "Reset password" : "Nullstill passord", "No" : "Nei", "Yes" : "Ja", "Choose" : "Vel", @@ -91,11 +90,8 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.", "%s password reset" : "%s passordnullstilling", "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}", - "You will receive a link to reset your password via Email." : "Du vil få ein e-post med ei lenkje for å nullstilla passordet.", - "Username" : "Brukarnamn", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?", - "Yes, I really want to reset my password now" : "Ja, eg vil nullstilla passordet mitt no", "New password" : "Nytt passord", + "Reset password" : "Nullstill passord", "Personal" : "Personleg", "Users" : "Brukarar", "Apps" : "Program", @@ -108,6 +104,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.", "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>", + "Username" : "Brukarnamn", "Password" : "Passord", "Data folder" : "Datamappe", "Configure the database" : "Set opp databasen", diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json index 7c1bbc858f4..25151b7f68e 100644 --- a/core/l10n/nn_NO.json +++ b/core/l10n/nn_NO.json @@ -30,7 +30,6 @@ "Settings" : "Innstillingar", "Saving..." : "Lagrar …", "I know what I'm doing" : "Eg veit kva eg gjer", - "Reset password" : "Nullstill passord", "No" : "Nei", "Yes" : "Ja", "Choose" : "Vel", @@ -89,11 +88,8 @@ "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.", "%s password reset" : "%s passordnullstilling", "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}", - "You will receive a link to reset your password via Email." : "Du vil få ein e-post med ei lenkje for å nullstilla passordet.", - "Username" : "Brukarnamn", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?", - "Yes, I really want to reset my password now" : "Ja, eg vil nullstilla passordet mitt no", "New password" : "Nytt passord", + "Reset password" : "Nullstill passord", "Personal" : "Personleg", "Users" : "Brukarar", "Apps" : "Program", @@ -106,6 +102,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.", "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>", + "Username" : "Brukarnamn", "Password" : "Passord", "Data folder" : "Datamappe", "Configure the database" : "Set opp databasen", diff --git a/core/l10n/oc.js b/core/l10n/oc.js index 43fee792602..eae84339932 100644 --- a/core/l10n/oc.js +++ b/core/l10n/oc.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "Decembre", "Settings" : "Configuracion", "Saving..." : "Enregistra...", - "Reset password" : "Senhal tornat botar", "No" : "Non", "Yes" : "Òc", "Choose" : "Causís", @@ -52,9 +51,8 @@ OC.L10N.register( "Add" : "Ajusta", "_download %n file_::_download %n files_" : ["",""], "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}", - "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.", - "Username" : "Non d'usancièr", "New password" : "Senhal novèl", + "Reset password" : "Senhal tornat botar", "Personal" : "Personal", "Users" : "Usancièrs", "Apps" : "Apps", @@ -63,6 +61,7 @@ OC.L10N.register( "Access forbidden" : "Acces enebit", "Security Warning" : "Avertiment de securitat", "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>", + "Username" : "Non d'usancièr", "Password" : "Senhal", "Data folder" : "Dorsièr de donadas", "Configure the database" : "Configura la basa de donadas", diff --git a/core/l10n/oc.json b/core/l10n/oc.json index c2068151419..3b26135470a 100644 --- a/core/l10n/oc.json +++ b/core/l10n/oc.json @@ -20,7 +20,6 @@ "December" : "Decembre", "Settings" : "Configuracion", "Saving..." : "Enregistra...", - "Reset password" : "Senhal tornat botar", "No" : "Non", "Yes" : "Òc", "Choose" : "Causís", @@ -50,9 +49,8 @@ "Add" : "Ajusta", "_download %n file_::_download %n files_" : ["",""], "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}", - "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.", - "Username" : "Non d'usancièr", "New password" : "Senhal novèl", + "Reset password" : "Senhal tornat botar", "Personal" : "Personal", "Users" : "Usancièrs", "Apps" : "Apps", @@ -61,6 +59,7 @@ "Access forbidden" : "Acces enebit", "Security Warning" : "Avertiment de securitat", "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>", + "Username" : "Non d'usancièr", "Password" : "Senhal", "Data folder" : "Dorsièr de donadas", "Configure the database" : "Configura la basa de donadas", diff --git a/core/l10n/pa.js b/core/l10n/pa.js index 63933496c0c..c4cc7222434 100644 --- a/core/l10n/pa.js +++ b/core/l10n/pa.js @@ -34,8 +34,8 @@ OC.L10N.register( "Warning" : "ਚੇਤਾਵਨੀ", "Delete" : "ਹਟਾਓ", "_download %n file_::_download %n files_" : ["",""], - "Username" : "ਯੂਜ਼ਰ-ਨਾਂ", "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ", + "Username" : "ਯੂਜ਼ਰ-ਨਾਂ", "Password" : "ਪਾਸਵਰ" }, "nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/pa.json b/core/l10n/pa.json index 6b1259ba9cc..c46d4a37b42 100644 --- a/core/l10n/pa.json +++ b/core/l10n/pa.json @@ -32,8 +32,8 @@ "Warning" : "ਚੇਤਾਵਨੀ", "Delete" : "ਹਟਾਓ", "_download %n file_::_download %n files_" : ["",""], - "Username" : "ਯੂਜ਼ਰ-ਨਾਂ", "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ", + "Username" : "ਯੂਜ਼ਰ-ਨਾਂ", "Password" : "ਪਾਸਵਰ" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/core/l10n/pl.js b/core/l10n/pl.js index 57b18d457c3..35d7faeabf4 100644 --- a/core/l10n/pl.js +++ b/core/l10n/pl.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ", "I know what I'm doing" : "Wiem co robię", - "Reset password" : "Zresetuj hasło", "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.", "No" : "Nie", "Yes" : "Tak", @@ -119,13 +118,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika lub adres email jest poprawny. Skontaktuj się z administratorem.", "%s password reset" : "%s reset hasła", "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}", - "You will receive a link to reset your password via Email." : "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.", - "Username" : "Nazwa użytkownika", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?", - "Yes, I really want to reset my password now" : "Tak, naprawdę chcę zresetować hasło teraz", - "Reset" : "Resetuj", "New password" : "Nowe hasło", "New Password" : "Nowe hasło", + "Reset password" : "Zresetuj hasło", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!", "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.", "Personal" : "Osobiste", @@ -164,6 +159,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.", "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>", + "Username" : "Nazwa użytkownika", "Password" : "Hasło", "Storage & database" : "Zasoby dysku & baza danych", "Data folder" : "Katalog danych", diff --git a/core/l10n/pl.json b/core/l10n/pl.json index f6c0615fc4e..7ee07cc66af 100644 --- a/core/l10n/pl.json +++ b/core/l10n/pl.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ", "I know what I'm doing" : "Wiem co robię", - "Reset password" : "Zresetuj hasło", "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.", "No" : "Nie", "Yes" : "Tak", @@ -117,13 +116,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika lub adres email jest poprawny. Skontaktuj się z administratorem.", "%s password reset" : "%s reset hasła", "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}", - "You will receive a link to reset your password via Email." : "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.", - "Username" : "Nazwa użytkownika", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?", - "Yes, I really want to reset my password now" : "Tak, naprawdę chcę zresetować hasło teraz", - "Reset" : "Resetuj", "New password" : "Nowe hasło", "New Password" : "Nowe hasło", + "Reset password" : "Zresetuj hasło", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!", "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.", "Personal" : "Osobiste", @@ -162,6 +157,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.", "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>", + "Username" : "Nazwa użytkownika", "Password" : "Hasło", "Storage & database" : "Zasoby dysku & baza danych", "Data folder" : "Katalog danych", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index 041159ce172..918d3d7adea 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para redefinir sua senha foi enviada para o seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique suas pastas de spam/lixo. <br> Se ele não estiver lá, pergunte ao administrador do local.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida. <br/> Se você não tem certeza do que fazer, por favor, contate o administrador antes de continuar. <br/> Você realmente deseja continuar?", "I know what I'm doing" : "Eu sei o que estou fazendo", - "Reset password" : "Redefinir senha", "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.", "No" : "Não", "Yes" : "Sim", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.", "%s password reset" : "%s redefinir senha", "Use the following link to reset your password: {link}" : "Use o seguinte link para redefinir sua senha: {link}", - "You will receive a link to reset your password via Email." : "Você receberá um link para redefinir sua senha por e-mail.", - "Username" : "Nome de usuário", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer, por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?", - "Yes, I really want to reset my password now" : "Sim, realmente quero criar uma nova senha.", - "Reset" : "Resetar", "New password" : "Nova senha", "New Password" : "Nova Senha", + "Reset password" : "Redefinir senha", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!", "For the best results, please consider using a GNU/Linux server instead." : "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.", "Personal" : "Pessoal", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.", "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>", + "Username" : "Nome de usuário", "Password" : "Senha", "Storage & database" : "Armazenamento & banco de dados", "Data folder" : "Pasta de dados", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index 05be1f4cb1c..75f4b8eff1d 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para redefinir sua senha foi enviada para o seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique suas pastas de spam/lixo. <br> Se ele não estiver lá, pergunte ao administrador do local.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida. <br/> Se você não tem certeza do que fazer, por favor, contate o administrador antes de continuar. <br/> Você realmente deseja continuar?", "I know what I'm doing" : "Eu sei o que estou fazendo", - "Reset password" : "Redefinir senha", "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.", "No" : "Não", "Yes" : "Sim", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.", "%s password reset" : "%s redefinir senha", "Use the following link to reset your password: {link}" : "Use o seguinte link para redefinir sua senha: {link}", - "You will receive a link to reset your password via Email." : "Você receberá um link para redefinir sua senha por e-mail.", - "Username" : "Nome de usuário", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer, por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?", - "Yes, I really want to reset my password now" : "Sim, realmente quero criar uma nova senha.", - "Reset" : "Resetar", "New password" : "Nova senha", "New Password" : "Nova Senha", + "Reset password" : "Redefinir senha", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!", "For the best results, please consider using a GNU/Linux server instead." : "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.", "Personal" : "Pessoal", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.", "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>", + "Username" : "Nome de usuário", "Password" : "Senha", "Storage & database" : "Armazenamento & banco de dados", "Data folder" : "Pasta de dados", diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js index f304226c321..09e688a0eb8 100644 --- a/core/l10n/pt_PT.js +++ b/core/l10n/pt_PT.js @@ -1,7 +1,7 @@ OC.L10N.register( "core", { - "Couldn't send mail to following users: %s " : "Não foi possível enviar o correio para os seguintes utilizadores: %s", + "Couldn't send mail to following users: %s " : "Não foi possível enviar a mensagem para os seguintes utilizadores: %s", "Turned on maintenance mode" : "Ativado o modo de manutenção", "Turned off maintenance mode" : "Desativado o modo de manutenção", "Updated database" : "Base de dados atualizada", @@ -33,31 +33,30 @@ OC.L10N.register( "October" : "Outubro", "November" : "Novembro", "December" : "Dezembro", - "Settings" : "Configurações", + "Settings" : "Definições", "Saving..." : "A guardar ...", "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?", - "I know what I'm doing" : "Eu sei o que Eu estou a fazer", - "Reset password" : "Repor palavra-passe", + "I know what I'm doing" : "Eu sei o que eu estou a fazer", "Password can not be changed. Please contact your administrator." : "A palavra-passe não pode ser alterada. Por favor, contacte o seu administrador.", "No" : "Não", "Yes" : "Sim", - "Choose" : "Escolha", - "Error loading file picker template: {error}" : "Erro ao carregar o modelo de selecionador de ficheiro: {error}", + "Choose" : "Escolher", + "Error loading file picker template: {error}" : "Ocorreu um erro ao carregar o modelo do selecionador de ficheiro: {error}", "Ok" : "Ok", - "Error loading message template: {error}" : "Erro ao carregar o template: {error}", + "Error loading message template: {error}" : "Ocorreu um erro ao carregar o modelo: {error}", "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de ficheiro","{count} conflitos de ficheiro"], "One file conflict" : "Um conflito no ficheiro", "New Files" : "Ficheiros Novos", - "Already existing files" : "Ficheiro já existente", + "Already existing files" : "Ficheiros já existentes", "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?", "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.", "Cancel" : "Cancelar", "Continue" : "Continuar", "(all selected)" : "(todos seleccionados)", "({count} selected)" : "({count} seleccionados)", - "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro", + "Error loading file exists template" : "Ocorreu um erro ao carregar o ficheiro do modelo existente", "Very weak password" : "Palavra-passe muito fraca", "Weak password" : "Palavra-passe fraca", "So-so password" : "Palavra-passe aceitável", @@ -76,7 +75,7 @@ OC.L10N.register( "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}", "Shared with you by {owner}" : "Partilhado consigo por {owner}", "Share with user or group …" : "Partilhar com utilizador ou grupo...", - "Share link" : "Partilhar o link", + "Share link" : "Compartilhar hiperligação", "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação", "Password protect" : "Proteger com Palavra-passe", "Choose a password for the public link" : "Defina a palavra-passe para a hiperligação pública", @@ -85,17 +84,17 @@ OC.L10N.register( "Send" : "Enviar", "Set expiration date" : "Especificar data de expiração", "Expiration date" : "Data de expiração", - "Adding user..." : "A adicionar utilizador...", + "Adding user..." : "A adicionar o utilizador ...", "group" : "grupo", "Resharing is not allowed" : "Não é permitido partilhar de novo", "Shared in {item} with {user}" : "Partilhado em {item} com {user}", - "Unshare" : "Deixar de partilhar", - "notify by email" : "Notificar por email", + "Unshare" : "Cancelar partilha", + "notify by email" : "Notificar por correio eletrónico", "can share" : "pode partilhar", "can edit" : "pode editar", - "access control" : "Controlo de acesso", + "access control" : "controlo de acesso", "create" : "criar", - "update" : "actualizar", + "update" : "atualizar", "delete" : "apagar", "Password protected" : "Protegido com Palavra-passe", "Error unsetting expiration date" : "Erro ao retirar a data de expiração", @@ -112,9 +111,9 @@ OC.L10N.register( "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.", "unknown text" : "texto desconhecido", "Hello world!" : "Olá mundo!", - "sunny" : "solarengo", + "sunny" : "soalheiro", "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo está {weather}", - "_download %n file_::_download %n files_" : ["download %n ficheiro","download %n ficheiros"], + "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"], "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.", "Please reload the page." : "Por favor recarregue a página.", "The update was unsuccessful." : "Não foi possível atualizar.", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.", "%s password reset" : "%s reposição da palavra-passe", "Use the following link to reset your password: {link}" : "Utilize a seguinte hiperligação para repor a sua palavra-passe: {link}", - "You will receive a link to reset your password via Email." : "Vai receber uma hiperligação via e-mail para repor a sua palavra-passe", - "Username" : "Nome de utilizador", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?", - "Yes, I really want to reset my password now" : "Sim, eu tenho a certeza que pretendo redefinir agora a minha palavra-passe.", - "Reset" : "Repor", "New password" : "Nova palavra-chave", "New Password" : "Nova palavra-passe", + "Reset password" : "Repor palavra-passe", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.", "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.", "Personal" : "Pessoal", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.", "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>", + "Username" : "Nome de utilizador", "Password" : "Palavra-passe", "Storage & database" : "Armazenamento e base de dados", "Data folder" : "Pasta de dados", diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json index 70586658f8a..8789b6e13d8 100644 --- a/core/l10n/pt_PT.json +++ b/core/l10n/pt_PT.json @@ -1,5 +1,5 @@ { "translations": { - "Couldn't send mail to following users: %s " : "Não foi possível enviar o correio para os seguintes utilizadores: %s", + "Couldn't send mail to following users: %s " : "Não foi possível enviar a mensagem para os seguintes utilizadores: %s", "Turned on maintenance mode" : "Ativado o modo de manutenção", "Turned off maintenance mode" : "Desativado o modo de manutenção", "Updated database" : "Base de dados atualizada", @@ -31,31 +31,30 @@ "October" : "Outubro", "November" : "Novembro", "December" : "Dezembro", - "Settings" : "Configurações", + "Settings" : "Definições", "Saving..." : "A guardar ...", "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?", - "I know what I'm doing" : "Eu sei o que Eu estou a fazer", - "Reset password" : "Repor palavra-passe", + "I know what I'm doing" : "Eu sei o que eu estou a fazer", "Password can not be changed. Please contact your administrator." : "A palavra-passe não pode ser alterada. Por favor, contacte o seu administrador.", "No" : "Não", "Yes" : "Sim", - "Choose" : "Escolha", - "Error loading file picker template: {error}" : "Erro ao carregar o modelo de selecionador de ficheiro: {error}", + "Choose" : "Escolher", + "Error loading file picker template: {error}" : "Ocorreu um erro ao carregar o modelo do selecionador de ficheiro: {error}", "Ok" : "Ok", - "Error loading message template: {error}" : "Erro ao carregar o template: {error}", + "Error loading message template: {error}" : "Ocorreu um erro ao carregar o modelo: {error}", "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de ficheiro","{count} conflitos de ficheiro"], "One file conflict" : "Um conflito no ficheiro", "New Files" : "Ficheiros Novos", - "Already existing files" : "Ficheiro já existente", + "Already existing files" : "Ficheiros já existentes", "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?", "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.", "Cancel" : "Cancelar", "Continue" : "Continuar", "(all selected)" : "(todos seleccionados)", "({count} selected)" : "({count} seleccionados)", - "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro", + "Error loading file exists template" : "Ocorreu um erro ao carregar o ficheiro do modelo existente", "Very weak password" : "Palavra-passe muito fraca", "Weak password" : "Palavra-passe fraca", "So-so password" : "Palavra-passe aceitável", @@ -74,7 +73,7 @@ "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}", "Shared with you by {owner}" : "Partilhado consigo por {owner}", "Share with user or group …" : "Partilhar com utilizador ou grupo...", - "Share link" : "Partilhar o link", + "Share link" : "Compartilhar hiperligação", "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação", "Password protect" : "Proteger com Palavra-passe", "Choose a password for the public link" : "Defina a palavra-passe para a hiperligação pública", @@ -83,17 +82,17 @@ "Send" : "Enviar", "Set expiration date" : "Especificar data de expiração", "Expiration date" : "Data de expiração", - "Adding user..." : "A adicionar utilizador...", + "Adding user..." : "A adicionar o utilizador ...", "group" : "grupo", "Resharing is not allowed" : "Não é permitido partilhar de novo", "Shared in {item} with {user}" : "Partilhado em {item} com {user}", - "Unshare" : "Deixar de partilhar", - "notify by email" : "Notificar por email", + "Unshare" : "Cancelar partilha", + "notify by email" : "Notificar por correio eletrónico", "can share" : "pode partilhar", "can edit" : "pode editar", - "access control" : "Controlo de acesso", + "access control" : "controlo de acesso", "create" : "criar", - "update" : "actualizar", + "update" : "atualizar", "delete" : "apagar", "Password protected" : "Protegido com Palavra-passe", "Error unsetting expiration date" : "Erro ao retirar a data de expiração", @@ -110,9 +109,9 @@ "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.", "unknown text" : "texto desconhecido", "Hello world!" : "Olá mundo!", - "sunny" : "solarengo", + "sunny" : "soalheiro", "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo está {weather}", - "_download %n file_::_download %n files_" : ["download %n ficheiro","download %n ficheiros"], + "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"], "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.", "Please reload the page." : "Por favor recarregue a página.", "The update was unsuccessful." : "Não foi possível atualizar.", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.", "%s password reset" : "%s reposição da palavra-passe", "Use the following link to reset your password: {link}" : "Utilize a seguinte hiperligação para repor a sua palavra-passe: {link}", - "You will receive a link to reset your password via Email." : "Vai receber uma hiperligação via e-mail para repor a sua palavra-passe", - "Username" : "Nome de utilizador", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?", - "Yes, I really want to reset my password now" : "Sim, eu tenho a certeza que pretendo redefinir agora a minha palavra-passe.", - "Reset" : "Repor", "New password" : "Nova palavra-chave", "New Password" : "Nova palavra-passe", + "Reset password" : "Repor palavra-passe", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.", "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.", "Personal" : "Pessoal", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.", "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>", + "Username" : "Nome de utilizador", "Password" : "Palavra-passe", "Storage & database" : "Armazenamento e base de dados", "Data folder" : "Pasta de dados", diff --git a/core/l10n/ro.js b/core/l10n/ro.js index 8c48c440460..7970ecf18ae 100644 --- a/core/l10n/ro.js +++ b/core/l10n/ro.js @@ -31,7 +31,6 @@ OC.L10N.register( "Settings" : "Setări", "Saving..." : "Se salvează...", "I know what I'm doing" : "Eu știu ce fac", - "Reset password" : "Resetează parola", "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.", "No" : "Nu", "Yes" : "Da", @@ -94,13 +93,9 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.", "%s password reset" : "%s resetare parola", "Use the following link to reset your password: {link}" : "Folosește următorul link pentru a reseta parola: {link}", - "You will receive a link to reset your password via Email." : "Vei primi un mesaj prin care vei putea reseta parola via email.", - "Username" : "Nume utilizator", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?", - "Yes, I really want to reset my password now" : "Da, eu chiar doresc să îmi resetez parola acum", - "Reset" : "Resetare", "New password" : "Noua parolă", "New Password" : "Noua parolă", + "Reset password" : "Resetează parola", "Personal" : "Personal", "Users" : "Utilizatori", "Apps" : "Aplicații", @@ -114,6 +109,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.", "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>", + "Username" : "Nume utilizator", "Password" : "Parolă", "Storage & database" : "Stocare și baza de date", "Data folder" : "Director date", diff --git a/core/l10n/ro.json b/core/l10n/ro.json index 137a0bc7a52..037574515eb 100644 --- a/core/l10n/ro.json +++ b/core/l10n/ro.json @@ -29,7 +29,6 @@ "Settings" : "Setări", "Saving..." : "Se salvează...", "I know what I'm doing" : "Eu știu ce fac", - "Reset password" : "Resetează parola", "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.", "No" : "Nu", "Yes" : "Da", @@ -92,13 +91,9 @@ "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.", "%s password reset" : "%s resetare parola", "Use the following link to reset your password: {link}" : "Folosește următorul link pentru a reseta parola: {link}", - "You will receive a link to reset your password via Email." : "Vei primi un mesaj prin care vei putea reseta parola via email.", - "Username" : "Nume utilizator", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?", - "Yes, I really want to reset my password now" : "Da, eu chiar doresc să îmi resetez parola acum", - "Reset" : "Resetare", "New password" : "Noua parolă", "New Password" : "Noua parolă", + "Reset password" : "Resetează parola", "Personal" : "Personal", "Users" : "Utilizatori", "Apps" : "Aplicații", @@ -112,6 +107,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.", "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>", + "Username" : "Nume utilizator", "Password" : "Parolă", "Storage & database" : "Stocare și baza de date", "Data folder" : "Director date", diff --git a/core/l10n/ru.js b/core/l10n/ru.js index 066be34d07a..f3e11f7abda 100644 --- a/core/l10n/ru.js +++ b/core/l10n/ru.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для восстановления пароля была отправлена на вашу почту. Если вы не получили её, проверьте папку спама.<br>Если там письма со ссылкой нет, то обратитесь к локальному администратору.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к локальному администратору.<br />Вытдействительно хотите продолжить?", "I know what I'm doing" : "Я понимаю, что делаю", - "Reset password" : "Сбросить пароль", "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.", "No" : "Нет", "Yes" : "Да", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Невозможно отправить письмо для сброса пароля, т.к. у вашего аккаунта не прописан адрес почты. Пожалуйста, свяжитесь с администратором.", "%s password reset" : "%s сброс пароля", "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}", - "You will receive a link to reset your password via Email." : "На ваш адрес Email выслана ссылка для сброса пароля.", - "Username" : "Имя пользователя", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?", - "Yes, I really want to reset my password now" : "Да, я действительно хочу сбросить свой пароль", - "Reset" : "Сброс", "New password" : "Новый пароль", "New Password" : "Новый пароль", + "Reset password" : "Сбросить пароль", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!", "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.", "Personal" : "Личное", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.", "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>", + "Username" : "Имя пользователя", "Password" : "Пароль", "Storage & database" : "Система хранения данных & база данных", "Data folder" : "Директория с данными", diff --git a/core/l10n/ru.json b/core/l10n/ru.json index a65f9b502b0..a77cf869064 100644 --- a/core/l10n/ru.json +++ b/core/l10n/ru.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для восстановления пароля была отправлена на вашу почту. Если вы не получили её, проверьте папку спама.<br>Если там письма со ссылкой нет, то обратитесь к локальному администратору.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к локальному администратору.<br />Вытдействительно хотите продолжить?", "I know what I'm doing" : "Я понимаю, что делаю", - "Reset password" : "Сбросить пароль", "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.", "No" : "Нет", "Yes" : "Да", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Невозможно отправить письмо для сброса пароля, т.к. у вашего аккаунта не прописан адрес почты. Пожалуйста, свяжитесь с администратором.", "%s password reset" : "%s сброс пароля", "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}", - "You will receive a link to reset your password via Email." : "На ваш адрес Email выслана ссылка для сброса пароля.", - "Username" : "Имя пользователя", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?", - "Yes, I really want to reset my password now" : "Да, я действительно хочу сбросить свой пароль", - "Reset" : "Сброс", "New password" : "Новый пароль", "New Password" : "Новый пароль", + "Reset password" : "Сбросить пароль", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!", "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.", "Personal" : "Личное", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.", "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>", + "Username" : "Имя пользователя", "Password" : "Пароль", "Storage & database" : "Система хранения данных & база данных", "Data folder" : "Директория с данными", diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js index 3a9978aea85..65184265ad6 100644 --- a/core/l10n/si_LK.js +++ b/core/l10n/si_LK.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "දෙසැම්බර්", "Settings" : "සිටුවම්", "Saving..." : "සුරැකෙමින් පවතී...", - "Reset password" : "මුරපදය ප්රත්යාරම්භ කරන්න", "No" : "එපා", "Yes" : "ඔව්", "Choose" : "තෝරන්න", @@ -48,9 +47,8 @@ OC.L10N.register( "Delete" : "මකා දමන්න", "Add" : "එකතු කරන්න", "_download %n file_::_download %n files_" : ["",""], - "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්රත්යාරම්භ කිරීම සඳහා යොමුව විද්යුත් තැපෑලෙන් ලැබෙනු ඇත", - "Username" : "පරිශීලක නම", "New password" : "නව මුරපදය", + "Reset password" : "මුරපදය ප්රත්යාරම්භ කරන්න", "Personal" : "පෞද්ගලික", "Users" : "පරිශීලකයන්", "Apps" : "යෙදුම්", @@ -58,6 +56,7 @@ OC.L10N.register( "Help" : "උදව්", "Access forbidden" : "ඇතුල් වීම තහනම්", "Security Warning" : "ආරක්ෂක නිවේදනයක්", + "Username" : "පරිශීලක නම", "Password" : "මුර පදය", "Data folder" : "දත්ත ෆෝල්ඩරය", "Configure the database" : "දත්ත සමුදාය හැඩගැසීම", diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json index 112e6eb5014..db383dc6ae7 100644 --- a/core/l10n/si_LK.json +++ b/core/l10n/si_LK.json @@ -20,7 +20,6 @@ "December" : "දෙසැම්බර්", "Settings" : "සිටුවම්", "Saving..." : "සුරැකෙමින් පවතී...", - "Reset password" : "මුරපදය ප්රත්යාරම්භ කරන්න", "No" : "එපා", "Yes" : "ඔව්", "Choose" : "තෝරන්න", @@ -46,9 +45,8 @@ "Delete" : "මකා දමන්න", "Add" : "එකතු කරන්න", "_download %n file_::_download %n files_" : ["",""], - "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්රත්යාරම්භ කිරීම සඳහා යොමුව විද්යුත් තැපෑලෙන් ලැබෙනු ඇත", - "Username" : "පරිශීලක නම", "New password" : "නව මුරපදය", + "Reset password" : "මුරපදය ප්රත්යාරම්භ කරන්න", "Personal" : "පෞද්ගලික", "Users" : "පරිශීලකයන්", "Apps" : "යෙදුම්", @@ -56,6 +54,7 @@ "Help" : "උදව්", "Access forbidden" : "ඇතුල් වීම තහනම්", "Security Warning" : "ආරක්ෂක නිවේදනයක්", + "Username" : "පරිශීලක නම", "Password" : "මුර පදය", "Data folder" : "දත්ත ෆෝල්ඩරය", "Configure the database" : "දත්ත සමුදාය හැඩගැසීම", diff --git a/core/l10n/sk.js b/core/l10n/sk.js deleted file mode 100644 index 6a57266201e..00000000000 --- a/core/l10n/sk.js +++ /dev/null @@ -1,31 +0,0 @@ -OC.L10N.register( - "core", - { - "Sunday" : "Nedeľa", - "Monday" : "Pondelok", - "Tuesday" : "Utorok", - "Wednesday" : "Streda", - "Thursday" : "Štvrtok", - "Friday" : "Piatok", - "Saturday" : "Sobota", - "January" : "Január", - "February" : "Február", - "March" : "Marec", - "April" : "Apríl", - "May" : "Máj", - "June" : "Jún", - "July" : "Júl", - "August" : "August", - "September" : "September", - "October" : "Október", - "November" : "November", - "December" : "December", - "Settings" : "Nastavenia", - "_{count} file conflict_::_{count} file conflicts_" : ["","",""], - "Cancel" : "Zrušiť", - "Share" : "Zdieľať", - "group" : "skupina", - "Delete" : "Odstrániť", - "Personal" : "Osobné" -}, -"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/core/l10n/sk.json b/core/l10n/sk.json deleted file mode 100644 index 3eb33e886af..00000000000 --- a/core/l10n/sk.json +++ /dev/null @@ -1,29 +0,0 @@ -{ "translations": { - "Sunday" : "Nedeľa", - "Monday" : "Pondelok", - "Tuesday" : "Utorok", - "Wednesday" : "Streda", - "Thursday" : "Štvrtok", - "Friday" : "Piatok", - "Saturday" : "Sobota", - "January" : "Január", - "February" : "Február", - "March" : "Marec", - "April" : "Apríl", - "May" : "Máj", - "June" : "Jún", - "July" : "Júl", - "August" : "August", - "September" : "September", - "October" : "Október", - "November" : "November", - "December" : "December", - "Settings" : "Nastavenia", - "_{count} file conflict_::_{count} file conflicts_" : ["","",""], - "Cancel" : "Zrušiť", - "Share" : "Zdieľať", - "group" : "skupina", - "Delete" : "Odstrániť", - "Personal" : "Osobné" -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" -}
\ No newline at end of file diff --git a/core/l10n/sk.php b/core/l10n/sk.php deleted file mode 100644 index 74d6a570c09..00000000000 --- a/core/l10n/sk.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -$TRANSLATIONS = array( -"Sunday" => "Nedeľa", -"Monday" => "Pondelok", -"Tuesday" => "Utorok", -"Wednesday" => "Streda", -"Thursday" => "Štvrtok", -"Friday" => "Piatok", -"Saturday" => "Sobota", -"January" => "Január", -"February" => "Február", -"March" => "Marec", -"April" => "Apríl", -"May" => "Máj", -"June" => "Jún", -"July" => "Júl", -"August" => "August", -"September" => "September", -"October" => "Október", -"November" => "November", -"December" => "December", -"Settings" => "Nastavenia", -"_{count} file conflict_::_{count} file conflicts_" => array("","",""), -"Cancel" => "Zrušiť", -"Share" => "Zdieľať", -"group" => "skupina", -"Delete" => "Odstrániť", -"Personal" => "Osobné" -); -$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js index 2954e513327..28e3a3b4a4d 100644 --- a/core/l10n/sk_SK.js +++ b/core/l10n/sk_SK.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovu hesla bol odoslaný na váš email. Pokiaľ ho neobdržíte v primeranom čase, skontrolujte spam / priečinok nevyžiadanej pošty. <br> Ak tam nie je, kontaktujte svojho administrátora.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Súbory sú zašifrované. Ak ste nepovolili kľúč pre obnovenie, neexistuje žiadny spôsob, ako obnoviť vaše dáta po obnovení vášho hesla. <br /> Ak si nie ste istí čo urobiť, prosím skôr než budete pokračovať, obráťte sa na administrátora. <br /> Naozaj chcete pokračovať?", "I know what I'm doing" : "Viem, čo robím", - "Reset password" : "Obnovenie hesla", "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.", "No" : "Nie", "Yes" : "Áno", @@ -122,13 +121,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.", "%s password reset" : "reset hesla %s", "Use the following link to reset your password: {link}" : "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}", - "You will receive a link to reset your password via Email." : "Odkaz pre obnovenie hesla obdržíte emailom.", - "Username" : "Meno používateľa", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?", - "Yes, I really want to reset my password now" : "Áno, želám si teraz obnoviť svoje heslo", - "Reset" : "Resetovať", "New password" : "Nové heslo", "New Password" : "Nové heslo", + "Reset password" : "Obnovenie hesla", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!", "For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.", "Personal" : "Osobné", @@ -164,6 +159,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.", "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>", + "Username" : "Meno používateľa", "Password" : "Heslo", "Storage & database" : "Úložislo & databáza", "Data folder" : "Priečinok dát", diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json index fa6ed266564..17daa232693 100644 --- a/core/l10n/sk_SK.json +++ b/core/l10n/sk_SK.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovu hesla bol odoslaný na váš email. Pokiaľ ho neobdržíte v primeranom čase, skontrolujte spam / priečinok nevyžiadanej pošty. <br> Ak tam nie je, kontaktujte svojho administrátora.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Súbory sú zašifrované. Ak ste nepovolili kľúč pre obnovenie, neexistuje žiadny spôsob, ako obnoviť vaše dáta po obnovení vášho hesla. <br /> Ak si nie ste istí čo urobiť, prosím skôr než budete pokračovať, obráťte sa na administrátora. <br /> Naozaj chcete pokračovať?", "I know what I'm doing" : "Viem, čo robím", - "Reset password" : "Obnovenie hesla", "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.", "No" : "Nie", "Yes" : "Áno", @@ -120,13 +119,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.", "%s password reset" : "reset hesla %s", "Use the following link to reset your password: {link}" : "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}", - "You will receive a link to reset your password via Email." : "Odkaz pre obnovenie hesla obdržíte emailom.", - "Username" : "Meno používateľa", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?", - "Yes, I really want to reset my password now" : "Áno, želám si teraz obnoviť svoje heslo", - "Reset" : "Resetovať", "New password" : "Nové heslo", "New Password" : "Nové heslo", + "Reset password" : "Obnovenie hesla", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!", "For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.", "Personal" : "Osobné", @@ -162,6 +157,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.", "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>", + "Username" : "Meno používateľa", "Password" : "Heslo", "Storage & database" : "Úložislo & databáza", "Data folder" : "Priečinok dát", diff --git a/core/l10n/sl.js b/core/l10n/sl.js index a0e815d1618..59a9e8bd72a 100644 --- a/core/l10n/sl.js +++ b/core/l10n/sl.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?", "I know what I'm doing" : "Vem, kaj delam!", - "Reset password" : "Ponastavi geslo", "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.", "No" : "Ne", "Yes" : "Da", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.", "%s password reset" : "Ponastavitev gesla %s", "Use the following link to reset your password: {link}" : "Za ponastavitev gesla uporabite povezavo: {link}", - "You will receive a link to reset your password via Email." : "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.", - "Username" : "Uporabniško ime", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?", - "Yes, I really want to reset my password now" : "Da, potrjujem ponastavitev gesla", - "Reset" : "Ponastavi", "New password" : "Novo geslo", "New Password" : "Novo geslo", + "Reset password" : "Ponastavi geslo", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ", "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.", "Personal" : "Osebno", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.", "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>", + "Username" : "Uporabniško ime", "Password" : "Geslo", "Storage & database" : "Shramba in podatkovna zbirka", "Data folder" : "Podatkovna mapa", diff --git a/core/l10n/sl.json b/core/l10n/sl.json index d5a516d4429..abea92d1325 100644 --- a/core/l10n/sl.json +++ b/core/l10n/sl.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?", "I know what I'm doing" : "Vem, kaj delam!", - "Reset password" : "Ponastavi geslo", "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.", "No" : "Ne", "Yes" : "Da", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.", "%s password reset" : "Ponastavitev gesla %s", "Use the following link to reset your password: {link}" : "Za ponastavitev gesla uporabite povezavo: {link}", - "You will receive a link to reset your password via Email." : "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.", - "Username" : "Uporabniško ime", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?", - "Yes, I really want to reset my password now" : "Da, potrjujem ponastavitev gesla", - "Reset" : "Ponastavi", "New password" : "Novo geslo", "New Password" : "Novo geslo", + "Reset password" : "Ponastavi geslo", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ", "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.", "Personal" : "Osebno", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.", "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>", + "Username" : "Uporabniško ime", "Password" : "Geslo", "Storage & database" : "Shramba in podatkovna zbirka", "Data folder" : "Podatkovna mapa", diff --git a/core/l10n/sq.js b/core/l10n/sq.js index 9dd27342905..246c12bd9ec 100644 --- a/core/l10n/sq.js +++ b/core/l10n/sq.js @@ -1,9 +1,19 @@ OC.L10N.register( "core", { + "Couldn't send mail to following users: %s " : "Nuk mund ti dërgoj e-mail këtyre përdoruesve: %s", "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua", "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua", "Updated database" : "Database-i u azhurnua", + "Checked database schema update" : "Përditësim i skemës së kontrolluar të bazës së të dhënave", + "Checked database schema update for apps" : "Përditësim i skemës së kontrolluar të bazës së të dhënave për aplikacionet", + "Updated \"%s\" to %s" : "U përditësua \"%s\" në %s", + "Disabled incompatible apps: %s" : "Aplikacione të papajtueshme të bllokuara: %s", + "No image or file provided" : "Nuk është dhënë asnjë imazh apo skedar", + "Unknown filetype" : "Tip i panjohur skedari", + "Invalid image" : "Imazh i pavlefshëm", + "No temporary profile picture available, try again" : "Nuk është i mundur asnjë imazh profili i përkohshëm, provoni përsëri", + "No crop data provided" : "Nuk është dhënë asnjë parametër prerjeje", "Sunday" : "E djelë", "Monday" : "E hënë", "Tuesday" : "E martë", @@ -25,7 +35,6 @@ OC.L10N.register( "December" : "Dhjetor", "Settings" : "Parametra", "Saving..." : "Duke ruajtur...", - "Reset password" : "Rivendos kodin", "No" : "Jo", "Yes" : "Po", "Choose" : "Zgjidh", @@ -69,11 +78,8 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.", "%s password reset" : "Kodi i %s -it u rivendos", "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}", - "You will receive a link to reset your password via Email." : "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.", - "Username" : "Përdoruesi", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?", - "Yes, I really want to reset my password now" : "Po, dua ta rivendos kodin tani", "New password" : "Kodi i ri", + "Reset password" : "Rivendos kodin", "Personal" : "Personale", "Users" : "Përdoruesit", "Apps" : "App", @@ -86,6 +92,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.", "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>", + "Username" : "Përdoruesi", "Password" : "Kodi", "Data folder" : "Emri i dosjes", "Configure the database" : "Konfiguro database-in", diff --git a/core/l10n/sq.json b/core/l10n/sq.json index 72230681a4e..e183fafb33c 100644 --- a/core/l10n/sq.json +++ b/core/l10n/sq.json @@ -1,7 +1,17 @@ { "translations": { + "Couldn't send mail to following users: %s " : "Nuk mund ti dërgoj e-mail këtyre përdoruesve: %s", "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua", "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua", "Updated database" : "Database-i u azhurnua", + "Checked database schema update" : "Përditësim i skemës së kontrolluar të bazës së të dhënave", + "Checked database schema update for apps" : "Përditësim i skemës së kontrolluar të bazës së të dhënave për aplikacionet", + "Updated \"%s\" to %s" : "U përditësua \"%s\" në %s", + "Disabled incompatible apps: %s" : "Aplikacione të papajtueshme të bllokuara: %s", + "No image or file provided" : "Nuk është dhënë asnjë imazh apo skedar", + "Unknown filetype" : "Tip i panjohur skedari", + "Invalid image" : "Imazh i pavlefshëm", + "No temporary profile picture available, try again" : "Nuk është i mundur asnjë imazh profili i përkohshëm, provoni përsëri", + "No crop data provided" : "Nuk është dhënë asnjë parametër prerjeje", "Sunday" : "E djelë", "Monday" : "E hënë", "Tuesday" : "E martë", @@ -23,7 +33,6 @@ "December" : "Dhjetor", "Settings" : "Parametra", "Saving..." : "Duke ruajtur...", - "Reset password" : "Rivendos kodin", "No" : "Jo", "Yes" : "Po", "Choose" : "Zgjidh", @@ -67,11 +76,8 @@ "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.", "%s password reset" : "Kodi i %s -it u rivendos", "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}", - "You will receive a link to reset your password via Email." : "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.", - "Username" : "Përdoruesi", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?", - "Yes, I really want to reset my password now" : "Po, dua ta rivendos kodin tani", "New password" : "Kodi i ri", + "Reset password" : "Rivendos kodin", "Personal" : "Personale", "Users" : "Përdoruesit", "Apps" : "App", @@ -84,6 +90,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.", "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>", + "Username" : "Përdoruesi", "Password" : "Kodi", "Data folder" : "Emri i dosjes", "Configure the database" : "Konfiguro database-in", diff --git a/core/l10n/sr.js b/core/l10n/sr.js index 5e2c8354261..39ca7b1fda4 100644 --- a/core/l10n/sr.js +++ b/core/l10n/sr.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "Децембар", "Settings" : "Поставке", "Saving..." : "Чување у току...", - "Reset password" : "Ресетуј лозинку", "No" : "Не", "Yes" : "Да", "Choose" : "Одабери", @@ -61,9 +60,8 @@ OC.L10N.register( "Add" : "Додај", "_download %n file_::_download %n files_" : ["","",""], "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}", - "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.", - "Username" : "Корисничко име", "New password" : "Нова лозинка", + "Reset password" : "Ресетуј лозинку", "Personal" : "Лично", "Users" : "Корисници", "Apps" : "Апликације", @@ -72,6 +70,7 @@ OC.L10N.register( "Access forbidden" : "Забрањен приступ", "Security Warning" : "Сигурносно упозорење", "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>", + "Username" : "Корисничко име", "Password" : "Лозинка", "Data folder" : "Фацикла података", "Configure the database" : "Подешавање базе", diff --git a/core/l10n/sr.json b/core/l10n/sr.json index bfd13040906..ab3e8e04495 100644 --- a/core/l10n/sr.json +++ b/core/l10n/sr.json @@ -20,7 +20,6 @@ "December" : "Децембар", "Settings" : "Поставке", "Saving..." : "Чување у току...", - "Reset password" : "Ресетуј лозинку", "No" : "Не", "Yes" : "Да", "Choose" : "Одабери", @@ -59,9 +58,8 @@ "Add" : "Додај", "_download %n file_::_download %n files_" : ["","",""], "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}", - "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.", - "Username" : "Корисничко име", "New password" : "Нова лозинка", + "Reset password" : "Ресетуј лозинку", "Personal" : "Лично", "Users" : "Корисници", "Apps" : "Апликације", @@ -70,6 +68,7 @@ "Access forbidden" : "Забрањен приступ", "Security Warning" : "Сигурносно упозорење", "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>", + "Username" : "Корисничко име", "Password" : "Лозинка", "Data folder" : "Фацикла података", "Configure the database" : "Подешавање базе", diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js index 11c3d2e40a7..a327c2ee55a 100644 --- a/core/l10n/sr@latin.js +++ b/core/l10n/sr@latin.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "Decembar", "Settings" : "Podešavanja", "I know what I'm doing" : "Znam šta radim", - "Reset password" : "Resetuj lozinku", "No" : "Ne", "Yes" : "Da", "Choose" : "Izaberi", @@ -69,9 +68,8 @@ OC.L10N.register( "_download %n file_::_download %n files_" : ["","",""], "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", "New password" : "Nova lozinka", + "Reset password" : "Resetuj lozinku", "Personal" : "Lično", "Users" : "Korisnici", "Apps" : "Programi", @@ -82,6 +80,7 @@ OC.L10N.register( "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je ranjiva na ", "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 <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>", + "Username" : "Korisničko ime", "Password" : "Lozinka", "Data folder" : "Fascikla podataka", "Configure the database" : "Podešavanje baze", diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json index a358f57d028..219141ff1df 100644 --- a/core/l10n/sr@latin.json +++ b/core/l10n/sr@latin.json @@ -20,7 +20,6 @@ "December" : "Decembar", "Settings" : "Podešavanja", "I know what I'm doing" : "Znam šta radim", - "Reset password" : "Resetuj lozinku", "No" : "Ne", "Yes" : "Da", "Choose" : "Izaberi", @@ -67,9 +66,8 @@ "_download %n file_::_download %n files_" : ["","",""], "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", "New password" : "Nova lozinka", + "Reset password" : "Resetuj lozinku", "Personal" : "Lično", "Users" : "Korisnici", "Apps" : "Programi", @@ -80,6 +78,7 @@ "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je ranjiva na ", "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 <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>", + "Username" : "Korisničko ime", "Password" : "Lozinka", "Data folder" : "Fascikla podataka", "Configure the database" : "Podešavanje baze", diff --git a/core/l10n/sv.js b/core/l10n/sv.js index c0066471dc0..dc427b46dba 100644 --- a/core/l10n/sv.js +++ b/core/l10n/sv.js @@ -37,7 +37,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Länken för att återställa ditt lösenord har skickats till din e-mail. Om du inte mottar något inom kort, kontrollera spam/skräpkorgen.<br>Om det inte finns något där, vänligen kontakta din lokala administratör.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?", "I know what I'm doing" : "Jag är säker på vad jag gör", - "Reset password" : "Återställ lösenordet", "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.", "No" : "Nej", "Yes" : "Ja", @@ -118,13 +117,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.", "%s password reset" : "%s återställ lösenord", "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}", - "You will receive a link to reset your password via Email." : "Du får en länk att återställa ditt lösenord via e-post.", - "Username" : "Användarnamn", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?", - "Yes, I really want to reset my password now" : "Ja, jag vill verkligen återställa mitt lösenord nu", - "Reset" : "Återställ", "New password" : "Nytt lösenord", "New Password" : "Nytt lösenord", + "Reset password" : "Återställ lösenordet", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!", "For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.", "Personal" : "Personligt", @@ -150,6 +145,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.", "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>", + "Username" : "Användarnamn", "Password" : "Lösenord", "Storage & database" : "Lagring & databas", "Data folder" : "Datamapp", diff --git a/core/l10n/sv.json b/core/l10n/sv.json index 82a228565e3..c69d5001b5f 100644 --- a/core/l10n/sv.json +++ b/core/l10n/sv.json @@ -35,7 +35,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Länken för att återställa ditt lösenord har skickats till din e-mail. Om du inte mottar något inom kort, kontrollera spam/skräpkorgen.<br>Om det inte finns något där, vänligen kontakta din lokala administratör.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?", "I know what I'm doing" : "Jag är säker på vad jag gör", - "Reset password" : "Återställ lösenordet", "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.", "No" : "Nej", "Yes" : "Ja", @@ -116,13 +115,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.", "%s password reset" : "%s återställ lösenord", "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}", - "You will receive a link to reset your password via Email." : "Du får en länk att återställa ditt lösenord via e-post.", - "Username" : "Användarnamn", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?", - "Yes, I really want to reset my password now" : "Ja, jag vill verkligen återställa mitt lösenord nu", - "Reset" : "Återställ", "New password" : "Nytt lösenord", "New Password" : "Nytt lösenord", + "Reset password" : "Återställ lösenordet", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!", "For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.", "Personal" : "Personligt", @@ -148,6 +143,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.", "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>", + "Username" : "Användarnamn", "Password" : "Lösenord", "Storage & database" : "Lagring & databas", "Data folder" : "Datamapp", diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js index 520feac8871..831729238b1 100644 --- a/core/l10n/ta_LK.js +++ b/core/l10n/ta_LK.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "மார்கழி", "Settings" : "அமைப்புகள்", "Saving..." : "சேமிக்கப்படுகிறது...", - "Reset password" : "மீளமைத்த கடவுச்சொல்", "No" : "இல்லை", "Yes" : "ஆம்", "Choose" : "தெரிவுசெய்க ", @@ -57,9 +56,8 @@ OC.L10N.register( "Add" : "சேர்க்க", "_download %n file_::_download %n files_" : ["",""], "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}", - "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ", - "Username" : "பயனாளர் பெயர்", "New password" : "புதிய கடவுச்சொல்", + "Reset password" : "மீளமைத்த கடவுச்சொல்", "Personal" : "தனிப்பட்ட", "Users" : "பயனாளர்", "Apps" : "செயலிகள்", @@ -68,6 +66,7 @@ OC.L10N.register( "Access forbidden" : "அணுக தடை", "Security Warning" : "பாதுகாப்பு எச்சரிக்கை", "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக", + "Username" : "பயனாளர் பெயர்", "Password" : "கடவுச்சொல்", "Data folder" : "தரவு கோப்புறை", "Configure the database" : "தரவுத்தளத்தை தகவமைக்க", diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json index 41cdfe8281a..d88f8f42ae5 100644 --- a/core/l10n/ta_LK.json +++ b/core/l10n/ta_LK.json @@ -20,7 +20,6 @@ "December" : "மார்கழி", "Settings" : "அமைப்புகள்", "Saving..." : "சேமிக்கப்படுகிறது...", - "Reset password" : "மீளமைத்த கடவுச்சொல்", "No" : "இல்லை", "Yes" : "ஆம்", "Choose" : "தெரிவுசெய்க ", @@ -55,9 +54,8 @@ "Add" : "சேர்க்க", "_download %n file_::_download %n files_" : ["",""], "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}", - "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ", - "Username" : "பயனாளர் பெயர்", "New password" : "புதிய கடவுச்சொல்", + "Reset password" : "மீளமைத்த கடவுச்சொல்", "Personal" : "தனிப்பட்ட", "Users" : "பயனாளர்", "Apps" : "செயலிகள்", @@ -66,6 +64,7 @@ "Access forbidden" : "அணுக தடை", "Security Warning" : "பாதுகாப்பு எச்சரிக்கை", "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக", + "Username" : "பயனாளர் பெயர்", "Password" : "கடவுச்சொல்", "Data folder" : "தரவு கோப்புறை", "Configure the database" : "தரவுத்தளத்தை தகவமைக்க", diff --git a/core/l10n/te.js b/core/l10n/te.js index 37dfe005efe..e4febdac9ca 100644 --- a/core/l10n/te.js +++ b/core/l10n/te.js @@ -35,11 +35,11 @@ OC.L10N.register( "Delete" : "తొలగించు", "Add" : "చేర్చు", "_download %n file_::_download %n files_" : ["",""], - "Username" : "వాడుకరి పేరు", "New password" : "కొత్త సంకేతపదం", "Personal" : "వ్యక్తిగతం", "Users" : "వాడుకరులు", "Help" : "సహాయం", + "Username" : "వాడుకరి పేరు", "Password" : "సంకేతపదం", "Log out" : "నిష్క్రమించు" }, diff --git a/core/l10n/te.json b/core/l10n/te.json index d8224f5ffa1..1f749883e2c 100644 --- a/core/l10n/te.json +++ b/core/l10n/te.json @@ -33,11 +33,11 @@ "Delete" : "తొలగించు", "Add" : "చేర్చు", "_download %n file_::_download %n files_" : ["",""], - "Username" : "వాడుకరి పేరు", "New password" : "కొత్త సంకేతపదం", "Personal" : "వ్యక్తిగతం", "Users" : "వాడుకరులు", "Help" : "సహాయం", + "Username" : "వాడుకరి పేరు", "Password" : "సంకేతపదం", "Log out" : "నిష్క్రమించు" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js index 7b65977d950..7cf97df4823 100644 --- a/core/l10n/th_TH.js +++ b/core/l10n/th_TH.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "ธันวาคม", "Settings" : "ตั้งค่า", "Saving..." : "กำลังบันทึกข้อมูล...", - "Reset password" : "เปลี่ยนรหัสผ่าน", "No" : "ไม่ตกลง", "Yes" : "ตกลง", "Choose" : "เลือก", @@ -65,9 +64,8 @@ OC.L10N.register( "_download %n file_::_download %n files_" : [""], "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้", "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}", - "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์", - "Username" : "ชื่อผู้ใช้งาน", "New password" : "รหัสผ่านใหม่", + "Reset password" : "เปลี่ยนรหัสผ่าน", "Personal" : "ส่วนตัว", "Users" : "ผู้ใช้งาน", "Apps" : "แอปฯ", @@ -76,6 +74,7 @@ OC.L10N.register( "Access forbidden" : "การเข้าถึงถูกหวงห้าม", "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย", "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>", + "Username" : "ชื่อผู้ใช้งาน", "Password" : "รหัสผ่าน", "Data folder" : "โฟลเดอร์เก็บข้อมูล", "Configure the database" : "กำหนดค่าฐานข้อมูล", diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json index 12457e67752..4237deb738a 100644 --- a/core/l10n/th_TH.json +++ b/core/l10n/th_TH.json @@ -20,7 +20,6 @@ "December" : "ธันวาคม", "Settings" : "ตั้งค่า", "Saving..." : "กำลังบันทึกข้อมูล...", - "Reset password" : "เปลี่ยนรหัสผ่าน", "No" : "ไม่ตกลง", "Yes" : "ตกลง", "Choose" : "เลือก", @@ -63,9 +62,8 @@ "_download %n file_::_download %n files_" : [""], "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้", "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}", - "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์", - "Username" : "ชื่อผู้ใช้งาน", "New password" : "รหัสผ่านใหม่", + "Reset password" : "เปลี่ยนรหัสผ่าน", "Personal" : "ส่วนตัว", "Users" : "ผู้ใช้งาน", "Apps" : "แอปฯ", @@ -74,6 +72,7 @@ "Access forbidden" : "การเข้าถึงถูกหวงห้าม", "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย", "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>", + "Username" : "ชื่อผู้ใช้งาน", "Password" : "รหัสผ่าน", "Data folder" : "โฟลเดอร์เก็บข้อมูล", "Configure the database" : "กำหนดค่าฐานข้อมูล", diff --git a/core/l10n/tr.js b/core/l10n/tr.js index 32144b5441c..37eab400dd4 100644 --- a/core/l10n/tr.js +++ b/core/l10n/tr.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?", "I know what I'm doing" : "Ne yaptığımı biliyorum", - "Reset password" : "Parolayı sıfırla", "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.", "No" : "Hayır", "Yes" : "Evet", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Sıfırlama e-postası, bu kullanıcı için bir e-posta adresi olmadığından gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.", "%s password reset" : "%s parola sıfırlama", "Use the following link to reset your password: {link}" : "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}", - "You will receive a link to reset your password via Email." : "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.", - "Username" : "Kullanıcı Adı", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?", - "Yes, I really want to reset my password now" : "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum", - "Reset" : "Sıfırla", "New password" : "Yeni parola", "New Password" : "Yeni Parola", + "Reset password" : "Parolayı sıfırla", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!", "For the best results, please consider using a GNU/Linux server instead." : "En iyi sonuçlar için GNU/Linux sunucusu kullanın.", "Personal" : "Kişisel", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.", "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun", + "Username" : "Kullanıcı Adı", "Password" : "Parola", "Storage & database" : "Depolama ve veritabanı", "Data folder" : "Veri klasörü", diff --git a/core/l10n/tr.json b/core/l10n/tr.json index c22d47c9e37..a34a07bd0e8 100644 --- a/core/l10n/tr.json +++ b/core/l10n/tr.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?", "I know what I'm doing" : "Ne yaptığımı biliyorum", - "Reset password" : "Parolayı sıfırla", "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.", "No" : "Hayır", "Yes" : "Evet", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Sıfırlama e-postası, bu kullanıcı için bir e-posta adresi olmadığından gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.", "%s password reset" : "%s parola sıfırlama", "Use the following link to reset your password: {link}" : "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}", - "You will receive a link to reset your password via Email." : "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.", - "Username" : "Kullanıcı Adı", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?", - "Yes, I really want to reset my password now" : "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum", - "Reset" : "Sıfırla", "New password" : "Yeni parola", "New Password" : "Yeni Parola", + "Reset password" : "Parolayı sıfırla", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!", "For the best results, please consider using a GNU/Linux server instead." : "En iyi sonuçlar için GNU/Linux sunucusu kullanın.", "Personal" : "Kişisel", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.", "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun", + "Username" : "Kullanıcı Adı", "Password" : "Parola", "Storage & database" : "Depolama ve veritabanı", "Data folder" : "Veri klasörü", diff --git a/core/l10n/ug.js b/core/l10n/ug.js index d6a74751c7a..c71c67807c7 100644 --- a/core/l10n/ug.js +++ b/core/l10n/ug.js @@ -38,13 +38,13 @@ OC.L10N.register( "Delete" : "ئۆچۈر", "Add" : "قوش", "_download %n file_::_download %n files_" : [""], - "Username" : "ئىشلەتكۈچى ئاتى", "New password" : "يېڭى ئىم", "Personal" : "شەخسىي", "Users" : "ئىشلەتكۈچىلەر", "Apps" : "ئەپلەر", "Help" : "ياردەم", "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش", + "Username" : "ئىشلەتكۈچى ئاتى", "Password" : "ئىم", "Finish setup" : "تەڭشەك تامام", "Log out" : "تىزىمدىن چىق" diff --git a/core/l10n/ug.json b/core/l10n/ug.json index bd061a85025..aadc8c1cf8b 100644 --- a/core/l10n/ug.json +++ b/core/l10n/ug.json @@ -36,13 +36,13 @@ "Delete" : "ئۆچۈر", "Add" : "قوش", "_download %n file_::_download %n files_" : [""], - "Username" : "ئىشلەتكۈچى ئاتى", "New password" : "يېڭى ئىم", "Personal" : "شەخسىي", "Users" : "ئىشلەتكۈچىلەر", "Apps" : "ئەپلەر", "Help" : "ياردەم", "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش", + "Username" : "ئىشلەتكۈچى ئاتى", "Password" : "ئىم", "Finish setup" : "تەڭشەك تامام", "Log out" : "تىزىمدىن چىق" diff --git a/core/l10n/uk.js b/core/l10n/uk.js index 38f9d17e692..cd444036896 100644 --- a/core/l10n/uk.js +++ b/core/l10n/uk.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Посилання для скидання вашого пароль було надіслано на ваш email. Якщо ви не отримали його найближчим часом, перевірте теку зі спамом.<br>Якщо і там немає, спитайте вашого місцевого адміністратора.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?", "I know what I'm doing" : "Я знаю що роблю", - "Reset password" : "Скинути пароль", "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора", "No" : "Ні", "Yes" : "Так", @@ -124,13 +123,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.", "%s password reset" : "%s пароль скинуто", "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}", - "You will receive a link to reset your password via Email." : "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.", - "Username" : "Ім'я користувача", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?", - "Yes, I really want to reset my password now" : "Так, я справді бажаю скинути мій пароль зараз", - "Reset" : "Перевстановити", "New password" : "Новий пароль", "New Password" : "Новий пароль", + "Reset password" : "Скинути пароль", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!", "For the best results, please consider using a GNU/Linux server instead." : "Для кращих результатів розгляньте можливість використання GNU/Linux серверу", "Personal" : "Особисте", @@ -170,6 +165,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що .htaccess файл не працює.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.", "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>", + "Username" : "Ім'я користувача", "Password" : "Пароль", "Storage & database" : "Сховище і база даних", "Data folder" : "Каталог даних", diff --git a/core/l10n/uk.json b/core/l10n/uk.json index 8ec13dedae7..4e649b34ff4 100644 --- a/core/l10n/uk.json +++ b/core/l10n/uk.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Посилання для скидання вашого пароль було надіслано на ваш email. Якщо ви не отримали його найближчим часом, перевірте теку зі спамом.<br>Якщо і там немає, спитайте вашого місцевого адміністратора.", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?", "I know what I'm doing" : "Я знаю що роблю", - "Reset password" : "Скинути пароль", "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора", "No" : "Ні", "Yes" : "Так", @@ -122,13 +121,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.", "%s password reset" : "%s пароль скинуто", "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}", - "You will receive a link to reset your password via Email." : "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.", - "Username" : "Ім'я користувача", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?", - "Yes, I really want to reset my password now" : "Так, я справді бажаю скинути мій пароль зараз", - "Reset" : "Перевстановити", "New password" : "Новий пароль", "New Password" : "Новий пароль", + "Reset password" : "Скинути пароль", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!", "For the best results, please consider using a GNU/Linux server instead." : "Для кращих результатів розгляньте можливість використання GNU/Linux серверу", "Personal" : "Особисте", @@ -168,6 +163,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що .htaccess файл не працює.", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.", "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>", + "Username" : "Ім'я користувача", "Password" : "Пароль", "Storage & database" : "Сховище і база даних", "Data folder" : "Каталог даних", diff --git a/core/l10n/ur.js b/core/l10n/ur.js deleted file mode 100644 index 6f4050f5fd6..00000000000 --- a/core/l10n/ur.js +++ /dev/null @@ -1,7 +0,0 @@ -OC.L10N.register( - "core", - { - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "Error" : "خرابی" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/ur.json b/core/l10n/ur.json deleted file mode 100644 index a99dca571f3..00000000000 --- a/core/l10n/ur.json +++ /dev/null @@ -1,5 +0,0 @@ -{ "translations": { - "_{count} file conflict_::_{count} file conflicts_" : ["",""], - "Error" : "خرابی" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/core/l10n/ur.php b/core/l10n/ur.php deleted file mode 100644 index fdc6c81bd88..00000000000 --- a/core/l10n/ur.php +++ /dev/null @@ -1,6 +0,0 @@ -<?php -$TRANSLATIONS = array( -"_{count} file conflict_::_{count} file conflicts_" => array("",""), -"Error" => "خرابی" -); -$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js index ce5c57e5fdf..491309f60a9 100644 --- a/core/l10n/ur_PK.js +++ b/core/l10n/ur_PK.js @@ -29,7 +29,6 @@ OC.L10N.register( "December" : "دسمبر", "Settings" : "ترتیبات", "Saving..." : "محفوظ ھو رہا ہے ...", - "Reset password" : "ری سیٹ پاسورڈ", "No" : "نہیں", "Yes" : "ہاں", "Choose" : "منتخب کریں", @@ -90,11 +89,8 @@ OC.L10N.register( "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.", "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے", "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔ {link}", - "You will receive a link to reset your password via Email." : "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے", - "Username" : "یوزر نیم", - "Yes, I really want to reset my password now" : "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں", - "Reset" : "ری سیٹ", "New password" : "نیا پاسورڈ", + "Reset password" : "ری سیٹ پاسورڈ", "Personal" : "شخصی", "Users" : "صارفین", "Apps" : "ایپز", @@ -107,6 +103,7 @@ OC.L10N.register( "Please update your PHP installation to use %s securely." : " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے", "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں", + "Username" : "یوزر نیم", "Password" : "پاسورڈ", "Storage & database" : "ذخیرہ اور ڈیٹا بیس", "Data folder" : "ڈیٹا فولڈر", diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json index 6f3a5993a9f..138c67824f2 100644 --- a/core/l10n/ur_PK.json +++ b/core/l10n/ur_PK.json @@ -27,7 +27,6 @@ "December" : "دسمبر", "Settings" : "ترتیبات", "Saving..." : "محفوظ ھو رہا ہے ...", - "Reset password" : "ری سیٹ پاسورڈ", "No" : "نہیں", "Yes" : "ہاں", "Choose" : "منتخب کریں", @@ -88,11 +87,8 @@ "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.", "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے", "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔ {link}", - "You will receive a link to reset your password via Email." : "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے", - "Username" : "یوزر نیم", - "Yes, I really want to reset my password now" : "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں", - "Reset" : "ری سیٹ", "New password" : "نیا پاسورڈ", + "Reset password" : "ری سیٹ پاسورڈ", "Personal" : "شخصی", "Users" : "صارفین", "Apps" : "ایپز", @@ -105,6 +101,7 @@ "Please update your PHP installation to use %s securely." : " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے", "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں", + "Username" : "یوزر نیم", "Password" : "پاسورڈ", "Storage & database" : "ذخیرہ اور ڈیٹا بیس", "Data folder" : "ڈیٹا فولڈر", diff --git a/core/l10n/vi.js b/core/l10n/vi.js index 5e48c7802d9..6c53239cdf4 100644 --- a/core/l10n/vi.js +++ b/core/l10n/vi.js @@ -31,7 +31,6 @@ OC.L10N.register( "December" : "Tháng 12", "Settings" : "Cài đặt", "Saving..." : "Đang lưu...", - "Reset password" : "Khôi phục mật khẩu", "No" : "Không", "Yes" : "Có", "Choose" : "Chọn", @@ -93,12 +92,8 @@ OC.L10N.register( "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.", "%s password reset" : "%s thiết lập lại mật khẩu", "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}", - "You will receive a link to reset your password via Email." : "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.", - "Username" : "Tên đăng nhập", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?", - "Yes, I really want to reset my password now" : "Vâng, tôi muốn thiết lập lại mật khẩu ngay.", - "Reset" : "Khởi động lại", "New password" : "Mật khẩu mới", + "Reset password" : "Khôi phục mật khẩu", "Personal" : "Cá nhân", "Users" : "Người dùng", "Apps" : "Ứng dụng", @@ -119,6 +114,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.", "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>", + "Username" : "Tên đăng nhập", "Password" : "Mật khẩu", "Data folder" : "Thư mục dữ liệu", "Configure the database" : "Cấu hình cơ sở dữ liệu", diff --git a/core/l10n/vi.json b/core/l10n/vi.json index 7567c0a65bb..1670cad7777 100644 --- a/core/l10n/vi.json +++ b/core/l10n/vi.json @@ -29,7 +29,6 @@ "December" : "Tháng 12", "Settings" : "Cài đặt", "Saving..." : "Đang lưu...", - "Reset password" : "Khôi phục mật khẩu", "No" : "Không", "Yes" : "Có", "Choose" : "Chọn", @@ -91,12 +90,8 @@ "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.", "%s password reset" : "%s thiết lập lại mật khẩu", "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}", - "You will receive a link to reset your password via Email." : "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.", - "Username" : "Tên đăng nhập", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?", - "Yes, I really want to reset my password now" : "Vâng, tôi muốn thiết lập lại mật khẩu ngay.", - "Reset" : "Khởi động lại", "New password" : "Mật khẩu mới", + "Reset password" : "Khôi phục mật khẩu", "Personal" : "Cá nhân", "Users" : "Người dùng", "Apps" : "Ứng dụng", @@ -117,6 +112,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.", "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>", + "Username" : "Tên đăng nhập", "Password" : "Mật khẩu", "Data folder" : "Thư mục dữ liệu", "Configure the database" : "Cấu hình cơ sở dữ liệu", diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js index da5521925ea..8a432e857ff 100644 --- a/core/l10n/zh_CN.js +++ b/core/l10n/zh_CN.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？", "I know what I'm doing" : "我知道我在做什么", - "Reset password" : "重置密码", "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。", "No" : "否", "Yes" : "是", @@ -120,13 +119,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。", "%s password reset" : "重置 %s 的密码", "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}", - "You will receive a link to reset your password via Email." : "您将会收到包含可以重置密码链接的邮件。", - "Username" : "用户名", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？", - "Yes, I really want to reset my password now" : "使得，我真的要现在重设密码", - "Reset" : "重置", "New password" : "新密码", "New Password" : "新密码", + "Reset password" : "重置密码", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！", "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。", "Personal" : "个人", @@ -165,6 +160,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。", "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>", + "Username" : "用户名", "Password" : "密码", "Storage & database" : "存储 & 数据库", "Data folder" : "数据目录", diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json index ff67feacad0..7f2aa70e0cd 100644 --- a/core/l10n/zh_CN.json +++ b/core/l10n/zh_CN.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？", "I know what I'm doing" : "我知道我在做什么", - "Reset password" : "重置密码", "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。", "No" : "否", "Yes" : "是", @@ -118,13 +117,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。", "%s password reset" : "重置 %s 的密码", "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}", - "You will receive a link to reset your password via Email." : "您将会收到包含可以重置密码链接的邮件。", - "Username" : "用户名", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？", - "Yes, I really want to reset my password now" : "使得，我真的要现在重设密码", - "Reset" : "重置", "New password" : "新密码", "New Password" : "新密码", + "Reset password" : "重置密码", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！", "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。", "Personal" : "个人", @@ -163,6 +158,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。", "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>", + "Username" : "用户名", "Password" : "密码", "Storage & database" : "存储 & 数据库", "Data folder" : "数据目录", diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js index c36746e12fc..9e4ef8969d8 100644 --- a/core/l10n/zh_HK.js +++ b/core/l10n/zh_HK.js @@ -22,7 +22,6 @@ OC.L10N.register( "December" : "十二月", "Settings" : "設定", "Saving..." : "儲存中...", - "Reset password" : "重設密碼", "No" : "否", "Yes" : "是", "Ok" : "確認", @@ -54,17 +53,16 @@ OC.L10N.register( "_download %n file_::_download %n files_" : [""], "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正", "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}", - "You will receive a link to reset your password via Email." : "你將收到一封電郵", - "Username" : "用戶名稱", - "Reset" : "重設", "New password" : "新密碼", "New Password" : "新密碼", + "Reset password" : "重設密碼", "Personal" : "個人", "Users" : "用戶", "Apps" : "軟件", "Admin" : "管理", "Help" : "幫助", "Create an <strong>admin account</strong>" : "建立管理員帳戶", + "Username" : "用戶名稱", "Password" : "密碼", "Configure the database" : "設定資料庫", "Database user" : "資料庫帳戶", diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json index 294bdce33b6..83806390d1f 100644 --- a/core/l10n/zh_HK.json +++ b/core/l10n/zh_HK.json @@ -20,7 +20,6 @@ "December" : "十二月", "Settings" : "設定", "Saving..." : "儲存中...", - "Reset password" : "重設密碼", "No" : "否", "Yes" : "是", "Ok" : "確認", @@ -52,17 +51,16 @@ "_download %n file_::_download %n files_" : [""], "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正", "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}", - "You will receive a link to reset your password via Email." : "你將收到一封電郵", - "Username" : "用戶名稱", - "Reset" : "重設", "New password" : "新密碼", "New Password" : "新密碼", + "Reset password" : "重設密碼", "Personal" : "個人", "Users" : "用戶", "Apps" : "軟件", "Admin" : "管理", "Help" : "幫助", "Create an <strong>admin account</strong>" : "建立管理員帳戶", + "Username" : "用戶名稱", "Password" : "密碼", "Configure the database" : "設定資料庫", "Database user" : "資料庫帳戶", diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js index 47a9f738ed0..2a3e38d6ff8 100644 --- a/core/l10n/zh_TW.js +++ b/core/l10n/zh_TW.js @@ -39,7 +39,6 @@ OC.L10N.register( "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "重設密碼的連結已經 email 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？", "I know what I'm doing" : "我知道我在幹嘛", - "Reset password" : "重設密碼", "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員", "No" : "否", "Yes" : "是", @@ -120,13 +119,9 @@ OC.L10N.register( "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員", "%s password reset" : "%s 密碼重設", "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}", - "You will receive a link to reset your password via Email." : "重設密碼的連結將會寄到您的電子郵件信箱。", - "Username" : "使用者名稱", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？", - "Yes, I really want to reset my password now" : "對，我現在想要重設我的密碼。", - "Reset" : "重設", "New password" : "新密碼", "New Password" : "新密碼", + "Reset password" : "重設密碼", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！", "For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以取得最好的效果", "Personal" : "個人", @@ -165,6 +160,7 @@ OC.L10N.register( "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。", "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>", + "Username" : "使用者名稱", "Password" : "密碼", "Storage & database" : "儲存空間和資料庫", "Data folder" : "資料儲存位置", diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json index 875b5b5af4a..c8db6e348c7 100644 --- a/core/l10n/zh_TW.json +++ b/core/l10n/zh_TW.json @@ -37,7 +37,6 @@ "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "重設密碼的連結已經 email 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？", "I know what I'm doing" : "我知道我在幹嘛", - "Reset password" : "重設密碼", "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員", "No" : "否", "Yes" : "是", @@ -118,13 +117,9 @@ "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員", "%s password reset" : "%s 密碼重設", "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}", - "You will receive a link to reset your password via Email." : "重設密碼的連結將會寄到您的電子郵件信箱。", - "Username" : "使用者名稱", - "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？", - "Yes, I really want to reset my password now" : "對，我現在想要重設我的密碼。", - "Reset" : "重設", "New password" : "新密碼", "New Password" : "新密碼", + "Reset password" : "重設密碼", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！", "For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以取得最好的效果", "Personal" : "個人", @@ -163,6 +158,7 @@ "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。", "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。", "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>", + "Username" : "使用者名稱", "Password" : "密碼", "Storage & database" : "儲存空間和資料庫", "Data folder" : "資料儲存位置", diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php index e4d51fde077..aee4001ed37 100644 --- a/core/lostpassword/controller/lostcontroller.php +++ b/core/lostpassword/controller/lostcontroller.php @@ -9,68 +9,73 @@ namespace OC\Core\LostPassword\Controller; use \OCP\AppFramework\Controller; -use \OCP\AppFramework\Http\JSONResponse; use \OCP\AppFramework\Http\TemplateResponse; use \OCP\IURLGenerator; use \OCP\IRequest; use \OCP\IL10N; use \OCP\IConfig; -use \OCP\IUserSession; -use \OC\Core\LostPassword\EncryptedDataException; +use OCP\IUserManager; +use OCP\Security\ISecureRandom; +use \OC_Defaults; +use OCP\Security\StringUtils; +/** + * Class LostController + * + * Successfully changing a password will emit the post_passwordReset hook. + * + * @package OC\Core\LostPassword\Controller + */ class LostController extends Controller { - /** - * @var \OCP\IURLGenerator - */ + /** @var IURLGenerator */ protected $urlGenerator; - - /** - * @var \OCP\IUserManager - */ + /** @var IUserManager */ protected $userManager; - - /** - * @var \OC_Defaults - */ + /** @var OC_Defaults */ protected $defaults; - - /** - * @var IL10N - */ + /** @var IL10N */ protected $l10n; + /** @var string */ protected $from; + /** @var bool */ protected $isDataEncrypted; - - /** - * @var IConfig - */ + /** @var IConfig */ protected $config; + /** @var ISecureRandom */ + protected $secureRandom; /** - * @var IUserSession + * @param string $appName + * @param IRequest $request + * @param IURLGenerator $urlGenerator + * @param IUserManager $userManager + * @param OC_Defaults $defaults + * @param IL10N $l10n + * @param IConfig $config + * @param ISecureRandom $secureRandom + * @param string $from + * @param string $isDataEncrypted */ - protected $userSession; - public function __construct($appName, - IRequest $request, - IURLGenerator $urlGenerator, - $userManager, - $defaults, - IL10N $l10n, - IConfig $config, - IUserSession $userSession, - $from, - $isDataEncrypted) { + IRequest $request, + IURLGenerator $urlGenerator, + IUserManager $userManager, + OC_Defaults $defaults, + IL10N $l10n, + IConfig $config, + ISecureRandom $secureRandom, + $from, + $isDataEncrypted) { parent::__construct($appName, $request); $this->urlGenerator = $urlGenerator; $this->userManager = $userManager; $this->defaults = $defaults; $this->l10n = $l10n; + $this->secureRandom = $secureRandom; $this->from = $from; $this->isDataEncrypted = $isDataEncrypted; $this->config = $config; - $this->userSession = $userSession; } /** @@ -81,23 +86,31 @@ class LostController extends Controller { * * @param string $token * @param string $userId + * @return TemplateResponse */ public function resetform($token, $userId) { return new TemplateResponse( 'core/lostpassword', 'resetpassword', array( - 'isEncrypted' => $this->isDataEncrypted, - 'link' => $this->getLink('core.lost.setPassword', $userId, $token), + 'link' => $this->urlGenerator->linkToRouteAbsolute('core.lost.setPassword', array('userId' => $userId, 'token' => $token)), ), 'guest' ); } + /** + * @param $message + * @param array $additional + * @return array + */ private function error($message, array $additional=array()) { return array_merge(array('status' => 'error', 'msg' => $message), $additional); } + /** + * @return array + */ private function success() { return array('status'=>'success'); } @@ -106,14 +119,12 @@ class LostController extends Controller { * @PublicPage * * @param string $user - * @param bool $proceed + * @return array */ - public function email($user, $proceed){ + public function email($user){ // FIXME: use HTTP error codes try { - $this->sendEmail($user, $proceed); - } catch (EncryptedDataException $e){ - return $this->error('', array('encryption' => '1')); + $this->sendEmail($user); } catch (\Exception $e){ return $this->error($e->getMessage()); } @@ -121,15 +132,23 @@ class LostController extends Controller { return $this->success(); } - /** * @PublicPage + * @param string $token + * @param string $userId + * @param string $password + * @param boolean $proceed + * @return array */ - public function setPassword($token, $userId, $password) { + public function setPassword($token, $userId, $password, $proceed) { + if ($this->isDataEncrypted && !$proceed){ + return $this->error('', array('encryption' => true)); + } + try { $user = $this->userManager->get($userId); - if (!$this->checkToken($userId, $token)) { + if (!StringUtils::equals($this->config->getUserValue($userId, 'owncloud', 'lostpassword'), $token)) { throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid')); } @@ -137,9 +156,10 @@ class LostController extends Controller { throw new \Exception(); } - // FIXME: should be added to the all config at some point - \OC_Preferences::deleteKey($userId, 'owncloud', 'lostpassword'); - $this->userSession->unsetMagicInCookie(); + \OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', array('uid' => $userId, 'password' => $password)); + + $this->config->deleteUserValue($userId, 'owncloud', 'lostpassword'); + @\OC_User::unsetMagicInCookie(); } catch (\Exception $e){ return $this->error($e->getMessage()); @@ -148,36 +168,32 @@ class LostController extends Controller { return $this->success(); } - - protected function sendEmail($user, $proceed) { - if ($this->isDataEncrypted && !$proceed){ - throw new EncryptedDataException(); - } - + /** + * @param string $user + * @throws \Exception + */ + protected function sendEmail($user) { if (!$this->userManager->userExists($user)) { - throw new \Exception( - $this->l10n->t('Couldn\'t send reset email. Please make sure '. - 'your username is correct.')); + throw new \Exception($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.')); } - $token = hash('sha256', \OC_Util::generateRandomBytes(30)); - - // Hash the token again to prevent timing attacks - $this->config->setUserValue( - $user, 'owncloud', 'lostpassword', hash('sha256', $token) - ); - $email = $this->config->getUserValue($user, 'settings', 'email'); if (empty($email)) { throw new \Exception( $this->l10n->t('Couldn\'t send reset email because there is no '. - 'email address for this username. Please ' . - 'contact your administrator.') + 'email address for this username. Please ' . + 'contact your administrator.') ); } - $link = $this->getLink('core.lost.resetform', $user, $token); + $token = $this->secureRandom->getMediumStrengthGenerator()->generate(21, + ISecureRandom::CHAR_DIGITS. + ISecureRandom::CHAR_LOWER. + ISecureRandom::CHAR_UPPER); + $this->config->setUserValue($user, 'owncloud', 'lostpassword', $token); + + $link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user, 'token' => $token)); $tmpl = new \OC_Template('core/lostpassword', 'email'); $tmpl->assign('link', $link, false); @@ -200,23 +216,4 @@ class LostController extends Controller { } } - - protected function getLink($route, $user, $token){ - $parameters = array( - 'token' => $token, - 'userId' => $user - ); - $link = $this->urlGenerator->linkToRoute($route, $parameters); - - return $this->urlGenerator->getAbsoluteUrl($link); - } - - - protected function checkToken($user, $token) { - return $this->config->getUserValue( - $user, 'owncloud', 'lostpassword' - ) === hash('sha256', $token); - } - - } diff --git a/core/lostpassword/css/resetpassword.css b/core/lostpassword/css/resetpassword.css index 012af672d97..29a7e875537 100644 --- a/core/lostpassword/css/resetpassword.css +++ b/core/lostpassword/css/resetpassword.css @@ -2,6 +2,10 @@ position: relative; } +.text-center { + text-align: center; +} + #password-icon { top: 20px; } diff --git a/core/lostpassword/encrypteddataexception.php b/core/lostpassword/encrypteddataexception.php deleted file mode 100644 index 99d19445b6c..00000000000 --- a/core/lostpassword/encrypteddataexception.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php -/** - * @author Victor Dubiniuk - * @copyright 2013 Victor Dubiniuk victor.dubiniuk@gmail.com - * - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -namespace OC\Core\LostPassword; - -class EncryptedDataException extends \Exception{ -} diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php deleted file mode 100644 index 00dd139e71f..00000000000 --- a/core/lostpassword/templates/lostpassword.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -//load the file we need -OCP\Util::addStyle('lostpassword', 'lostpassword'); ?> -<form action="<?php print_unescaped($_['link']) ?>" method="post"> - <fieldset> - <div class="update"><?php p($l->t('You will receive a link to reset your password via Email.')); ?></div> - <p> - <input type="text" name="user" id="user" placeholder="<?php p($l->t( 'Username' )); ?>" value="" autocomplete="off" required autofocus /> - <label for="user" class="infield"><?php p($l->t( 'Username' )); ?></label> - <img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/> - <?php if ($_['isEncrypted']): ?> - <br /> - <p class="warning"><?php p($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br /> - <input type="checkbox" name="continue" value="Yes" /> - <?php p($l->t('Yes, I really want to reset my password now')); ?></p> - <?php endif; ?> - </p> - <input type="submit" id="submit" value="<?php p($l->t('Reset')); ?>" /> - </fieldset> -</form> diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php index 118fe787116..498c692f12e 100644 --- a/core/lostpassword/templates/resetpassword.php +++ b/core/lostpassword/templates/resetpassword.php @@ -1,4 +1,10 @@ -<?php OCP\Util::addStyle('lostpassword', 'resetpassword'); ?> +<?php +/** @var array $_ */ +/** @var $l OC_L10N */ +style('lostpassword', 'resetpassword'); +script('core', 'lostpassword'); +?> + <form action="<?php print_unescaped($_['link']) ?>" id="reset-password" method="post"> <fieldset> <p> @@ -7,6 +13,8 @@ <img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/> </p> <input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" /> + <p class="text-center"> + <img class="hidden" id="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/> + </p> </fieldset> </form> -<?php OCP\Util::addScript('core', 'lostpassword'); ?> diff --git a/lib/base.php b/lib/base.php index 1c9f25006dd..82c0c7aa6d0 100644 --- a/lib/base.php +++ b/lib/base.php @@ -465,8 +465,7 @@ class OC { // setup 3rdparty autoloader $vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php'; if (file_exists($vendorAutoLoad)) { - $loader = require_once $vendorAutoLoad; - $loader->add('PasswordHash', OC::$THIRDPARTYROOT . '/3rdparty/phpass'); + require_once $vendorAutoLoad; } else { OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); OC_Template::printErrorPage('Composer autoloader not found, unable to continue.'); @@ -616,14 +615,8 @@ class OC { header('HTTP/1.1 400 Bad Request'); header('Status: 400 Bad Request'); - $domain = $_SERVER['SERVER_NAME']; - // Append port to domain in case it is not - if($_SERVER['SERVER_PORT'] !== '80' && $_SERVER['SERVER_PORT'] !== '443') { - $domain .= ':'.$_SERVER['SERVER_PORT']; - } - $tmpl = new OCP\Template('core', 'untrustedDomain', 'guest'); - $tmpl->assign('domain', $domain); + $tmpl->assign('domain', $_SERVER['SERVER_NAME']); $tmpl->printPage(); exit(); diff --git a/lib/l10n/de_CH.js b/lib/l10n/de_CH.js deleted file mode 100644 index c8b1181dc9b..00000000000 --- a/lib/l10n/de_CH.js +++ /dev/null @@ -1,44 +0,0 @@ -OC.L10N.register( - "lib", - { - "Help" : "Hilfe", - "Personal" : "Persönlich", - "Settings" : "Einstellungen", - "Users" : "Benutzer", - "Admin" : "Administrator", - "No app name specified" : "Kein App-Name spezifiziert", - "web services under your control" : "Web-Services unter Ihrer Kontrolle", - "App directory already exists" : "Anwendungsverzeichnis existiert bereits", - "App can't be installed because of not allowed code in the App" : "Anwendung kann wegen nicht erlaubten Codes nicht installiert werden", - "Application is not enabled" : "Die Anwendung ist nicht aktiviert", - "Authentication error" : "Authentifizierungs-Fehler", - "Token expired. Please reload page." : "Token abgelaufen. Bitte laden Sie die Seite neu.", - "%s enter the database username." : "%s geben Sie den Datenbank-Benutzernamen an.", - "%s enter the database name." : "%s geben Sie den Datenbank-Namen an.", - "%s you may not use dots in the database name" : "%s Der Datenbank-Name darf keine Punkte enthalten", - "MS SQL username and/or password not valid: %s" : "MS SQL Benutzername und/oder Passwort ungültig: %s", - "You need to enter either an existing account or the administrator." : "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.", - "DB Error: \"%s\"" : "DB Fehler: \"%s\"", - "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"", - "Oracle connection could not be established" : "Die Oracle-Verbindung konnte nicht aufgebaut werden.", - "Oracle username and/or password not valid" : "Oracle Benutzername und/oder Passwort ungültig", - "Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s", - "PostgreSQL username and/or password not valid" : "PostgreSQL Benutzername und/oder Passwort ungültig", - "Set an admin username." : "Setze Administrator Benutzername.", - "Set an admin password." : "Setze Administrator Passwort", - "%s shared »%s« with you" : "%s teilt »%s« mit Ihnen", - "Could not find category \"%s\"" : "Die Kategorie «%s» konnte nicht gefunden werden.", - "seconds ago" : "Gerade eben", - "_%n minute ago_::_%n minutes ago_" : ["","Vor %n Minuten"], - "_%n hour ago_::_%n hours ago_" : ["","Vor %n Stunden"], - "today" : "Heute", - "yesterday" : "Gestern", - "_%n day go_::_%n days ago_" : ["","Vor %n Tagen"], - "last month" : "Letzten Monat", - "_%n month ago_::_%n months ago_" : ["","Vor %n Monaten"], - "last year" : "Letztes Jahr", - "years ago" : "Vor Jahren", - "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", - "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/de_CH.json b/lib/l10n/de_CH.json deleted file mode 100644 index 468f2a175b9..00000000000 --- a/lib/l10n/de_CH.json +++ /dev/null @@ -1,42 +0,0 @@ -{ "translations": { - "Help" : "Hilfe", - "Personal" : "Persönlich", - "Settings" : "Einstellungen", - "Users" : "Benutzer", - "Admin" : "Administrator", - "No app name specified" : "Kein App-Name spezifiziert", - "web services under your control" : "Web-Services unter Ihrer Kontrolle", - "App directory already exists" : "Anwendungsverzeichnis existiert bereits", - "App can't be installed because of not allowed code in the App" : "Anwendung kann wegen nicht erlaubten Codes nicht installiert werden", - "Application is not enabled" : "Die Anwendung ist nicht aktiviert", - "Authentication error" : "Authentifizierungs-Fehler", - "Token expired. Please reload page." : "Token abgelaufen. Bitte laden Sie die Seite neu.", - "%s enter the database username." : "%s geben Sie den Datenbank-Benutzernamen an.", - "%s enter the database name." : "%s geben Sie den Datenbank-Namen an.", - "%s you may not use dots in the database name" : "%s Der Datenbank-Name darf keine Punkte enthalten", - "MS SQL username and/or password not valid: %s" : "MS SQL Benutzername und/oder Passwort ungültig: %s", - "You need to enter either an existing account or the administrator." : "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.", - "DB Error: \"%s\"" : "DB Fehler: \"%s\"", - "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"", - "Oracle connection could not be established" : "Die Oracle-Verbindung konnte nicht aufgebaut werden.", - "Oracle username and/or password not valid" : "Oracle Benutzername und/oder Passwort ungültig", - "Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s", - "PostgreSQL username and/or password not valid" : "PostgreSQL Benutzername und/oder Passwort ungültig", - "Set an admin username." : "Setze Administrator Benutzername.", - "Set an admin password." : "Setze Administrator Passwort", - "%s shared »%s« with you" : "%s teilt »%s« mit Ihnen", - "Could not find category \"%s\"" : "Die Kategorie «%s» konnte nicht gefunden werden.", - "seconds ago" : "Gerade eben", - "_%n minute ago_::_%n minutes ago_" : ["","Vor %n Minuten"], - "_%n hour ago_::_%n hours ago_" : ["","Vor %n Stunden"], - "today" : "Heute", - "yesterday" : "Gestern", - "_%n day go_::_%n days ago_" : ["","Vor %n Tagen"], - "last month" : "Letzten Monat", - "_%n month ago_::_%n months ago_" : ["","Vor %n Monaten"], - "last year" : "Letztes Jahr", - "years ago" : "Vor Jahren", - "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden", - "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/lib/l10n/hi_IN.js b/lib/l10n/hi_IN.js deleted file mode 100644 index da0dcc6bdde..00000000000 --- a/lib/l10n/hi_IN.js +++ /dev/null @@ -1,9 +0,0 @@ -OC.L10N.register( - "lib", - { - "_%n minute ago_::_%n minutes ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n day go_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/hi_IN.json b/lib/l10n/hi_IN.json deleted file mode 100644 index 4286553dd0c..00000000000 --- a/lib/l10n/hi_IN.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "translations": { - "_%n minute ago_::_%n minutes ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n day go_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/lib/l10n/hi_IN.php b/lib/l10n/hi_IN.php deleted file mode 100644 index 15f78e0bce6..00000000000 --- a/lib/l10n/hi_IN.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -$TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), -"_%n day go_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") -); -$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js index 1a5b51de2b5..4fdff3c67ef 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -4,7 +4,7 @@ OC.L10N.register( "Cannot write into \"config\" directory!" : "Kan niet schrijven naar de \"config\" directory!", "This can usually be fixed by giving the webserver write access to the config directory" : "Dit kan hersteld worden door de webserver schrijfrechten te geven op de de config directory", "See %s" : "Zie %s", - "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %sgeven op de de config directory%s", + "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver %sschrijfrechten te geven op de de config directory%s", "Sample configuration detected" : "Voorbeeldconfiguratie gevonden", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Blijkbaar is de voorbeeldconfiguratie gekopieerd. Dit kan uw installatie beschadigen en wordt niet dan ook ondersteund. Lees de documentatie voordat u wijzigingen aan config.php doorvoert", "Help" : "Help", diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json index 432915aa2f2..be980d330d6 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -2,7 +2,7 @@ "Cannot write into \"config\" directory!" : "Kan niet schrijven naar de \"config\" directory!", "This can usually be fixed by giving the webserver write access to the config directory" : "Dit kan hersteld worden door de webserver schrijfrechten te geven op de de config directory", "See %s" : "Zie %s", - "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %sgeven op de de config directory%s", + "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver %sschrijfrechten te geven op de de config directory%s", "Sample configuration detected" : "Voorbeeldconfiguratie gevonden", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Blijkbaar is de voorbeeldconfiguratie gekopieerd. Dit kan uw installatie beschadigen en wordt niet dan ook ondersteund. Lees de documentatie voordat u wijzigingen aan config.php doorvoert", "Help" : "Help", diff --git a/lib/l10n/sk.js b/lib/l10n/sk.js deleted file mode 100644 index 55da1e782f6..00000000000 --- a/lib/l10n/sk.js +++ /dev/null @@ -1,11 +0,0 @@ -OC.L10N.register( - "lib", - { - "Personal" : "Osobné", - "Settings" : "Nastavenia", - "_%n minute ago_::_%n minutes ago_" : ["","",""], - "_%n hour ago_::_%n hours ago_" : ["","",""], - "_%n day go_::_%n days ago_" : ["","",""], - "_%n month ago_::_%n months ago_" : ["","",""] -}, -"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/lib/l10n/sk.json b/lib/l10n/sk.json deleted file mode 100644 index 6c4da5395ec..00000000000 --- a/lib/l10n/sk.json +++ /dev/null @@ -1,9 +0,0 @@ -{ "translations": { - "Personal" : "Osobné", - "Settings" : "Nastavenia", - "_%n minute ago_::_%n minutes ago_" : ["","",""], - "_%n hour ago_::_%n hours ago_" : ["","",""], - "_%n day go_::_%n days ago_" : ["","",""], - "_%n month ago_::_%n months ago_" : ["","",""] -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" -}
\ No newline at end of file diff --git a/lib/l10n/sk.php b/lib/l10n/sk.php deleted file mode 100644 index 5cfafe6ca0c..00000000000 --- a/lib/l10n/sk.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php -$TRANSLATIONS = array( -"Personal" => "Osobné", -"Settings" => "Nastavenia", -"_%n minute ago_::_%n minutes ago_" => array("","",""), -"_%n hour ago_::_%n hours ago_" => array("","",""), -"_%n day go_::_%n days ago_" => array("","",""), -"_%n month ago_::_%n months ago_" => array("","","") -); -$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/lib/l10n/sq.js b/lib/l10n/sq.js index 6328972ac8a..f547c7b9104 100644 --- a/lib/l10n/sq.js +++ b/lib/l10n/sq.js @@ -6,6 +6,8 @@ OC.L10N.register( "Settings" : "Parametra", "Users" : "Përdoruesit", "Admin" : "Admin", + "Unknown filetype" : "Tip i panjohur skedari", + "Invalid image" : "Imazh i pavlefshëm", "web services under your control" : "shërbime web nën kontrollin tënd", "Application is not enabled" : "Programi nuk është i aktivizuar.", "Authentication error" : "Veprim i gabuar gjatë vërtetimit të identitetit", diff --git a/lib/l10n/sq.json b/lib/l10n/sq.json index 7df63e8ff84..8f2d062b91b 100644 --- a/lib/l10n/sq.json +++ b/lib/l10n/sq.json @@ -4,6 +4,8 @@ "Settings" : "Parametra", "Users" : "Përdoruesit", "Admin" : "Admin", + "Unknown filetype" : "Tip i panjohur skedari", + "Invalid image" : "Imazh i pavlefshëm", "web services under your control" : "shërbime web nën kontrollin tënd", "Application is not enabled" : "Programi nuk është i aktivizuar.", "Authentication error" : "Veprim i gabuar gjatë vërtetimit të identitetit", diff --git a/lib/l10n/ur.js b/lib/l10n/ur.js deleted file mode 100644 index da0dcc6bdde..00000000000 --- a/lib/l10n/ur.js +++ /dev/null @@ -1,9 +0,0 @@ -OC.L10N.register( - "lib", - { - "_%n minute ago_::_%n minutes ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n day go_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""] -}, -"nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/ur.json b/lib/l10n/ur.json deleted file mode 100644 index 4286553dd0c..00000000000 --- a/lib/l10n/ur.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "translations": { - "_%n minute ago_::_%n minutes ago_" : ["",""], - "_%n hour ago_::_%n hours ago_" : ["",""], - "_%n day go_::_%n days ago_" : ["",""], - "_%n month ago_::_%n months ago_" : ["",""] -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/lib/l10n/ur.php b/lib/l10n/ur.php deleted file mode 100644 index 15f78e0bce6..00000000000 --- a/lib/l10n/ur.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -$TRANSLATIONS = array( -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), -"_%n day go_::_%n days ago_" => array("",""), -"_%n month ago_::_%n months ago_" => array("","") -); -$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php index 0a21d2938b7..c232c0298b1 100644 --- a/lib/private/files/storage/mappedlocal.php +++ b/lib/private/files/storage/mappedlocal.php @@ -24,9 +24,6 @@ class MappedLocal extends \OC\Files\Storage\Common { } public function __destruct() { - if (defined('PHPUNIT_RUN')) { - $this->mapper->removePath($this->datadir, true, true); - } } public function getId() { diff --git a/lib/private/repair.php b/lib/private/repair.php index 081aeb32c66..b5c1e9db58e 100644 --- a/lib/private/repair.php +++ b/lib/private/repair.php @@ -93,7 +93,8 @@ class Repair extends BasicEmitter { $steps = array( new InnoDB(), new Collation(\OC::$server->getConfig(), \OC_DB::getConnection()), - new SearchLuceneTables() + new SearchLuceneTables(), + new RepairConfig() ); //There is no need to delete all previews on every single update diff --git a/lib/private/request.php b/lib/private/request.php index 1cfa4a150c5..d079dc110d1 100644 --- a/lib/private/request.php +++ b/lib/private/request.php @@ -12,8 +12,7 @@ class OC_Request { // Android Chrome user agent: https://developers.google.com/chrome/mobile/docs/user-agent const USER_AGENT_ANDROID_MOBILE_CHROME = '#Android.*Chrome/[.0-9]*#'; const USER_AGENT_FREEBOX = '#^Mozilla/5\.0$#'; - - const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost)(:[0-9]+|)$/'; + const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost)$/'; static protected $reqId; /** @@ -76,13 +75,26 @@ class OC_Request { * have been configured */ public static function isTrustedDomain($domain) { - $trustedList = \OC_Config::getValue('trusted_domains', array()); + // Extract port from domain if needed + $pos = strrpos($domain, ':'); + if ($pos !== false) { + $port = substr($domain, $pos + 1); + if (is_numeric($port)) { + $domain = substr($domain, 0, $pos); + } + } + + // FIXME: Empty config array defaults to true for now. - Deprecate this behaviour with ownCloud 8. + $trustedList = \OC::$server->getConfig()->getSystemValue('trusted_domains', array()); if (empty($trustedList)) { return true; } + + // Always allow access from localhost if (preg_match(self::REGEX_LOCALHOST, $domain) === 1) { return true; } + return in_array($domain, $trustedList); } diff --git a/lib/private/share/share.php b/lib/private/share/share.php index cd5decf6f71..a8febc9aca7 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -633,9 +633,7 @@ class Share extends \OC\Share\Constants { // Generate hash of password - same method as user passwords if (!empty($shareWith)) { - $forcePortable = (CRYPT_BLOWFISH != 1); - $hasher = new \PasswordHash(8, $forcePortable); - $shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', '')); + $shareWith = \OC::$server->getHasher()->hash($shareWith); } else { // reuse the already set password, but only if we change permissions // otherwise the user disabled the password protection diff --git a/lib/repair/repairconfig.php b/lib/repair/repairconfig.php index e09d8e8fe7a..e9b322da826 100644 --- a/lib/repair/repairconfig.php +++ b/lib/repair/repairconfig.php @@ -12,8 +12,16 @@ use OC\Hooks\BasicEmitter; use OC\RepairStep; use Sabre\DAV\Exception; +/** + * Class RepairConfig + * + * @package OC\Repair + */ class RepairConfig extends BasicEmitter implements RepairStep { + /** + * @return string + */ public function getName() { return 'Repair config'; } @@ -23,6 +31,7 @@ class RepairConfig extends BasicEmitter implements RepairStep { */ public function run() { $this->addSecret(); + $this->removePortsFromTrustedDomains(); } /** @@ -34,4 +43,24 @@ class RepairConfig extends BasicEmitter implements RepairStep { \OC::$server->getConfig()->setSystemValue('secret', $secret); } } + + + /** + * Remove ports from existing trusted domains in config.php + */ + private function removePortsFromTrustedDomains() { + $trustedDomains = \OC::$server->getConfig()->getSystemValue('trusted_domains', array()); + $newTrustedDomains = array(); + foreach($trustedDomains as $domain) { + $pos = strrpos($domain, ':'); + if ($pos !== false) { + $port = substr($domain, $pos + 1); + if (is_numeric($port)) { + $domain = substr($domain, 0, $pos); + } + } + $newTrustedDomains[] = $domain; + } + \OC::$server->getConfig()->setSystemValue('trusted_domains', $newTrustedDomains); + } } diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index 18406a70e24..09ff12946e7 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -222,6 +222,7 @@ OC.L10N.register( "Create" : "Vytvořit", "Admin Recovery Password" : "Heslo obnovy správce", "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla", + "Search Users" : "Hledat uživatele", "Add Group" : "Přidat skupinu", "Group" : "Skupina", "Everyone" : "Všichni", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index 376d1007771..6b95da48bd7 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -220,6 +220,7 @@ "Create" : "Vytvořit", "Admin Recovery Password" : "Heslo obnovy správce", "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla", + "Search Users" : "Hledat uživatele", "Add Group" : "Přidat skupinu", "Group" : "Skupina", "Everyone" : "Všichni", diff --git a/settings/l10n/da.js b/settings/l10n/da.js index fa39a3a4657..6a45f20375f 100644 --- a/settings/l10n/da.js +++ b/settings/l10n/da.js @@ -222,6 +222,7 @@ OC.L10N.register( "Create" : "Ny", "Admin Recovery Password" : "Administrator gendannelse kodeord", "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord", + "Search Users" : "Søg efter brugere", "Add Group" : "Tilføj Gruppe", "Group" : "Gruppe", "Everyone" : "Alle", diff --git a/settings/l10n/da.json b/settings/l10n/da.json index f2b0c136368..d7c8caaa5b1 100644 --- a/settings/l10n/da.json +++ b/settings/l10n/da.json @@ -220,6 +220,7 @@ "Create" : "Ny", "Admin Recovery Password" : "Administrator gendannelse kodeord", "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord", + "Search Users" : "Søg efter brugere", "Add Group" : "Tilføj Gruppe", "Group" : "Gruppe", "Everyone" : "Alle", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index 01c1495a535..0270c5ea014 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -222,6 +222,7 @@ OC.L10N.register( "Create" : "Anlegen", "Admin Recovery Password" : "Admin-Wiederherstellungspasswort", "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen", + "Search Users" : "Nutzer suchen", "Add Group" : "Gruppe hinzufügen", "Group" : "Gruppe", "Everyone" : "Jeder", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 9a01aa2dbd7..9f8c0ebb043 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -220,6 +220,7 @@ "Create" : "Anlegen", "Admin Recovery Password" : "Admin-Wiederherstellungspasswort", "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen", + "Search Users" : "Nutzer suchen", "Add Group" : "Gruppe hinzufügen", "Group" : "Gruppe", "Everyone" : "Jeder", diff --git a/settings/l10n/de_CH.js b/settings/l10n/de_CH.js deleted file mode 100644 index af913b8d81e..00000000000 --- a/settings/l10n/de_CH.js +++ /dev/null @@ -1,102 +0,0 @@ -OC.L10N.register( - "settings", - { - "Enabled" : "Aktiviert", - "Authentication error" : "Authentifizierungs-Fehler", - "Group already exists" : "Die Gruppe existiert bereits", - "Unable to add group" : "Die Gruppe konnte nicht angelegt werden", - "Email saved" : "E-Mail-Adresse gespeichert", - "Invalid email" : "Ungültige E-Mail-Adresse", - "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden", - "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden", - "Language changed" : "Sprache geändert", - "Invalid request" : "Ungültige Anforderung", - "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen", - "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.", - "Saved" : "Gespeichert", - "Email sent" : "Email gesendet", - "All" : "Alle", - "Please wait...." : "Bitte warten....", - "Error while disabling app" : "Fehler während der Deaktivierung der Anwendung", - "Disable" : "Deaktivieren", - "Enable" : "Aktivieren", - "Error while enabling app" : "Fehler während der Aktivierung der Anwendung", - "Updating...." : "Update...", - "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten", - "Updated" : "Aktualisiert", - "Delete" : "Löschen", - "Decrypting files... Please wait, this can take some time." : "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.", - "Groups" : "Gruppen", - "undo" : "rückgängig machen", - "never" : "niemals", - "add group" : "Gruppe hinzufügen", - "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 (Schweiz)", - "SSL root certificates" : "SSL-Root-Zertifikate", - "Encryption" : "Verschlüsselung", - "Login" : "Anmelden", - "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", - "Module 'fileinfo' missing" : "Das Modul 'fileinfo' fehlt", - "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.", - "Locale not working" : "Die Lokalisierung funktioniert nicht", - "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.", - "Cron" : "Cron", - "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen", - "Sharing" : "Teilen", - "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen", - "Allow public uploads" : "Erlaube öffentliches hochladen", - "Allow resharing" : "Erlaube Weiterverteilen", - "Security" : "Sicherheit", - "Enforce HTTPS" : "HTTPS erzwingen", - "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.", - "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.", - "Server address" : "Adresse des Servers", - "Port" : "Port", - "Log" : "Log", - "Log level" : "Log-Level", - "More" : "Mehr", - "Less" : "Weniger", - "Version" : "Version", - "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.", - "More apps" : "Mehr Apps", - "by" : "von", - "User Documentation" : "Dokumentation für Benutzer", - "Administrator Documentation" : "Dokumentation für Administratoren", - "Online Documentation" : "Online-Dokumentation", - "Forum" : "Forum", - "Bugtracker" : "Bugtracker", - "Commercial Support" : "Kommerzieller Support", - "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren", - "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>", - "Password" : "Passwort", - "Your password was changed" : "Ihr Passwort wurde geändert.", - "Unable to change your password" : "Das Passwort konnte nicht geändert werden", - "Current password" : "Aktuelles Passwort", - "New password" : "Neues Passwort", - "Change password" : "Passwort ändern", - "Email" : "E-Mail", - "Your email address" : "Ihre E-Mail-Adresse", - "Cancel" : "Abbrechen", - "Language" : "Sprache", - "Help translate" : "Helfen Sie bei der Übersetzung", - "Import Root Certificate" : "Root-Zertifikate importieren", - "Log-in password" : "Login-Passwort", - "Decrypt all Files" : "Alle Dateien entschlüsseln", - "Login Name" : "Loginname", - "Create" : "Erstellen", - "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung", - "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen", - "Unlimited" : "Unbegrenzt", - "Other" : "Andere", - "Username" : "Benutzername", - "set new password" : "Neues Passwort setzen", - "Default" : "Standard" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/settings/l10n/de_CH.json b/settings/l10n/de_CH.json deleted file mode 100644 index ad7338d33b1..00000000000 --- a/settings/l10n/de_CH.json +++ /dev/null @@ -1,100 +0,0 @@ -{ "translations": { - "Enabled" : "Aktiviert", - "Authentication error" : "Authentifizierungs-Fehler", - "Group already exists" : "Die Gruppe existiert bereits", - "Unable to add group" : "Die Gruppe konnte nicht angelegt werden", - "Email saved" : "E-Mail-Adresse gespeichert", - "Invalid email" : "Ungültige E-Mail-Adresse", - "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden", - "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden", - "Language changed" : "Sprache geändert", - "Invalid request" : "Ungültige Anforderung", - "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen", - "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.", - "Saved" : "Gespeichert", - "Email sent" : "Email gesendet", - "All" : "Alle", - "Please wait...." : "Bitte warten....", - "Error while disabling app" : "Fehler während der Deaktivierung der Anwendung", - "Disable" : "Deaktivieren", - "Enable" : "Aktivieren", - "Error while enabling app" : "Fehler während der Aktivierung der Anwendung", - "Updating...." : "Update...", - "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten", - "Updated" : "Aktualisiert", - "Delete" : "Löschen", - "Decrypting files... Please wait, this can take some time." : "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.", - "Groups" : "Gruppen", - "undo" : "rückgängig machen", - "never" : "niemals", - "add group" : "Gruppe hinzufügen", - "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 (Schweiz)", - "SSL root certificates" : "SSL-Root-Zertifikate", - "Encryption" : "Verschlüsselung", - "Login" : "Anmelden", - "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", - "Module 'fileinfo' missing" : "Das Modul 'fileinfo' fehlt", - "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.", - "Locale not working" : "Die Lokalisierung funktioniert nicht", - "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.", - "Cron" : "Cron", - "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen", - "Sharing" : "Teilen", - "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen", - "Allow public uploads" : "Erlaube öffentliches hochladen", - "Allow resharing" : "Erlaube Weiterverteilen", - "Security" : "Sicherheit", - "Enforce HTTPS" : "HTTPS erzwingen", - "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.", - "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.", - "Server address" : "Adresse des Servers", - "Port" : "Port", - "Log" : "Log", - "Log level" : "Log-Level", - "More" : "Mehr", - "Less" : "Weniger", - "Version" : "Version", - "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.", - "More apps" : "Mehr Apps", - "by" : "von", - "User Documentation" : "Dokumentation für Benutzer", - "Administrator Documentation" : "Dokumentation für Administratoren", - "Online Documentation" : "Online-Dokumentation", - "Forum" : "Forum", - "Bugtracker" : "Bugtracker", - "Commercial Support" : "Kommerzieller Support", - "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren", - "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>", - "Password" : "Passwort", - "Your password was changed" : "Ihr Passwort wurde geändert.", - "Unable to change your password" : "Das Passwort konnte nicht geändert werden", - "Current password" : "Aktuelles Passwort", - "New password" : "Neues Passwort", - "Change password" : "Passwort ändern", - "Email" : "E-Mail", - "Your email address" : "Ihre E-Mail-Adresse", - "Cancel" : "Abbrechen", - "Language" : "Sprache", - "Help translate" : "Helfen Sie bei der Übersetzung", - "Import Root Certificate" : "Root-Zertifikate importieren", - "Log-in password" : "Login-Passwort", - "Decrypt all Files" : "Alle Dateien entschlüsseln", - "Login Name" : "Loginname", - "Create" : "Erstellen", - "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung", - "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen", - "Unlimited" : "Unbegrenzt", - "Other" : "Andere", - "Username" : "Benutzername", - "set new password" : "Neues Passwort setzen", - "Default" : "Standard" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index 08726f1afc9..9ac0e0af61d 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -222,6 +222,7 @@ OC.L10N.register( "Create" : "Erstellen", "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung", "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen", + "Search Users" : "Nutzer suchen", "Add Group" : "Gruppe hinzufügen", "Group" : "Gruppe", "Everyone" : "Jeder", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 700d8c03a42..c0cd88181f6 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -220,6 +220,7 @@ "Create" : "Erstellen", "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung", "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen", + "Search Users" : "Nutzer suchen", "Add Group" : "Gruppe hinzufügen", "Group" : "Gruppe", "Everyone" : "Jeder", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index 2847fcd65a0..ed90998d2b4 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -222,6 +222,7 @@ OC.L10N.register( "Create" : "Create", "Admin Recovery Password" : "Admin Recovery Password", "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change", + "Search Users" : "Search Users", "Add Group" : "Add Group", "Group" : "Group", "Everyone" : "Everyone", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index 989044bafdb..3890cbd8079 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -220,6 +220,7 @@ "Create" : "Create", "Admin Recovery Password" : "Admin Recovery Password", "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change", + "Search Users" : "Search Users", "Add Group" : "Add Group", "Group" : "Group", "Everyone" : "Everyone", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index eeae90c5e80..93ba9b53b56 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -222,6 +222,7 @@ OC.L10N.register( "Create" : "Crear", "Admin Recovery Password" : "Recuperación de la contraseña de administración", "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.", + "Search Users" : "Buscar usuarios", "Add Group" : "Agregar grupo", "Group" : "Grupo", "Everyone" : "Todos", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index 2a80ccdde83..1e3ce46d274 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -220,6 +220,7 @@ "Create" : "Crear", "Admin Recovery Password" : "Recuperación de la contraseña de administración", "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.", + "Search Users" : "Buscar usuarios", "Add Group" : "Agregar grupo", "Group" : "Grupo", "Everyone" : "Todos", diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index c031dcb043e..eed62e818c6 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -214,6 +214,7 @@ OC.L10N.register( "Username" : "Käyttäjätunnus", "Create" : "Luo", "Admin Recovery Password" : "Ylläpitäjän palautussalasana", + "Search Users" : "Etsi käyttäjiä", "Add Group" : "Lisää ryhmä", "Group" : "Ryhmä", "Everyone" : "Kaikki", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index 17bb06c2f4c..54b334704ad 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -212,6 +212,7 @@ "Username" : "Käyttäjätunnus", "Create" : "Luo", "Admin Recovery Password" : "Ylläpitäjän palautussalasana", + "Search Users" : "Etsi käyttäjiä", "Add Group" : "Lisää ryhmä", "Group" : "Ryhmä", "Everyone" : "Kaikki", diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index cf18809aa7d..e1f128e248d 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -222,6 +222,7 @@ OC.L10N.register( "Create" : "Créer", "Admin Recovery Password" : "Récupération du mot de passe administrateur", "Enter the recovery password in order to recover the users files during password change" : "Entrez le mot de passe de récupération pour récupérer les fichiers utilisateurs pendant le changement de mot de passe", + "Search Users" : "Recherche des utilisateurs", "Add Group" : "Ajouter un groupe", "Group" : "Groupe", "Everyone" : "Tout le monde", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index d9e128e4d9e..f10cdd96008 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -220,6 +220,7 @@ "Create" : "Créer", "Admin Recovery Password" : "Récupération du mot de passe administrateur", "Enter the recovery password in order to recover the users files during password change" : "Entrez le mot de passe de récupération pour récupérer les fichiers utilisateurs pendant le changement de mot de passe", + "Search Users" : "Recherche des utilisateurs", "Add Group" : "Ajouter un groupe", "Group" : "Groupe", "Everyone" : "Tout le monde", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index 8bc46cc45ae..f4bf7d07bbf 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -222,6 +222,7 @@ OC.L10N.register( "Create" : "Aanmaken", "Admin Recovery Password" : "Beheer herstel wachtwoord", "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging", + "Search Users" : "Zoek gebruikers", "Add Group" : "Toevoegen groep", "Group" : "Groep", "Everyone" : "Iedereen", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index 72bece28415..ce931dbfcca 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -220,6 +220,7 @@ "Create" : "Aanmaken", "Admin Recovery Password" : "Beheer herstel wachtwoord", "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging", + "Search Users" : "Zoek gebruikers", "Add Group" : "Toevoegen groep", "Group" : "Groep", "Everyone" : "Iedereen", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index 30346ed6e58..66f9617dc2f 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -222,6 +222,7 @@ OC.L10N.register( "Create" : "Criar", "Admin Recovery Password" : "Recuperação da Senha do Administrador", "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.", + "Search Users" : "Pesquisar Usuários", "Add Group" : "Adicionar Grupo", "Group" : "Grupo", "Everyone" : "Para todos", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index 0d89f75f1d1..05bb0a60eec 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -220,6 +220,7 @@ "Create" : "Criar", "Admin Recovery Password" : "Recuperação da Senha do Administrador", "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.", + "Search Users" : "Pesquisar Usuários", "Add Group" : "Adicionar Grupo", "Group" : "Grupo", "Everyone" : "Para todos", diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js index 8a5b941d8c7..c5741c32ee9 100644 --- a/settings/l10n/pt_PT.js +++ b/settings/l10n/pt_PT.js @@ -13,8 +13,8 @@ OC.L10N.register( "Group already exists" : "O grupo já existe", "Unable to add group" : "Não é possível acrescentar o grupo", "Files decrypted successfully" : "Ficheiros desencriptados com sucesso", - "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador", - "Couldn't decrypt your files, check your password and try again" : "Não foi possível desencriptar os seus arquivos. Verifique a sua senha e tente novamente", + "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador", + "Couldn't decrypt your files, check your password and try again" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua palavra-passe e tente novamente", "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente", "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador", "Couldn't remove app." : "Não foi possível remover a aplicação.", @@ -30,12 +30,12 @@ OC.L10N.register( "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s", "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s", "Couldn't update app." : "Não foi possível actualizar a aplicação.", - "Wrong password" : "Senha errada", + "Wrong password" : "Palavra-passe errada", "No user supplied" : "Nenhum utilizador especificado.", - "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos", - "Wrong admin recovery password. Please check the password and try again." : "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.", - "Unable to change password" : "Não foi possível alterar a sua password", + "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma palavra-passe de recuperação de administrador, caso contrário seráo perdidos todos os dados", + "Wrong admin recovery password. Please check the password and try again." : "Palavra-passe de recuperação de administrador errada. Por favor, verifique a palavra-passe e tente novamente.", + "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de codificação foi atualizada com sucesso.", + "Unable to change password" : "Não foi possível alterar a sua palavra-passe ", "Enabled" : "Ativada", "Not enabled" : "Desactivado", "Recommended" : "Recomendado", @@ -61,11 +61,11 @@ OC.L10N.register( "Error while uninstalling app" : "Erro durante a desinstalação da aplicação", "Uninstall" : "Desinstalar", "Select a profile picture" : "Seleccione uma fotografia de perfil", - "Very weak password" : "Senha muito fraca", - "Weak password" : "Senha fraca", - "So-so password" : "Senha aceitável", - "Good password" : "Senha Forte", - "Strong password" : "Senha muito forte", + "Very weak password" : "Palavra-passe muito fraca", + "Weak password" : "Palavra-passe fraca", + "So-so password" : "Palavra-passe aceitável", + "Good password" : "Palavra-passe boa", + "Strong password" : "Palavra-passe forte", "Valid until {date}" : "Válido até {date}", "Delete" : "Apagar", "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.", @@ -83,7 +83,7 @@ OC.L10N.register( "add group" : "Adicionar grupo", "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido", "Error creating user" : "Erro a criar utilizador", - "A valid password must be provided" : "Uma password válida deve ser fornecida", + "A valid password must be provided" : "Deve ser fornecida uma palavra-passe válida", "Warning: Home directory for user \"{user}\" already exists" : "Atenção: a pasta pessoal do utilizador \"{user}\" já existe", "__language_name__" : "__language_name__", "Personal Info" : "Informação Pessoal", @@ -131,7 +131,7 @@ OC.L10N.register( "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.", "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha", "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link", - "Enforce password protection" : "Forçar protecção da palavra passe", + "Enforce password protection" : "Forçar proteção por palavra-passe", "Allow public uploads" : "Permitir Envios Públicos", "Set default expiration date" : "Especificar a data padrão de expiração", "Expire after " : "Expira após", @@ -157,7 +157,7 @@ OC.L10N.register( "Port" : "Porta", "Credentials" : "Credenciais", "SMTP Username" : "Nome de utilizador SMTP", - "SMTP Password" : "Senha SMTP", + "SMTP Password" : "Palavra-passe SMTP", "Store credentials" : "Armazenar credenciais", "Test email settings" : "Testar definições de e-mail", "Send email" : "Enviar email", @@ -185,16 +185,16 @@ OC.L10N.register( "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!", "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial", "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usou <strong>%s</strong> do disponivel <strong>%s</strong>", - "Password" : "Password", + "Password" : "Palavra-passe", "Your password was changed" : "A sua palavra-passe foi alterada", - "Unable to change your password" : "Não foi possivel alterar a sua palavra-chave", - "Current password" : "Palavra-chave actual", - "New password" : "Nova palavra-chave", - "Change password" : "Alterar palavra-chave", + "Unable to change your password" : "Não foi possível alterar a sua palavra-passe", + "Current password" : "Palavra-passe atual", + "New password" : "Nova palavra-passe", + "Change password" : "Alterar palavra-passe", "Full Name" : "Nome completo", "Email" : "Email", "Your email address" : "O seu endereço de email", - "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações", + "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação da palavra-passe e receber notificações", "Profile picture" : "Foto do perfil", "Upload new" : "Carregar novo", "Select new from Files" : "Seleccionar novo a partir dos ficheiros", @@ -211,7 +211,7 @@ OC.L10N.register( "Valid until %s" : "Válido até %s", "Import Root Certificate" : "Importar Certificado Root", "The encryption app is no longer enabled, please decrypt all your files" : "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros", - "Log-in password" : "Password de entrada", + "Log-in password" : "Palavra-passe de Iniciar a Sessão", "Decrypt all Files" : "Desencriptar todos os ficheiros", "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves. Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.", "Restore Encryption Keys" : "Restaurar as chaves de encriptação", @@ -220,8 +220,9 @@ OC.L10N.register( "Show last log in" : "Mostrar ultimo acesso de entrada", "Username" : "Nome de utilizador", "Create" : "Criar", - "Admin Recovery Password" : "Recuperar password de administrador", - "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha", + "Admin Recovery Password" : "Recuperação da Palavra-passe de Administrador", + "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os ficheiros dos utilizadores durante a mudança da palavra-passe", + "Search Users" : "Procurar Utilizadores", "Add Group" : "Adicionar grupo", "Group" : "Grupo", "Everyone" : "Para todos", diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json index 8a3882cd7b1..ae4a72170c3 100644 --- a/settings/l10n/pt_PT.json +++ b/settings/l10n/pt_PT.json @@ -11,8 +11,8 @@ "Group already exists" : "O grupo já existe", "Unable to add group" : "Não é possível acrescentar o grupo", "Files decrypted successfully" : "Ficheiros desencriptados com sucesso", - "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador", - "Couldn't decrypt your files, check your password and try again" : "Não foi possível desencriptar os seus arquivos. Verifique a sua senha e tente novamente", + "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador", + "Couldn't decrypt your files, check your password and try again" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua palavra-passe e tente novamente", "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente", "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador", "Couldn't remove app." : "Não foi possível remover a aplicação.", @@ -28,12 +28,12 @@ "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s", "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s", "Couldn't update app." : "Não foi possível actualizar a aplicação.", - "Wrong password" : "Senha errada", + "Wrong password" : "Palavra-passe errada", "No user supplied" : "Nenhum utilizador especificado.", - "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos", - "Wrong admin recovery password. Please check the password and try again." : "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.", - "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.", - "Unable to change password" : "Não foi possível alterar a sua password", + "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma palavra-passe de recuperação de administrador, caso contrário seráo perdidos todos os dados", + "Wrong admin recovery password. Please check the password and try again." : "Palavra-passe de recuperação de administrador errada. Por favor, verifique a palavra-passe e tente novamente.", + "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de codificação foi atualizada com sucesso.", + "Unable to change password" : "Não foi possível alterar a sua palavra-passe ", "Enabled" : "Ativada", "Not enabled" : "Desactivado", "Recommended" : "Recomendado", @@ -59,11 +59,11 @@ "Error while uninstalling app" : "Erro durante a desinstalação da aplicação", "Uninstall" : "Desinstalar", "Select a profile picture" : "Seleccione uma fotografia de perfil", - "Very weak password" : "Senha muito fraca", - "Weak password" : "Senha fraca", - "So-so password" : "Senha aceitável", - "Good password" : "Senha Forte", - "Strong password" : "Senha muito forte", + "Very weak password" : "Palavra-passe muito fraca", + "Weak password" : "Palavra-passe fraca", + "So-so password" : "Palavra-passe aceitável", + "Good password" : "Palavra-passe boa", + "Strong password" : "Palavra-passe forte", "Valid until {date}" : "Válido até {date}", "Delete" : "Apagar", "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.", @@ -81,7 +81,7 @@ "add group" : "Adicionar grupo", "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido", "Error creating user" : "Erro a criar utilizador", - "A valid password must be provided" : "Uma password válida deve ser fornecida", + "A valid password must be provided" : "Deve ser fornecida uma palavra-passe válida", "Warning: Home directory for user \"{user}\" already exists" : "Atenção: a pasta pessoal do utilizador \"{user}\" já existe", "__language_name__" : "__language_name__", "Personal Info" : "Informação Pessoal", @@ -129,7 +129,7 @@ "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.", "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha", "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link", - "Enforce password protection" : "Forçar protecção da palavra passe", + "Enforce password protection" : "Forçar proteção por palavra-passe", "Allow public uploads" : "Permitir Envios Públicos", "Set default expiration date" : "Especificar a data padrão de expiração", "Expire after " : "Expira após", @@ -155,7 +155,7 @@ "Port" : "Porta", "Credentials" : "Credenciais", "SMTP Username" : "Nome de utilizador SMTP", - "SMTP Password" : "Senha SMTP", + "SMTP Password" : "Palavra-passe SMTP", "Store credentials" : "Armazenar credenciais", "Test email settings" : "Testar definições de e-mail", "Send email" : "Enviar email", @@ -183,16 +183,16 @@ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!", "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial", "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usou <strong>%s</strong> do disponivel <strong>%s</strong>", - "Password" : "Password", + "Password" : "Palavra-passe", "Your password was changed" : "A sua palavra-passe foi alterada", - "Unable to change your password" : "Não foi possivel alterar a sua palavra-chave", - "Current password" : "Palavra-chave actual", - "New password" : "Nova palavra-chave", - "Change password" : "Alterar palavra-chave", + "Unable to change your password" : "Não foi possível alterar a sua palavra-passe", + "Current password" : "Palavra-passe atual", + "New password" : "Nova palavra-passe", + "Change password" : "Alterar palavra-passe", "Full Name" : "Nome completo", "Email" : "Email", "Your email address" : "O seu endereço de email", - "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações", + "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação da palavra-passe e receber notificações", "Profile picture" : "Foto do perfil", "Upload new" : "Carregar novo", "Select new from Files" : "Seleccionar novo a partir dos ficheiros", @@ -209,7 +209,7 @@ "Valid until %s" : "Válido até %s", "Import Root Certificate" : "Importar Certificado Root", "The encryption app is no longer enabled, please decrypt all your files" : "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros", - "Log-in password" : "Password de entrada", + "Log-in password" : "Palavra-passe de Iniciar a Sessão", "Decrypt all Files" : "Desencriptar todos os ficheiros", "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves. Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.", "Restore Encryption Keys" : "Restaurar as chaves de encriptação", @@ -218,8 +218,9 @@ "Show last log in" : "Mostrar ultimo acesso de entrada", "Username" : "Nome de utilizador", "Create" : "Criar", - "Admin Recovery Password" : "Recuperar password de administrador", - "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha", + "Admin Recovery Password" : "Recuperação da Palavra-passe de Administrador", + "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os ficheiros dos utilizadores durante a mudança da palavra-passe", + "Search Users" : "Procurar Utilizadores", "Add Group" : "Adicionar grupo", "Group" : "Grupo", "Everyone" : "Para todos", diff --git a/settings/l10n/sk.js b/settings/l10n/sk.js deleted file mode 100644 index e48cc9d9ed9..00000000000 --- a/settings/l10n/sk.js +++ /dev/null @@ -1,9 +0,0 @@ -OC.L10N.register( - "settings", - { - "Delete" : "Odstrániť", - "never" : "nikdy", - "Cancel" : "Zrušiť", - "Other" : "Ostatné" -}, -"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/settings/l10n/sk.json b/settings/l10n/sk.json deleted file mode 100644 index 609a62d21fd..00000000000 --- a/settings/l10n/sk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "translations": { - "Delete" : "Odstrániť", - "never" : "nikdy", - "Cancel" : "Zrušiť", - "Other" : "Ostatné" -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" -}
\ No newline at end of file diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js index 0a493f28e86..d30661a1ee4 100644 --- a/settings/l10n/tr.js +++ b/settings/l10n/tr.js @@ -222,6 +222,7 @@ OC.L10N.register( "Create" : "Oluştur", "Admin Recovery Password" : "Yönetici Kurtarma Parolası", "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin", + "Search Users" : "Kullanıcı Ara", "Add Group" : "Grup Ekle", "Group" : "Grup", "Everyone" : "Herkes", diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json index 255c271496e..b38ac57719b 100644 --- a/settings/l10n/tr.json +++ b/settings/l10n/tr.json @@ -220,6 +220,7 @@ "Create" : "Oluştur", "Admin Recovery Password" : "Yönetici Kurtarma Parolası", "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin", + "Search Users" : "Kullanıcı Ara", "Add Group" : "Grup Ekle", "Group" : "Grup", "Everyone" : "Herkes", diff --git a/settings/l10n/ur.js b/settings/l10n/ur.js deleted file mode 100644 index 78fcf358b75..00000000000 --- a/settings/l10n/ur.js +++ /dev/null @@ -1,6 +0,0 @@ -OC.L10N.register( - "settings", - { - "Error" : "خرابی" -}, -"nplurals=2; plural=(n != 1);"); diff --git a/settings/l10n/ur.json b/settings/l10n/ur.json deleted file mode 100644 index 1c1fc3d16c1..00000000000 --- a/settings/l10n/ur.json +++ /dev/null @@ -1,4 +0,0 @@ -{ "translations": { - "Error" : "خرابی" -},"pluralForm" :"nplurals=2; plural=(n != 1);" -}
\ No newline at end of file diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/lostpassword/controller/lostcontrollertest.php new file mode 100644 index 00000000000..5da9e5ce48d --- /dev/null +++ b/tests/core/lostpassword/controller/lostcontrollertest.php @@ -0,0 +1,195 @@ +<?php +/** + * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Core\LostPassword\Controller; +use OC\Core\Application; +use OCP\AppFramework\Http\TemplateResponse; + +/** + * Class LostControllerTest + * + * @package OC\Core\LostPassword\Controller + */ +class LostControllerTest extends \PHPUnit_Framework_TestCase { + + private $container; + /** @var LostController */ + private $lostController; + + protected function setUp() { + $app = new Application(); + $this->container = $app->getContainer(); + $this->container['AppName'] = 'core'; + $this->container['Config'] = $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor()->getMock(); + $this->container['L10N'] = $this->getMockBuilder('\OCP\IL10N') + ->disableOriginalConstructor()->getMock(); + $this->container['Defaults'] = $this->getMockBuilder('\OC_Defaults') + ->disableOriginalConstructor()->getMock(); + $this->container['UserManager'] = $this->getMockBuilder('\OCP\IUserManager') + ->disableOriginalConstructor()->getMock(); + $this->container['Config'] = $this->getMockBuilder('\OCP\IConfig') + ->disableOriginalConstructor()->getMock(); + $this->container['URLGenerator'] = $this->getMockBuilder('\OCP\IURLGenerator') + ->disableOriginalConstructor()->getMock(); + $this->container['SecureRandom'] = $this->getMockBuilder('\OCP\Security\ISecureRandom') + ->disableOriginalConstructor()->getMock(); + $this->container['IsEncryptionEnabled'] = true; + $this->lostController = $this->container['LostController']; + } + + public function testResetFormUnsuccessful() { + $userId = 'admin'; + $token = 'MySecretToken'; + + $this->container['URLGenerator'] + ->expects($this->once()) + ->method('linkToRouteAbsolute') + ->with('core.lost.setPassword', array('userId' => 'admin', 'token' => 'MySecretToken')) + ->will($this->returnValue('https://ownCloud.com/index.php/lostpassword/')); + + $response = $this->lostController->resetform($token, $userId); + $expectedResponse = new TemplateResponse('core/lostpassword', + 'resetpassword', + array( + 'link' => 'https://ownCloud.com/index.php/lostpassword/', + ), + 'guest'); + $this->assertEquals($expectedResponse, $response); + } + + public function testEmailUnsucessful() { + $existingUser = 'ExistingUser'; + $nonExistingUser = 'NonExistingUser'; + $this->container['UserManager'] + ->expects($this->any()) + ->method('userExists') + ->will($this->returnValueMap(array( + array(true, $existingUser), + array(false, $nonExistingUser) + ))); + $this->container['L10N'] + ->expects($this->any()) + ->method('t') + ->will( + $this->returnValueMap( + array( + array('Couldn\'t send reset email. Please make sure your username is correct.', array(), + 'Couldn\'t send reset email. Please make sure your username is correct.'), + + ) + )); + + // With a non existing user + $response = $this->lostController->email($nonExistingUser); + $expectedResponse = array('status' => 'error', 'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.'); + $this->assertSame($expectedResponse, $response); + + // With no mail address + $this->container['Config'] + ->expects($this->any()) + ->method('getUserValue') + ->with($existingUser, 'settings', 'email') + ->will($this->returnValue(null)); + $response = $this->lostController->email($existingUser); + $expectedResponse = array('status' => 'error', 'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.'); + $this->assertSame($expectedResponse, $response); + } + + public function testEmailSuccessful() { + $randomToken = $this->container['SecureRandom']; + $this->container['SecureRandom'] + ->expects($this->once()) + ->method('generate') + ->with('21') + ->will($this->returnValue('ThisIsMaybeANotSoSecretToken!')); + $this->container['UserManager'] + ->expects($this->once()) + ->method('userExists') + ->with('ExistingUser') + ->will($this->returnValue(true)); + $this->container['Config'] + ->expects($this->once()) + ->method('getUserValue') + ->with('ExistingUser', 'settings', 'email') + ->will($this->returnValue('test@example.com')); + $this->container['SecureRandom'] + ->expects($this->once()) + ->method('getMediumStrengthGenerator') + ->will($this->returnValue($randomToken)); + $this->container['Config'] + ->expects($this->once()) + ->method('setUserValue') + ->with('ExistingUser', 'owncloud', 'lostpassword', 'ThisIsMaybeANotSoSecretToken!'); + $this->container['URLGenerator'] + ->expects($this->once()) + ->method('linkToRouteAbsolute') + ->with('core.lost.resetform', array('userId' => 'ExistingUser', 'token' => 'ThisIsMaybeANotSoSecretToken!')) + ->will($this->returnValue('https://ownCloud.com/index.php/lostpassword/')); + + $response = $this->lostController->email('ExistingUser'); + $expectedResponse = array('status' => 'success'); + $this->assertSame($expectedResponse, $response); + } + + public function testSetPasswordUnsuccessful() { + $this->container['L10N'] + ->expects($this->any()) + ->method('t') + ->will( + $this->returnValueMap( + array( + array('Couldn\'t reset password because the token is invalid', array(), + 'Couldn\'t reset password because the token is invalid'), + ) + )); + $this->container['Config'] + ->expects($this->once()) + ->method('getUserValue') + ->with('InvalidTokenUser', 'owncloud', 'lostpassword') + ->will($this->returnValue('TheOnlyAndOnlyOneTokenToResetThePassword')); + + // With an invalid token + $userName = 'InvalidTokenUser'; + $response = $this->lostController->setPassword('wrongToken', $userName, 'NewPassword', true); + $expectedResponse = array('status' => 'error', 'msg' => 'Couldn\'t reset password because the token is invalid'); + $this->assertSame($expectedResponse, $response); + + // With a valid token and no proceed + $response = $this->lostController->setPassword('TheOnlyAndOnlyOneTokenToResetThePassword!', $userName, 'NewPassword', false); + $expectedResponse = array('status' => 'error', 'msg' => '', 'encryption' => true); + $this->assertSame($expectedResponse, $response); + } + + public function testSetPasswordSuccessful() { + $this->container['Config'] + ->expects($this->once()) + ->method('getUserValue') + ->with('ValidTokenUser', 'owncloud', 'lostpassword') + ->will($this->returnValue('TheOnlyAndOnlyOneTokenToResetThePassword')); + $user = $this->getMockBuilder('\OCP\IUser') + ->disableOriginalConstructor()->getMock(); + $user->expects($this->once()) + ->method('setPassword') + ->with('NewPassword') + ->will($this->returnValue(true)); + $this->container['UserManager'] + ->expects($this->once()) + ->method('get') + ->with('ValidTokenUser') + ->will($this->returnValue($user)); + $this->container['Config'] + ->expects($this->once()) + ->method('deleteUserValue') + ->with('ValidTokenUser', 'owncloud', 'lostpassword'); + + $response = $this->lostController->setPassword('TheOnlyAndOnlyOneTokenToResetThePassword', 'ValidTokenUser', 'NewPassword', true); + $expectedResponse = array('status' => 'success'); + $this->assertSame($expectedResponse, $response); + } +} diff --git a/tests/lib/activitymanager.php b/tests/lib/activitymanager.php index f21b82c52c3..85f8320de09 100644 --- a/tests/lib/activitymanager.php +++ b/tests/lib/activitymanager.php @@ -8,12 +8,14 @@ * */ -class Test_ActivityManager extends PHPUnit_Framework_TestCase { +class Test_ActivityManager extends \Test\TestCase { /** @var \OC\ActivityManager */ private $activityManager; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->activityManager = new \OC\ActivityManager(); $this->activityManager->registerExtension(function() { return new NoOpExtension(); diff --git a/tests/lib/api.php b/tests/lib/api.php index 0f7d08543ea..bf9748a6040 100644 --- a/tests/lib/api.php +++ b/tests/lib/api.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_API extends PHPUnit_Framework_TestCase { +class Test_API extends \Test\TestCase { // Helps build a response variable diff --git a/tests/lib/app.php b/tests/lib/app.php index 6ae548759ed..23c1a340e03 100644 --- a/tests/lib/app.php +++ b/tests/lib/app.php @@ -7,7 +7,7 @@ * See the COPYING-README file. */ -class Test_App extends PHPUnit_Framework_TestCase { +class Test_App extends \Test\TestCase { private $oldAppConfigService; diff --git a/tests/lib/appconfig.php b/tests/lib/appconfig.php index 9257ae45b0e..188721ff92d 100644 --- a/tests/lib/appconfig.php +++ b/tests/lib/appconfig.php @@ -7,8 +7,10 @@ * See the COPYING-README file. */ -class Test_Appconfig extends PHPUnit_Framework_TestCase { +class Test_Appconfig extends \Test\TestCase { public static function setUpBeforeClass() { + parent::setUpBeforeClass(); + $query = \OC_DB::prepare('INSERT INTO `*PREFIX*appconfig` VALUES (?, ?, ?)'); $query->execute(array('testapp', 'enabled', 'true')); @@ -33,6 +35,8 @@ class Test_Appconfig extends PHPUnit_Framework_TestCase { $query->execute(array('someapp')); $query->execute(array('123456')); $query->execute(array('anotherapp')); + + parent::tearDownAfterClass(); } public function testGetApps() { diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php index 92fa4838341..bd565e9765e 100644 --- a/tests/lib/appframework/AppTest.php +++ b/tests/lib/appframework/AppTest.php @@ -25,7 +25,7 @@ namespace OC\AppFramework; -class AppTest extends \PHPUnit_Framework_TestCase { +class AppTest extends \Test\TestCase { private $container; private $api; @@ -38,6 +38,8 @@ class AppTest extends \PHPUnit_Framework_TestCase { private $controllerMethod; protected function setUp() { + parent::setUp(); + $this->container = new \OC\AppFramework\DependencyInjection\DIContainer('test', array()); $this->controller = $this->getMockBuilder( 'OCP\AppFramework\Controller') diff --git a/tests/lib/appframework/controller/ApiControllerTest.php b/tests/lib/appframework/controller/ApiControllerTest.php index b772f540ce8..3055fbe0da8 100644 --- a/tests/lib/appframework/controller/ApiControllerTest.php +++ b/tests/lib/appframework/controller/ApiControllerTest.php @@ -31,7 +31,7 @@ use OCP\AppFramework\Http\TemplateResponse; class ChildApiController extends ApiController {}; -class ApiControllerTest extends \PHPUnit_Framework_TestCase { +class ApiControllerTest extends \Test\TestCase { public function testCors() { diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php index 0de94ff5b70..d186651dc23 100644 --- a/tests/lib/appframework/controller/ControllerTest.php +++ b/tests/lib/appframework/controller/ControllerTest.php @@ -54,7 +54,7 @@ class ChildController extends Controller { } }; -class ControllerTest extends \PHPUnit_Framework_TestCase { +class ControllerTest extends \Test\TestCase { /** * @var Controller @@ -63,6 +63,8 @@ class ControllerTest extends \PHPUnit_Framework_TestCase { private $app; protected function setUp(){ + parent::setUp(); + $request = new Request( array( 'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'), diff --git a/tests/lib/appframework/db/EntityTest.php b/tests/lib/appframework/db/EntityTest.php index d98cb549422..161e11d8030 100644 --- a/tests/lib/appframework/db/EntityTest.php +++ b/tests/lib/appframework/db/EntityTest.php @@ -49,11 +49,12 @@ class TestEntity extends Entity { }; -class EntityTest extends \PHPUnit_Framework_TestCase { +class EntityTest extends \Test\TestCase { private $entity; protected function setUp(){ + parent::setUp(); $this->entity = new TestEntity(); } diff --git a/tests/lib/appframework/db/mappertest.php b/tests/lib/appframework/db/mappertest.php index fd1acd0367e..6ad8cd86bff 100644 --- a/tests/lib/appframework/db/mappertest.php +++ b/tests/lib/appframework/db/mappertest.php @@ -57,7 +57,7 @@ class MapperTest extends MapperTestUtility { */ private $mapper; - public function setUp(){ + protected function setUp(){ parent::setUp(); $this->mapper = new ExampleMapper($this->db); } diff --git a/tests/lib/appframework/db/mappertestutility.php b/tests/lib/appframework/db/mappertestutility.php index 0430eef2c21..ad7a67a96b1 100644 --- a/tests/lib/appframework/db/mappertestutility.php +++ b/tests/lib/appframework/db/mappertestutility.php @@ -28,9 +28,7 @@ namespace Test\AppFramework\Db; /** * Simple utility class for testing mappers */ -abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase { - - +abstract class MapperTestUtility extends \Test\TestCase { protected $db; private $query; private $pdoResult; @@ -45,6 +43,8 @@ abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase { * db. After this the db can be accessed by using $this->db */ protected function setUp(){ + parent::setUp(); + $this->db = $this->getMockBuilder( '\OCP\IDb') ->disableOriginalConstructor() diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php index acc5c2e66d8..08e72aff984 100644 --- a/tests/lib/appframework/dependencyinjection/DIContainerTest.php +++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php @@ -29,12 +29,13 @@ namespace OC\AppFramework\DependencyInjection; use \OC\AppFramework\Http\Request; -class DIContainerTest extends \PHPUnit_Framework_TestCase { +class DIContainerTest extends \Test\TestCase { private $container; private $api; protected function setUp(){ + parent::setUp(); $this->container = new DIContainer('name'); $this->api = $this->getMock('OC\AppFramework\Core\API', array(), array('hi')); } diff --git a/tests/lib/appframework/http/DataResponseTest.php b/tests/lib/appframework/http/DataResponseTest.php index 961327c978c..e91d3cefea9 100644 --- a/tests/lib/appframework/http/DataResponseTest.php +++ b/tests/lib/appframework/http/DataResponseTest.php @@ -29,7 +29,7 @@ use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http; -class DataResponseTest extends \PHPUnit_Framework_TestCase { +class DataResponseTest extends \Test\TestCase { /** * @var DataResponse @@ -37,6 +37,7 @@ class DataResponseTest extends \PHPUnit_Framework_TestCase { private $response; protected function setUp() { + parent::setUp(); $this->response = new DataResponse(); } diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php index f082ddc8b3a..f92e7161e6b 100644 --- a/tests/lib/appframework/http/DispatcherTest.php +++ b/tests/lib/appframework/http/DispatcherTest.php @@ -62,9 +62,7 @@ class TestController extends Controller { } -class DispatcherTest extends \PHPUnit_Framework_TestCase { - - +class DispatcherTest extends \Test\TestCase { private $middlewareDispatcher; private $dispatcher; private $controllerMethod; @@ -75,6 +73,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { private $reflector; protected function setUp() { + parent::setUp(); $this->controllerMethod = 'test'; $app = $this->getMockBuilder( diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php index ab381e5c298..5e5db2c55ec 100644 --- a/tests/lib/appframework/http/DownloadResponseTest.php +++ b/tests/lib/appframework/http/DownloadResponseTest.php @@ -30,7 +30,7 @@ class ChildDownloadResponse extends DownloadResponse { }; -class DownloadResponseTest extends \PHPUnit_Framework_TestCase { +class DownloadResponseTest extends \Test\TestCase { /** * @var ChildDownloadResponse @@ -38,6 +38,7 @@ class DownloadResponseTest extends \PHPUnit_Framework_TestCase { protected $response; protected function setUp(){ + parent::setUp(); $this->response = new ChildDownloadResponse('file', 'content'); } diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php index a7a189c98e5..e9be3e73904 100644 --- a/tests/lib/appframework/http/HttpTest.php +++ b/tests/lib/appframework/http/HttpTest.php @@ -27,7 +27,7 @@ namespace OC\AppFramework\Http; use OC\AppFramework\Http; -class HttpTest extends \PHPUnit_Framework_TestCase { +class HttpTest extends \Test\TestCase { private $server; @@ -37,6 +37,8 @@ class HttpTest extends \PHPUnit_Framework_TestCase { private $http; protected function setUp(){ + parent::setUp(); + $this->server = array(); $this->http = new Http($this->server); } diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php index 06cd3410a69..cdd8d269b41 100644 --- a/tests/lib/appframework/http/JSONResponseTest.php +++ b/tests/lib/appframework/http/JSONResponseTest.php @@ -30,7 +30,7 @@ namespace OC\AppFramework\Http; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http; -class JSONResponseTest extends \PHPUnit_Framework_TestCase { +class JSONResponseTest extends \Test\TestCase { /** * @var JSONResponse @@ -38,6 +38,7 @@ class JSONResponseTest extends \PHPUnit_Framework_TestCase { private $json; protected function setUp() { + parent::setUp(); $this->json = new JSONResponse(); } diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php index e5d452f7f91..17db0c0be6c 100644 --- a/tests/lib/appframework/http/RedirectResponseTest.php +++ b/tests/lib/appframework/http/RedirectResponseTest.php @@ -27,7 +27,7 @@ namespace OCP\AppFramework\Http; use OCP\AppFramework\Http; -class RedirectResponseTest extends \PHPUnit_Framework_TestCase { +class RedirectResponseTest extends \Test\TestCase { /** * @var RedirectResponse @@ -35,6 +35,7 @@ class RedirectResponseTest extends \PHPUnit_Framework_TestCase { protected $response; protected function setUp(){ + parent::setUp(); $this->response = new RedirectResponse('/url'); } diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php index 58828d17bb2..caa22c84415 100644 --- a/tests/lib/appframework/http/RequestTest.php +++ b/tests/lib/appframework/http/RequestTest.php @@ -10,9 +10,11 @@ namespace OC\AppFramework\Http; global $data; -class RequestTest extends \PHPUnit_Framework_TestCase { +class RequestTest extends \Test\TestCase { + + protected function setUp() { + parent::setUp(); - public function setUp() { require_once __DIR__ . '/requeststream.php'; if (in_array('fakeinput', stream_get_wrappers())) { stream_wrapper_unregister('fakeinput'); @@ -21,8 +23,9 @@ class RequestTest extends \PHPUnit_Framework_TestCase { $this->stream = 'fakeinput://data'; } - public function tearDown() { + protected function tearDown() { stream_wrapper_unregister('fakeinput'); + parent::tearDown(); } public function testRequestAccessors() { diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php index b1dddd9ebc7..04e19fdaf71 100644 --- a/tests/lib/appframework/http/ResponseTest.php +++ b/tests/lib/appframework/http/ResponseTest.php @@ -29,7 +29,7 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http; -class ResponseTest extends \PHPUnit_Framework_TestCase { +class ResponseTest extends \Test\TestCase { /** * @var \OCP\AppFramework\Http\Response @@ -37,6 +37,7 @@ class ResponseTest extends \PHPUnit_Framework_TestCase { private $childResponse; protected function setUp(){ + parent::setUp(); $this->childResponse = new Response(); } diff --git a/tests/lib/appframework/http/TemplateResponseTest.php b/tests/lib/appframework/http/TemplateResponseTest.php index afdcf322b85..2ec57f8979a 100644 --- a/tests/lib/appframework/http/TemplateResponseTest.php +++ b/tests/lib/appframework/http/TemplateResponseTest.php @@ -28,7 +28,7 @@ use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http; -class TemplateResponseTest extends \PHPUnit_Framework_TestCase { +class TemplateResponseTest extends \Test\TestCase { /** * @var \OCP\AppFramework\Http\TemplateResponse @@ -41,6 +41,8 @@ class TemplateResponseTest extends \PHPUnit_Framework_TestCase { private $api; protected function setUp() { + parent::setUp(); + $this->api = $this->getMock('OC\AppFramework\Core\API', array('getAppName'), array('test')); $this->api->expects($this->any()) diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php index b1e221aab99..be8765afd39 100644 --- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php +++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php @@ -100,7 +100,7 @@ class TestMiddleware extends Middleware { } -class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase { +class MiddlewareDispatcherTest extends \Test\TestCase { public $exception; public $response; @@ -113,8 +113,9 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase { */ private $dispatcher; + protected function setUp() { + parent::setUp(); - public function setUp() { $this->dispatcher = new MiddlewareDispatcher(); $this->controller = $this->getControllerMock(); $this->method = 'method'; diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php index 9d952f61573..b41ec33eb15 100644 --- a/tests/lib/appframework/middleware/MiddlewareTest.php +++ b/tests/lib/appframework/middleware/MiddlewareTest.php @@ -31,7 +31,7 @@ use OCP\AppFramework\Middleware; class ChildMiddleware extends Middleware {}; -class MiddlewareTest extends \PHPUnit_Framework_TestCase { +class MiddlewareTest extends \Test\TestCase { /** * @var Middleware @@ -42,6 +42,8 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase { private $api; protected function setUp(){ + parent::setUp(); + $this->middleware = new ChildMiddleware(); $this->api = $this->getMockBuilder( diff --git a/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php index 79cd3b278af..b4bbcce5ad7 100644 --- a/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php +++ b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php @@ -18,11 +18,12 @@ use OC\AppFramework\Utility\ControllerMethodReflector; use OCP\AppFramework\Http\Response; -class CORSMiddlewareTest extends \PHPUnit_Framework_TestCase { +class CORSMiddlewareTest extends \Test\TestCase { private $reflector; protected function setUp() { + parent::setUp(); $this->reflector = new ControllerMethodReflector(); } diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php index cc7704f4d1a..a8925403a95 100644 --- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php +++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php @@ -31,7 +31,7 @@ use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\JSONResponse; -class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { +class SecurityMiddlewareTest extends \Test\TestCase { private $middleware; private $controller; @@ -43,7 +43,9 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { private $navigationManager; private $urlGenerator; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->controller = $this->getMockBuilder('OCP\AppFramework\Controller') ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/appframework/middleware/sessionmiddlewaretest.php b/tests/lib/appframework/middleware/sessionmiddlewaretest.php index 13e558bf21a..344b555ec3c 100644 --- a/tests/lib/appframework/middleware/sessionmiddlewaretest.php +++ b/tests/lib/appframework/middleware/sessionmiddlewaretest.php @@ -18,7 +18,7 @@ use OC\AppFramework\Utility\ControllerMethodReflector; use OCP\AppFramework\Http\Response; -class SessionMiddlewareTest extends \PHPUnit_Framework_TestCase { +class SessionMiddlewareTest extends \Test\TestCase { /** * @var ControllerMethodReflector @@ -31,6 +31,8 @@ class SessionMiddlewareTest extends \PHPUnit_Framework_TestCase { private $request; protected function setUp() { + parent::setUp(); + $this->request = new Request(); $this->reflector = new ControllerMethodReflector(); } diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php index a1d9a51a3c8..276307680af 100644 --- a/tests/lib/appframework/routing/RoutingTest.php +++ b/tests/lib/appframework/routing/RoutingTest.php @@ -6,7 +6,7 @@ use OC\AppFramework\DependencyInjection\DIContainer; use OC\AppFramework\routing\RouteConfig; -class RoutingTest extends \PHPUnit_Framework_TestCase +class RoutingTest extends \Test\TestCase { public function testSimpleRoute() diff --git a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php index 8939a203edb..cd6bd57da4c 100644 --- a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php +++ b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php @@ -25,7 +25,7 @@ namespace OC\AppFramework\Utility; -class ControllerMethodReflectorTest extends \PHPUnit_Framework_TestCase { +class ControllerMethodReflectorTest extends \Test\TestCase { /** diff --git a/tests/lib/archive.php b/tests/lib/archive.php index be5cc897a67..690b4378b88 100644 --- a/tests/lib/archive.php +++ b/tests/lib/archive.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -abstract class Test_Archive extends PHPUnit_Framework_TestCase { +abstract class Test_Archive extends \Test\TestCase { /** * @var OC_Archive */ diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php index 99f7fb30e2b..43157e2054d 100644 --- a/tests/lib/archive/tar.php +++ b/tests/lib/archive/tar.php @@ -7,11 +7,12 @@ */ class Test_Archive_TAR extends Test_Archive { - public function setUp() { + protected function setUp() { + parent::setUp(); + if (OC_Util::runningOnWindows()) { $this->markTestSkipped('[Windows] tar archives are not supported on Windows'); } - parent::setUp(); } protected function getExisting() { diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php index 90958baf380..09ea5d7d27c 100644 --- a/tests/lib/archive/zip.php +++ b/tests/lib/archive/zip.php @@ -6,8 +6,15 @@ * See the COPYING-README file. */ -if (!OC_Util::runningOnWindows()) { class Test_Archive_ZIP extends Test_Archive { + protected function setUp() { + parent::setUp(); + + if (OC_Util::runningOnWindows()) { + $this->markTestSkipped('[Windows] '); + } + } + protected function getExisting() { $dir = OC::$SERVERROOT . '/tests/data'; return new OC_Archive_ZIP($dir . '/data.zip'); @@ -17,4 +24,3 @@ class Test_Archive_ZIP extends Test_Archive { return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip')); } } -} diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php index 46172647249..bf63094a9ef 100644 --- a/tests/lib/autoloader.php +++ b/tests/lib/autoloader.php @@ -8,13 +8,14 @@ namespace Test; -class AutoLoader extends \PHPUnit_Framework_TestCase { +class AutoLoader extends TestCase { /** * @var \OC\Autoloader $loader */ private $loader; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->loader = new \OC\AutoLoader(); } diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php index 0334639afa8..421be155d17 100644 --- a/tests/lib/avatar.php +++ b/tests/lib/avatar.php @@ -6,12 +6,14 @@ * later. * See the COPYING-README file. */ -class Test_Avatar extends PHPUnit_Framework_TestCase { +class Test_Avatar extends \Test\TestCase { private $user; - public function setUp() { - $this->user = uniqid(); + protected function setUp() { + parent::setUp(); + + $this->user = $this->getUniqueID(); $storage = new \OC\Files\Storage\Temporary(array()); \OC\Files\Filesystem::mount($storage, array(), '/' . $this->user . '/'); } diff --git a/tests/lib/backgroundjob/job.php b/tests/lib/backgroundjob/job.php index 10a8f46462e..fec9b0a792d 100644 --- a/tests/lib/backgroundjob/job.php +++ b/tests/lib/backgroundjob/job.php @@ -8,10 +8,11 @@ namespace Test\BackgroundJob; -class Job extends \PHPUnit_Framework_TestCase { +class Job extends \Test\TestCase { private $run = false; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->run = false; } diff --git a/tests/lib/backgroundjob/joblist.php b/tests/lib/backgroundjob/joblist.php index c3318f80cb2..13bee12479e 100644 --- a/tests/lib/backgroundjob/joblist.php +++ b/tests/lib/backgroundjob/joblist.php @@ -8,7 +8,7 @@ namespace Test\BackgroundJob; -class JobList extends \PHPUnit_Framework_TestCase { +class JobList extends \Test\TestCase { /** * @var \OC\BackgroundJob\JobList */ @@ -19,7 +19,9 @@ class JobList extends \PHPUnit_Framework_TestCase { */ protected $config; - public function setUp() { + protected function setUp() { + parent::setUp(); + $conn = \OC::$server->getDatabaseConnection(); $this->config = $this->getMock('\OCP\IConfig'); $this->instance = new \OC\BackgroundJob\JobList($conn, $this->config); diff --git a/tests/lib/backgroundjob/queuedjob.php b/tests/lib/backgroundjob/queuedjob.php index 19c1b28a507..8d3cd6f907b 100644 --- a/tests/lib/backgroundjob/queuedjob.php +++ b/tests/lib/backgroundjob/queuedjob.php @@ -23,7 +23,7 @@ class TestQueuedJob extends \OC\BackgroundJob\QueuedJob { } } -class QueuedJob extends \PHPUnit_Framework_TestCase { +class QueuedJob extends \Test\TestCase { /** * @var DummyJobList $jobList */ @@ -39,7 +39,9 @@ class QueuedJob extends \PHPUnit_Framework_TestCase { $this->jobRun = true; } - public function setup() { + protected function setup() { + parent::setUp(); + $this->jobList = new DummyJobList(); $this->job = new TestQueuedJob($this); $this->jobList->add($this->job); diff --git a/tests/lib/backgroundjob/timedjob.php b/tests/lib/backgroundjob/timedjob.php index 646a2607ef3..7d9bfe979af 100644 --- a/tests/lib/backgroundjob/timedjob.php +++ b/tests/lib/backgroundjob/timedjob.php @@ -24,7 +24,7 @@ class TestTimedJob extends \OC\BackgroundJob\TimedJob { } } -class TimedJob extends \PHPUnit_Framework_TestCase { +class TimedJob extends \Test\TestCase { /** * @var DummyJobList $jobList */ @@ -40,7 +40,9 @@ class TimedJob extends \PHPUnit_Framework_TestCase { $this->jobRun = true; } - public function setup() { + protected function setup() { + parent::setUp(); + $this->jobList = new DummyJobList(); $this->job = new TestTimedJob($this); $this->jobList->add($this->job); diff --git a/tests/lib/cache.php b/tests/lib/cache.php index 8fefa25f65d..894d8c57662 100644 --- a/tests/lib/cache.php +++ b/tests/lib/cache.php @@ -6,16 +6,18 @@ * See the COPYING-README file. */ -abstract class Test_Cache extends PHPUnit_Framework_TestCase { +abstract class Test_Cache extends \Test\TestCase { /** * @var \OC\Cache cache; */ protected $instance; - public function tearDown() { + protected function tearDown() { if($this->instance) { $this->instance->clear(); } + + parent::tearDown(); } function testSimple() { diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index 8cc45c85405..d51322036c8 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -33,8 +33,10 @@ class FileCache extends \Test_Cache { function skip() { //$this->skipUnless(OC_User::isLoggedIn()); } - - public function setUp() { + + protected function setUp() { + parent::setUp(); + //clear all proxies and hooks so we can do clean testing \OC_FileProxy::clearProxies(); \OC_Hook::clear('OC_Filesystem'); @@ -70,7 +72,7 @@ class FileCache extends \Test_Cache { $this->instance=new \OC\Cache\File(); } - public function tearDown() { + protected function tearDown() { \OC_User::setUserId($this->user); \OC_Config::setValue('cachedirectory', $this->datadir); diff --git a/tests/lib/cache/usercache.php b/tests/lib/cache/usercache.php index 8a23a805ebe..3822a714d5a 100644 --- a/tests/lib/cache/usercache.php +++ b/tests/lib/cache/usercache.php @@ -30,7 +30,9 @@ class UserCache extends \Test_Cache { /** @var \OC\Files\Storage\Storage */ private $storage; - public function setUp() { + protected function setUp() { + parent::setUp(); + //clear all proxies and hooks so we can do clean testing \OC_FileProxy::clearProxies(); \OC_Hook::clear('OC_Filesystem'); @@ -66,7 +68,7 @@ class UserCache extends \Test_Cache { $this->instance=new \OC\Cache\UserCache(); } - public function tearDown() { + protected function tearDown() { \OC_User::setUserId($this->user); \OC_Config::setValue('cachedirectory', $this->datadir); diff --git a/tests/lib/config.php b/tests/lib/config.php index 180f6b1649b..9dff3aab84f 100644 --- a/tests/lib/config.php +++ b/tests/lib/config.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_Config extends PHPUnit_Framework_TestCase { +class Test_Config extends \Test\TestCase { const TESTCONTENT = '<?php $CONFIG=array("foo"=>"bar", "beers" => array("Appenzeller", "Guinness", "Kölsch"), "alcohol_free" => false);'; /** @var array */ @@ -18,15 +18,18 @@ class Test_Config extends PHPUnit_Framework_TestCase { /** @var string */ private $randomTmpDir; - function setUp() { + protected function setUp() { + parent::setUp(); + $this->randomTmpDir = \OC_Helper::tmpFolder(); $this->configFile = $this->randomTmpDir.'testconfig.php'; file_put_contents($this->configFile, self::TESTCONTENT); $this->config = new OC\Config($this->randomTmpDir, 'testconfig.php'); } - public function tearDown() { + protected function tearDown() { unlink($this->configFile); + parent::tearDown(); } public function testGetKeys() { diff --git a/tests/lib/connector/sabre/directory.php b/tests/lib/connector/sabre/directory.php index 453d8e8d42a..d8dca35cd71 100644 --- a/tests/lib/connector/sabre/directory.php +++ b/tests/lib/connector/sabre/directory.php @@ -6,12 +6,14 @@ * later. * See the COPYING-README file. */ -class Test_OC_Connector_Sabre_Directory extends PHPUnit_Framework_TestCase { +class Test_OC_Connector_Sabre_Directory extends \Test\TestCase { private $view; private $info; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->view = $this->getMock('OC\Files\View', array(), array(), '', false); $this->info = $this->getMock('OC\Files\FileInfo', array(), array(), '', false); } diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php index 0993a27f372..cfc6e29ae74 100644 --- a/tests/lib/connector/sabre/file.php +++ b/tests/lib/connector/sabre/file.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { +class Test_OC_Connector_Sabre_File extends \Test\TestCase { /** * @expectedException \Sabre\DAV\Exception diff --git a/tests/lib/connector/sabre/node.php b/tests/lib/connector/sabre/node.php index 0f303457248..9a2bf41bd19 100644 --- a/tests/lib/connector/sabre/node.php +++ b/tests/lib/connector/sabre/node.php @@ -12,7 +12,7 @@ namespace Test\Connector\Sabre; use OC\Files\FileInfo; use OC\Files\View; -class Node extends \PHPUnit_Framework_TestCase { +class Node extends \Test\TestCase { public function davPermissionsProvider() { return array( array(\OCP\PERMISSION_ALL, 'file', false, false, 'RDNVW'), diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php index fc9f802066f..d1de46d2ee7 100644 --- a/tests/lib/connector/sabre/objecttree.php +++ b/tests/lib/connector/sabre/objecttree.php @@ -13,7 +13,7 @@ use OC\Files\FileInfo; use OC_Connector_Sabre_Directory; use PHPUnit_Framework_TestCase; -class TestDoubleFileView extends \OC\Files\View{ +class TestDoubleFileView extends \OC\Files\View { public function __construct($updatables, $deletables, $canRename = true) { $this->updatables = $updatables; @@ -42,7 +42,7 @@ class TestDoubleFileView extends \OC\Files\View{ } } -class ObjectTree extends PHPUnit_Framework_TestCase { +class ObjectTree extends \Test\TestCase { /** * @dataProvider moveFailedProvider diff --git a/tests/lib/connector/sabre/quotaplugin.php b/tests/lib/connector/sabre/quotaplugin.php index 3b144cf56b5..f08637854ce 100644 --- a/tests/lib/connector/sabre/quotaplugin.php +++ b/tests/lib/connector/sabre/quotaplugin.php @@ -6,7 +6,7 @@ * later. * See the COPYING-README file. */ -class Test_OC_Connector_Sabre_QuotaPlugin extends PHPUnit_Framework_TestCase { +class Test_OC_Connector_Sabre_QuotaPlugin extends \Test\TestCase { /** * @var \Sabre\DAV\Server diff --git a/tests/lib/contacts/localadressbook.php b/tests/lib/contacts/localadressbook.php index bb69910820f..5fa260ffc3b 100644 --- a/tests/lib/contacts/localadressbook.php +++ b/tests/lib/contacts/localadressbook.php @@ -11,7 +11,7 @@ use OC\Contacts\LocalAddressBook; * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -class Test_LocalAddressBook extends PHPUnit_Framework_TestCase +class Test_LocalAddressBook extends \Test\TestCase { public function testSearchFN() { diff --git a/tests/lib/db.php b/tests/lib/db.php index fb673b8092b..a401aded62a 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_DB extends PHPUnit_Framework_TestCase { +class Test_DB extends \Test\TestCase { protected $backupGlobals = FALSE; protected static $schema_file = 'static://test_db_scheme'; @@ -32,7 +32,9 @@ class Test_DB extends PHPUnit_Framework_TestCase { */ private $table4; - public function setUp() { + protected function setUp() { + parent::setUp(); + $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; $r = '_'.OC_Util::generateRandomBytes(4).'_'; @@ -48,9 +50,11 @@ class Test_DB extends PHPUnit_Framework_TestCase { $this->table4 = $this->test_prefix.'decimal'; } - public function tearDown() { + protected function tearDown() { OC_DB::removeDBStructure(self::$schema_file); unlink(self::$schema_file); + + parent::tearDown(); } public function testQuotes() { diff --git a/tests/lib/db/mdb2schemamanager.php b/tests/lib/db/mdb2schemamanager.php index 527b2cba648..3e6abab70b4 100644 --- a/tests/lib/db/mdb2schemamanager.php +++ b/tests/lib/db/mdb2schemamanager.php @@ -12,15 +12,17 @@ namespace Test\DB; use Doctrine\DBAL\Platforms\OraclePlatform; use Doctrine\DBAL\Platforms\SQLServerPlatform; -class MDB2SchemaManager extends \PHPUnit_Framework_TestCase { +class MDB2SchemaManager extends \Test\TestCase { - public function tearDown() { + protected function tearDown() { // do not drop the table for Oracle as it will create a bogus transaction // that will break the following test suites requiring transactions if (\OC::$server->getConfig()->getSystemValue('dbtype', 'sqlite') === 'oci') { return; } \OC_DB::dropTable('table'); + + parent::tearDown(); } public function testAutoIncrement() { diff --git a/tests/lib/db/mdb2schemareader.php b/tests/lib/db/mdb2schemareader.php index f08996cbeaf..b2ff55e1632 100644 --- a/tests/lib/db/mdb2schemareader.php +++ b/tests/lib/db/mdb2schemareader.php @@ -11,7 +11,7 @@ namespace Test\DB; use Doctrine\DBAL\Platforms\MySqlPlatform; -class MDB2SchemaReader extends \PHPUnit_Framework_TestCase { +class MDB2SchemaReader extends \Test\TestCase { /** * @var \OC\DB\MDB2SchemaReader $reader */ diff --git a/tests/lib/db/migrator.php b/tests/lib/db/migrator.php index 09742a53eb4..7acd3382fe2 100644 --- a/tests/lib/db/migrator.php +++ b/tests/lib/db/migrator.php @@ -15,7 +15,7 @@ use Doctrine\DBAL\Platforms\SQLServerPlatform; use \Doctrine\DBAL\Schema\Schema; use \Doctrine\DBAL\Schema\SchemaConfig; -class Migrator extends \PHPUnit_Framework_TestCase { +class Migrator extends \Test\TestCase { /** * @var \Doctrine\DBAL\Connection $connection */ @@ -28,7 +28,9 @@ class Migrator extends \PHPUnit_Framework_TestCase { private $tableName; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->connection = \OC_DB::getConnection(); if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) { $this->markTestSkipped('DB migration tests are not supported on OCI'); @@ -40,8 +42,9 @@ class Migrator extends \PHPUnit_Framework_TestCase { $this->tableName = 'test_' . uniqid(); } - public function tearDown() { + protected function tearDown() { $this->connection->exec('DROP TABLE ' . $this->tableName); + parent::tearDown(); } /** diff --git a/tests/lib/db/mysqlmigration.php b/tests/lib/db/mysqlmigration.php index 584df1d4465..70199147760 100644 --- a/tests/lib/db/mysqlmigration.php +++ b/tests/lib/db/mysqlmigration.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class TestMySqlMigration extends \PHPUnit_Framework_TestCase { +class TestMySqlMigration extends \Test\TestCase { /** @var \Doctrine\DBAL\Connection */ private $connection; @@ -14,7 +14,9 @@ class TestMySqlMigration extends \PHPUnit_Framework_TestCase { /** @var string */ private $tableName; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->connection = \OC_DB::getConnection(); if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) { $this->markTestSkipped("Test only relevant on MySql"); @@ -25,8 +27,9 @@ class TestMySqlMigration extends \PHPUnit_Framework_TestCase { $this->connection->exec("CREATE TABLE $this->tableName(b BIT, e ENUM('1','2','3','4'))"); } - public function tearDown() { + protected function tearDown() { $this->connection->getSchemaManager()->dropTable($this->tableName); + parent::tearDown(); } public function testNonOCTables() { diff --git a/tests/lib/db/sqlitemigration.php b/tests/lib/db/sqlitemigration.php index adfc03a2ca7..e3d0e386ab5 100644 --- a/tests/lib/db/sqlitemigration.php +++ b/tests/lib/db/sqlitemigration.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class TestSqliteMigration extends \PHPUnit_Framework_TestCase { +class TestSqliteMigration extends \Test\TestCase { /** @var \Doctrine\DBAL\Connection */ private $connection; @@ -14,7 +14,9 @@ class TestSqliteMigration extends \PHPUnit_Framework_TestCase { /** @var string */ private $tableName; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->connection = \OC_DB::getConnection(); if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) { $this->markTestSkipped("Test only relevant on Sqlite"); @@ -25,8 +27,9 @@ class TestSqliteMigration extends \PHPUnit_Framework_TestCase { $this->connection->exec("CREATE TABLE $this->tableName(t0 tinyint unsigned, t1 tinyint)"); } - public function tearDown() { + protected function tearDown() { $this->connection->getSchemaManager()->dropTable($this->tableName); + parent::tearDown(); } public function testNonOCTables() { diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php index d31bd34124e..cfaebec079e 100644 --- a/tests/lib/dbschema.php +++ b/tests/lib/dbschema.php @@ -9,13 +9,15 @@ use OCP\Security\ISecureRandom; -class Test_DBSchema extends PHPUnit_Framework_TestCase { +class Test_DBSchema extends \Test\TestCase { protected $schema_file = 'static://test_db_scheme'; protected $schema_file2 = 'static://test_db_scheme2'; protected $table1; protected $table2; - public function setUp() { + protected function setUp() { + parent::setUp(); + $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; $dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml'; @@ -32,9 +34,11 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase { $this->table2 = $r.'cntcts_cards'; } - public function tearDown() { + protected function tearDown() { unlink($this->schema_file); unlink($this->schema_file2); + + parent::tearDown(); } // everything in one test, they depend on each other diff --git a/tests/lib/errorHandler.php b/tests/lib/errorHandler.php index 58db80b3c6e..726529e83f4 100644 --- a/tests/lib/errorHandler.php +++ b/tests/lib/errorHandler.php @@ -20,7 +20,7 @@ * */ -class Test_ErrorHandler extends \PHPUnit_Framework_TestCase { +class Test_ErrorHandler extends \Test\TestCase { /** * provide username, password combinations for testRemovePassword diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php index 969740419c6..02c45a16571 100644 --- a/tests/lib/files/cache/cache.php +++ b/tests/lib/files/cache/cache.php @@ -16,7 +16,7 @@ class LongId extends \OC\Files\Storage\Temporary { } } -class Cache extends \PHPUnit_Framework_TestCase { +class Cache extends \Test\TestCase { /** * @var \OC\Files\Storage\Temporary $storage ; */ @@ -452,13 +452,17 @@ class Cache extends \PHPUnit_Framework_TestCase { $this->assertEquals(1, count($this->cache->getFolderContents('folder'))); } - public function tearDown() { + protected function tearDown() { if ($this->cache) { $this->cache->clear(); } + + parent::tearDown(); } - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->storage = new \OC\Files\Storage\Temporary(array()); $this->storage2 = new \OC\Files\Storage\Temporary(array()); $this->cache = new \OC\Files\Cache\Cache($this->storage); diff --git a/tests/lib/files/cache/changepropagator.php b/tests/lib/files/cache/changepropagator.php index a52682cd086..89bd9dfe80a 100644 --- a/tests/lib/files/cache/changepropagator.php +++ b/tests/lib/files/cache/changepropagator.php @@ -12,7 +12,7 @@ use OC\Files\Filesystem; use OC\Files\Storage\Temporary; use OC\Files\View; -class ChangePropagator extends \PHPUnit_Framework_TestCase { +class ChangePropagator extends \Test\TestCase { /** * @var \OC\Files\Cache\ChangePropagator */ @@ -23,9 +23,11 @@ class ChangePropagator extends \PHPUnit_Framework_TestCase { */ private $view; - public function setUp() { + protected function setUp() { + parent::setUp(); + $storage = new Temporary(array()); - $root = '/' . uniqid(); + $root = $this->getUniqueID('/'); Filesystem::mount($storage, array(), $root); $this->view = new View($root); $this->propagator = new \OC\Files\Cache\ChangePropagator($this->view); diff --git a/tests/lib/files/cache/homecache.php b/tests/lib/files/cache/homecache.php index 80dc54c9d19..7ebb053bcfa 100644 --- a/tests/lib/files/cache/homecache.php +++ b/tests/lib/files/cache/homecache.php @@ -43,7 +43,7 @@ class DummyUser extends \OC\User\User { } } -class HomeCache extends \PHPUnit_Framework_TestCase { +class HomeCache extends \Test\TestCase { /** * @var \OC\Files\Storage\Home $storage */ @@ -59,7 +59,9 @@ class HomeCache extends \PHPUnit_Framework_TestCase { */ private $user; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->user = new DummyUser('foo', \OC_Helper::tmpFolder()); $this->storage = new \OC\Files\Storage\Home(array('user' => $this->user)); $this->cache = $this->storage->getCache(); diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php index 0a274631d1c..b44cf0a49df 100644 --- a/tests/lib/files/cache/scanner.php +++ b/tests/lib/files/cache/scanner.php @@ -8,7 +8,7 @@ namespace Test\Files\Cache; -class Scanner extends \PHPUnit_Framework_TestCase { +class Scanner extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage $storage */ @@ -24,16 +24,20 @@ class Scanner extends \PHPUnit_Framework_TestCase { */ private $cache; - function setUp() { + protected function setUp() { + parent::setUp(); + $this->storage = new \OC\Files\Storage\Temporary(array()); $this->scanner = new \OC\Files\Cache\Scanner($this->storage); $this->cache = new \OC\Files\Cache\Cache($this->storage); } - function tearDown() { + protected function tearDown() { if ($this->cache) { $this->cache->clear(); } + + parent::tearDown(); } function testFile() { diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php index 9e7330db20c..01b036de5d8 100644 --- a/tests/lib/files/cache/updater.php +++ b/tests/lib/files/cache/updater.php @@ -12,7 +12,7 @@ use OC\Files\Filesystem; use OC\Files\Storage\Temporary; use OC\Files\View; -class Updater extends \PHPUnit_Framework_TestCase { +class Updater extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage */ @@ -40,6 +40,7 @@ class Updater extends \PHPUnit_Framework_TestCase { parent::setUp(); $this->originalStorage = Filesystem::getStorage('/'); + $this->storage = new Temporary(array()); Filesystem::clearMounts(); Filesystem::mount($this->storage, array(), '/'); diff --git a/tests/lib/files/cache/updaterlegacy.php b/tests/lib/files/cache/updaterlegacy.php index d16a062fcca..7c05800cd6b 100644 --- a/tests/lib/files/cache/updaterlegacy.php +++ b/tests/lib/files/cache/updaterlegacy.php @@ -11,7 +11,7 @@ namespace Test\Files\Cache; use \OC\Files\Filesystem as Filesystem; use OC\Files\Storage\Temporary; -class UpdaterLegacy extends \PHPUnit_Framework_TestCase { +class UpdaterLegacy extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage $storage */ @@ -34,7 +34,8 @@ class UpdaterLegacy extends \PHPUnit_Framework_TestCase { private static $user; - public function setUp() { + protected function setUp() { + parent::setUp(); // remember files_encryption state $this->stateFilesEncryption = \OC_App::isEnabled('files_encryption'); @@ -71,7 +72,7 @@ class UpdaterLegacy extends \PHPUnit_Framework_TestCase { \OC_Hook::clear('OC_Filesystem'); } - public function tearDown() { + protected function tearDown() { if ($this->cache) { $this->cache->clear(); } @@ -83,6 +84,8 @@ class UpdaterLegacy extends \PHPUnit_Framework_TestCase { if ($this->stateFilesEncryption) { \OC_App::enable('files_encryption'); } + + parent::tearDown(); } public function testWrite() { diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php index 0b04b9e7058..ee605c64e01 100644 --- a/tests/lib/files/cache/watcher.php +++ b/tests/lib/files/cache/watcher.php @@ -8,7 +8,7 @@ namespace Test\Files\Cache; -class Watcher extends \PHPUnit_Framework_TestCase { +class Watcher extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage[] $storages diff --git a/tests/lib/files/etagtest.php b/tests/lib/files/etagtest.php index 8f29ed0bc63..eec24d9f4c6 100644 --- a/tests/lib/files/etagtest.php +++ b/tests/lib/files/etagtest.php @@ -56,7 +56,7 @@ class EtagTest extends \Test\TestCase { } public function testNewUser() { - $user1 = uniqid('user_'); + $user1 = $this->getUniqueID('user_'); $this->userBackend->createUser($user1, ''); \OC_Util::tearDownFS(); diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php index f24d86b212d..746600c7d15 100644 --- a/tests/lib/files/filesystem.php +++ b/tests/lib/files/filesystem.php @@ -55,6 +55,8 @@ class Filesystem extends \Test\TestCase { \OC\Files\Filesystem::clearMounts(); \OC\Files\Filesystem::mount($this->originalStorage, array(), '/'); \OC_User::setUserId(''); + + parent::tearDown(); } public function testMount() { diff --git a/tests/lib/files/mapper.php b/tests/lib/files/mapper.php index d513f3ce4b3..18161734b60 100644 --- a/tests/lib/files/mapper.php +++ b/tests/lib/files/mapper.php @@ -22,14 +22,15 @@ namespace Test\Files; -class Mapper extends \PHPUnit_Framework_TestCase { +class Mapper extends \Test\TestCase { /** * @var \OC\Files\Mapper */ private $mapper = null; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->mapper = new \OC\Files\Mapper('D:/'); } diff --git a/tests/lib/files/mount/manager.php b/tests/lib/files/mount/manager.php index 154c35ccead..051b76ccf2e 100644 --- a/tests/lib/files/mount/manager.php +++ b/tests/lib/files/mount/manager.php @@ -16,13 +16,14 @@ class LongId extends Temporary { } } -class Manager extends \PHPUnit_Framework_TestCase { +class Manager extends \Test\TestCase { /** * @var \OC\Files\Mount\Manager */ private $manager; - public function setup() { + protected function setup() { + parent::setUp(); $this->manager = new \OC\Files\Mount\Manager(); } diff --git a/tests/lib/files/mount/mount.php b/tests/lib/files/mount/mount.php index c3d33e0870b..5ee3d934e97 100644 --- a/tests/lib/files/mount/mount.php +++ b/tests/lib/files/mount/mount.php @@ -12,7 +12,7 @@ namespace Test\Files\Mount; use OC\Files\Storage\Loader; use OC\Files\Storage\Wrapper\Wrapper; -class Mount extends \PHPUnit_Framework_TestCase { +class Mount extends \Test\TestCase { public function testFromStorageObject() { $storage = $this->getMockBuilder('\OC\Files\Storage\Temporary') ->disableOriginalConstructor() diff --git a/tests/lib/files/node/file.php b/tests/lib/files/node/file.php index 76938a0dcc8..34ec7dee213 100644 --- a/tests/lib/files/node/file.php +++ b/tests/lib/files/node/file.php @@ -12,10 +12,11 @@ use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; use OC\Files\View; -class File extends \PHPUnit_Framework_TestCase { +class File extends \Test\TestCase { private $user; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->user = new \OC\User\User('', new \OC_User_Dummy); } diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php index 436161aba72..e348e452f6f 100644 --- a/tests/lib/files/node/folder.php +++ b/tests/lib/files/node/folder.php @@ -15,10 +15,11 @@ use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; use OC\Files\View; -class Folder extends \PHPUnit_Framework_TestCase { +class Folder extends \Test\TestCase { private $user; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->user = new \OC\User\User('', new \OC_User_Dummy); } diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php index cde2eb22b7b..fd777460ec6 100644 --- a/tests/lib/files/node/integration.php +++ b/tests/lib/files/node/integration.php @@ -14,7 +14,7 @@ use OC\Files\Storage\Temporary; use OC\Files\View; use OC\User\User; -class IntegrationTests extends \PHPUnit_Framework_TestCase { +class IntegrationTests extends \Test\TestCase { /** * @var \OC\Files\Node\Root $root */ @@ -65,7 +65,6 @@ class IntegrationTests extends \PHPUnit_Framework_TestCase { $storage->getCache()->clear(); } \OC\Files\Filesystem::clearMounts(); - \OC\Files\Filesystem::mount($this->originalStorage, array(), '/'); parent::tearDown(); diff --git a/tests/lib/files/node/node.php b/tests/lib/files/node/node.php index cf5fec30522..80e3ac6f80a 100644 --- a/tests/lib/files/node/node.php +++ b/tests/lib/files/node/node.php @@ -8,10 +8,11 @@ namespace Test\Files\Node; -class Node extends \PHPUnit_Framework_TestCase { +class Node extends \Test\TestCase { private $user; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->user = new \OC\User\User('', new \OC_User_Dummy); } diff --git a/tests/lib/files/node/root.php b/tests/lib/files/node/root.php index 27f1a937826..fcce7070f5d 100644 --- a/tests/lib/files/node/root.php +++ b/tests/lib/files/node/root.php @@ -11,10 +11,11 @@ namespace Test\Files\Node; use OCP\Files\NotPermittedException; use OC\Files\Mount\Manager; -class Root extends \PHPUnit_Framework_TestCase { +class Root extends \Test\TestCase { private $user; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->user = new \OC\User\User('', new \OC_User_Dummy); } diff --git a/tests/lib/files/objectstore/swift.php b/tests/lib/files/objectstore/swift.php index 37d6cc74de6..f2c4a983cf2 100644 --- a/tests/lib/files/objectstore/swift.php +++ b/tests/lib/files/objectstore/swift.php @@ -30,7 +30,9 @@ class Swift extends \Test\Files\Storage\Storage { private $objectStorage; - public function setUp() { + protected function setUp() { + parent::setUp(); + if (!getenv('RUN_OBJECTSTORE_TESTS')) { $this->markTestSkipped('objectstore tests are unreliable on travis'); } @@ -74,12 +76,14 @@ class Swift extends \Test\Files\Storage\Storage { $this->instance = new ObjectStoreStorage($params); } - public function tearDown() { + protected function tearDown() { if (is_null($this->instance)) { return; } $this->objectStorage->deleteContainer(true); $this->instance->getCache()->clear(); + + parent::tearDown(); } public function testStat() { diff --git a/tests/lib/files/storage/commontest.php b/tests/lib/files/storage/commontest.php index ce53c884f32..2b70dc8713e 100644 --- a/tests/lib/files/storage/commontest.php +++ b/tests/lib/files/storage/commontest.php @@ -27,12 +27,15 @@ class CommonTest extends Storage { * @var string tmpDir */ private $tmpDir; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->tmpDir=\OC_Helper::tmpFolder(); $this->instance=new \OC\Files\Storage\CommonTest(array('datadir'=>$this->tmpDir)); } - public function tearDown() { + protected function tearDown() { \OC_Helper::rmdirr($this->tmpDir); + parent::tearDown(); } } diff --git a/tests/lib/files/storage/home.php b/tests/lib/files/storage/home.php index d085efe9c1c..b0670a22892 100644 --- a/tests/lib/files/storage/home.php +++ b/tests/lib/files/storage/home.php @@ -60,15 +60,18 @@ class Home extends Storage { */ private $user; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->tmpDir = \OC_Helper::tmpFolder(); - $this->userId = uniqid('user_'); + $this->userId = $this->getUniqueID('user_'); $this->user = new DummyUser($this->userId, $this->tmpDir); $this->instance = new \OC\Files\Storage\Home(array('user' => $this->user)); } - public function tearDown() { + protected function tearDown() { \OC_Helper::rmdirr($this->tmpDir); + parent::tearDown(); } /** diff --git a/tests/lib/files/storage/local.php b/tests/lib/files/storage/local.php index 490086c62f2..d2b27117c3b 100644 --- a/tests/lib/files/storage/local.php +++ b/tests/lib/files/storage/local.php @@ -28,13 +28,16 @@ class Local extends Storage { */ private $tmpDir; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->tmpDir = \OC_Helper::tmpFolder(); $this->instance = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir)); } - public function tearDown() { + protected function tearDown() { \OC_Helper::rmdirr($this->tmpDir); + parent::tearDown(); } public function testStableEtag() { diff --git a/tests/lib/files/storage/mappedlocal.php b/tests/lib/files/storage/mappedlocal.php index b483f3a1954..1e87b53d00a 100644 --- a/tests/lib/files/storage/mappedlocal.php +++ b/tests/lib/files/storage/mappedlocal.php @@ -27,14 +27,17 @@ class MappedLocal extends Storage { * @var string tmpDir */ private $tmpDir; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->tmpDir=\OC_Helper::tmpFolder(); $this->instance=new \OC\Files\Storage\MappedLocal(array('datadir'=>$this->tmpDir)); } - public function tearDown() { + protected function tearDown() { \OC_Helper::rmdirr($this->tmpDir); unset($this->instance); + parent::tearDown(); } } diff --git a/tests/lib/files/storage/mappedlocalwithdotteddatadir.php b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php index d2e5e2e97af..3a733b7b469 100644 --- a/tests/lib/files/storage/mappedlocalwithdotteddatadir.php +++ b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php @@ -28,15 +28,18 @@ class MappedLocalWithDottedDataDir extends Storage { */ private $tmpDir; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->tmpDir = \OC_Helper::tmpFolder().'dir.123'.DIRECTORY_SEPARATOR; mkdir($this->tmpDir); $this->instance=new \OC\Files\Storage\MappedLocal(array('datadir'=>$this->tmpDir)); } - public function tearDown() { + protected function tearDown() { \OC_Helper::rmdirr($this->tmpDir); unset($this->instance); + parent::tearDown(); } } diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php index 960eb137ea0..30f403d60df 100644 --- a/tests/lib/files/storage/storage.php +++ b/tests/lib/files/storage/storage.php @@ -22,7 +22,7 @@ namespace Test\Files\Storage; -abstract class Storage extends \PHPUnit_Framework_TestCase { +abstract class Storage extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage instance */ diff --git a/tests/lib/files/storage/wrapper/quota.php b/tests/lib/files/storage/wrapper/quota.php index 954fe199cc8..9e6b1c85a95 100644 --- a/tests/lib/files/storage/wrapper/quota.php +++ b/tests/lib/files/storage/wrapper/quota.php @@ -17,14 +17,17 @@ class Quota extends \Test\Files\Storage\Storage { */ private $tmpDir; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->tmpDir = \OC_Helper::tmpFolder(); $storage = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir)); $this->instance = new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => 10000000)); } - public function tearDown() { + protected function tearDown() { \OC_Helper::rmdirr($this->tmpDir); + parent::tearDown(); } /** diff --git a/tests/lib/files/storage/wrapper/wrapper.php b/tests/lib/files/storage/wrapper/wrapper.php index 8bcf42035d4..486cd0495c1 100644 --- a/tests/lib/files/storage/wrapper/wrapper.php +++ b/tests/lib/files/storage/wrapper/wrapper.php @@ -14,14 +14,17 @@ class Wrapper extends \Test\Files\Storage\Storage { */ private $tmpDir; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->tmpDir = \OC_Helper::tmpFolder(); $storage = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir)); $this->instance = new \OC\Files\Storage\Wrapper\Wrapper(array('storage' => $storage)); } - public function tearDown() { + protected function tearDown() { \OC_Helper::rmdirr($this->tmpDir); + parent::tearDown(); } public function testInstanceOfStorageWrapper() { diff --git a/tests/lib/files/stream/quota.php b/tests/lib/files/stream/quota.php index d5edace544d..28584cf82db 100644 --- a/tests/lib/files/stream/quota.php +++ b/tests/lib/files/stream/quota.php @@ -8,9 +8,10 @@ namespace Test\Files\Stream; -class Quota extends \PHPUnit_Framework_TestCase { - public function tearDown() { +class Quota extends \Test\TestCase { + protected function tearDown() { \OC\Files\Stream\Quota::clear(); + parent::tearDown(); } /** diff --git a/tests/lib/files/stream/staticstream.php b/tests/lib/files/stream/staticstream.php index d55086196a0..416a4670efd 100644 --- a/tests/lib/files/stream/staticstream.php +++ b/tests/lib/files/stream/staticstream.php @@ -8,18 +8,20 @@ namespace Test\Files\Stream; -class StaticStream extends \PHPUnit_Framework_TestCase { +class StaticStream extends \Test\TestCase { private $sourceFile; private $sourceText; - public function __construct() { + protected function setUp() { + parent::setUp(); $this->sourceFile = \OC::$SERVERROOT . '/tests/data/lorem.txt'; $this->sourceText = file_get_contents($this->sourceFile); } - public function tearDown() { + protected function tearDown() { \OC\Files\Stream\StaticStream::clear(); + parent::tearDown(); } public function testContent() { diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php index db6a3fa7842..f729be81bd7 100644 --- a/tests/lib/files/utils/scanner.php +++ b/tests/lib/files/utils/scanner.php @@ -38,7 +38,6 @@ class TestScanner extends \OC\Files\Utils\Scanner { } } - class Scanner extends \Test\TestCase { /** @var \OC\Files\Storage\Storage */ private $originalStorage; diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index 44fea65e64e..d6dd176bba9 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -16,7 +16,7 @@ class TemporaryNoTouch extends \OC\Files\Storage\Temporary { } } -class View extends \PHPUnit_Framework_TestCase { +class View extends \Test\TestCase { /** * @var \OC\Files\Storage\Storage[] $storages */ diff --git a/tests/lib/geo.php b/tests/lib/geo.php index 1c56a976129..0678297b55a 100644 --- a/tests/lib/geo.php +++ b/tests/lib/geo.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_Geo extends PHPUnit_Framework_TestCase { +class Test_Geo extends \Test\TestCase { /** * @medium diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php index 4d15999a826..d758e5959d0 100644 --- a/tests/lib/group/group.php +++ b/tests/lib/group/group.php @@ -11,7 +11,7 @@ namespace Test\Group; use OC\User\User; -class Group extends \PHPUnit_Framework_TestCase { +class Group extends \Test\TestCase { /** * @return \OC\User\Manager | \OC\User\Manager */ diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php index 8fd19513c0a..f72ea8e912f 100644 --- a/tests/lib/group/manager.php +++ b/tests/lib/group/manager.php @@ -11,7 +11,7 @@ namespace Test\Group; use OC\User\User; -class Manager extends \PHPUnit_Framework_TestCase { +class Manager extends \Test\TestCase { public function testGet() { /** * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend diff --git a/tests/lib/group/metadata.php b/tests/lib/group/metadata.php index 7ef2d6b35ff..94944189cad 100644 --- a/tests/lib/group/metadata.php +++ b/tests/lib/group/metadata.php @@ -9,7 +9,7 @@ namespace Test\Group; -class Test_MetaData extends \PHPUnit_Framework_TestCase { +class Test_MetaData extends \Test\TestCase { private function getGroupManagerMock() { return $this->getMockBuilder('\OC\Group\Manager') ->disableOriginalConstructor() diff --git a/tests/lib/helper.php b/tests/lib/helper.php index 57c72c11987..53a3e1a0ec8 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_Helper extends PHPUnit_Framework_TestCase { +class Test_Helper extends \Test\TestCase { /** * @dataProvider humanFileSizeProvider diff --git a/tests/lib/hooks/basicemitter.php b/tests/lib/hooks/basicemitter.php index 0eae730d030..899d3ecd3b3 100644 --- a/tests/lib/hooks/basicemitter.php +++ b/tests/lib/hooks/basicemitter.php @@ -31,13 +31,14 @@ class DummyEmitter extends \OC\Hooks\BasicEmitter { class EmittedException extends \Exception { } -class BasicEmitter extends \PHPUnit_Framework_TestCase { +class BasicEmitter extends \Test\TestCase { /** * @var \OC\Hooks\Emitter $emitter */ protected $emitter; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->emitter = new DummyEmitter(); } diff --git a/tests/lib/hooks/legacyemitter.php b/tests/lib/hooks/legacyemitter.php index a7bed879a72..f030afbc090 100644 --- a/tests/lib/hooks/legacyemitter.php +++ b/tests/lib/hooks/legacyemitter.php @@ -26,7 +26,9 @@ class LegacyEmitter extends BasicEmitter { //we can't use exceptions here since OC_Hooks catches all exceptions private static $emitted = false; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->emitter = new DummyLegacyEmitter(); self::$emitted = false; \OC_Hook::clear('Test','test'); diff --git a/tests/lib/httphelper.php b/tests/lib/httphelper.php index 191200aee3d..34dee35fe02 100644 --- a/tests/lib/httphelper.php +++ b/tests/lib/httphelper.php @@ -6,14 +6,16 @@ * See the COPYING-README file. */ -class TestHTTPHelper extends \PHPUnit_Framework_TestCase { +class TestHTTPHelper extends \Test\TestCase { /** @var \OC\AllConfig*/ private $config; /** @var \OC\HTTPHelper */ private $httpHelperMock; - function setUp() { + protected function setUp() { + parent::setUp(); + $this->config = $this->getMockBuilder('\OC\AllConfig') ->disableOriginalConstructor()->getMock(); $this->httpHelperMock = $this->getMockBuilder('\OC\HTTPHelper') diff --git a/tests/lib/image.php b/tests/lib/image.php index a683c3d2c8b..e0009b9710e 100644 --- a/tests/lib/image.php +++ b/tests/lib/image.php @@ -6,10 +6,12 @@ * See the COPYING-README file. */ -class Test_Image extends PHPUnit_Framework_TestCase { +class Test_Image extends \Test\TestCase { public static function tearDownAfterClass() { @unlink(OC::$SERVERROOT.'/tests/data/testimage2.png'); @unlink(OC::$SERVERROOT.'/tests/data/testimage2.jpg'); + + parent::tearDownAfterClass(); } public function testGetMimeTypeForFile() { diff --git a/tests/lib/installer.php b/tests/lib/installer.php index 5e267245200..b58a71b5a08 100644 --- a/tests/lib/installer.php +++ b/tests/lib/installer.php @@ -6,20 +6,24 @@ * See the COPYING-README file. */ -class Test_Installer extends PHPUnit_Framework_TestCase { +class Test_Installer extends \Test\TestCase { private static $appid = 'testapp'; private $appstore; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->appstore = OC_Config::getValue('appstoreenabled', true); OC_Config::setValue('appstoreenabled', true); OC_Installer::removeApp(self::$appid); } - public function tearDown() { + protected function tearDown() { OC_Installer::removeApp(self::$appid); OC_Config::setValue('appstoreenabled', $this->appstore); + + parent::tearDown(); } public function testInstallApp() { diff --git a/tests/lib/l10n.php b/tests/lib/l10n.php index df86fcfda81..68f43b76f51 100644 --- a/tests/lib/l10n.php +++ b/tests/lib/l10n.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_L10n extends PHPUnit_Framework_TestCase { +class Test_L10n extends \Test\TestCase { public function testGermanPluralTranslations() { $l = new OC_L10N('test'); diff --git a/tests/lib/largefilehelper.php b/tests/lib/largefilehelper.php index 5db1f9c5a74..1267a8c5833 100644 --- a/tests/lib/largefilehelper.php +++ b/tests/lib/largefilehelper.php @@ -8,10 +8,10 @@ namespace Test; -class LargeFileHelper extends \PHPUnit_Framework_TestCase { +class LargeFileHelper extends TestCase { protected $helper; - public function setUp() { + protected function setUp() { parent::setUp(); $this->helper = new \OC\LargeFileHelper; } diff --git a/tests/lib/largefilehelpergetfilesize.php b/tests/lib/largefilehelpergetfilesize.php index 90ecc3dde70..c97b7b32b0f 100644 --- a/tests/lib/largefilehelpergetfilesize.php +++ b/tests/lib/largefilehelpergetfilesize.php @@ -12,11 +12,11 @@ namespace Test; * Tests whether LargeFileHelper is able to determine file size at all. * Large files are not considered yet. */ -class LargeFileHelperGetFileSize extends \PHPUnit_Framework_TestCase { +class LargeFileHelperGetFileSize extends TestCase { /** @var \OC\LargeFileHelper */ protected $helper; - public function setUp() { + protected function setUp() { parent::setUp(); $this->helper = new \OC\LargeFileHelper(); } diff --git a/tests/lib/logger.php b/tests/lib/logger.php index fcdf5b58670..700a847917b 100644 --- a/tests/lib/logger.php +++ b/tests/lib/logger.php @@ -10,14 +10,16 @@ namespace Test; use OC\Log; -class Logger extends \PHPUnit_Framework_TestCase { +class Logger extends TestCase { /** * @var \OCP\ILogger */ private $logger; static private $logs = array(); - public function setUp() { + protected function setUp() { + parent::setUp(); + self::$logs = array(); $this->logger = new Log('Test\Logger'); } diff --git a/tests/lib/mail.php b/tests/lib/mail.php index 3cc9868e25e..568ecff52b0 100644 --- a/tests/lib/mail.php +++ b/tests/lib/mail.php @@ -6,10 +6,12 @@ * See the COPYING-README file. */ -class Test_Mail extends PHPUnit_Framework_TestCase { +class Test_Mail extends \Test\TestCase { protected function setUp() { + parent::setUp(); + if (!function_exists('idn_to_ascii')) { $this->markTestSkipped( 'The intl extension is not available.' diff --git a/tests/lib/memcache/apc.php b/tests/lib/memcache/apc.php index e5d753a4fa5..550d5068dc1 100644 --- a/tests/lib/memcache/apc.php +++ b/tests/lib/memcache/apc.php @@ -10,7 +10,9 @@ namespace Test\Memcache; class APC extends Cache { - public function setUp() { + protected function setUp() { + parent::setUp(); + if(!\OC\Memcache\APC::isAvailable()) { $this->markTestSkipped('The apc extension is not available.'); return; diff --git a/tests/lib/memcache/apcu.php b/tests/lib/memcache/apcu.php index 7b99e7cd5e0..1b849e1c54d 100644 --- a/tests/lib/memcache/apcu.php +++ b/tests/lib/memcache/apcu.php @@ -10,7 +10,9 @@ namespace Test\Memcache; class APCu extends Cache { - public function setUp() { + protected function setUp() { + parent::setUp(); + if(!\OC\Memcache\APCu::isAvailable()) { $this->markTestSkipped('The APCu extension is not available.'); return; diff --git a/tests/lib/memcache/cache.php b/tests/lib/memcache/cache.php index d07c492cef0..8a4a708e4b7 100644 --- a/tests/lib/memcache/cache.php +++ b/tests/lib/memcache/cache.php @@ -50,9 +50,11 @@ abstract class Cache extends \Test_Cache { $this->assertFalse($this->instance->hasKey('foo')); } - public function tearDown() { + protected function tearDown() { if ($this->instance) { $this->instance->clear(); } + + parent::tearDown(); } } diff --git a/tests/lib/memcache/memcached.php b/tests/lib/memcache/memcached.php index fdab32693ff..a94b809a7b5 100644 --- a/tests/lib/memcache/memcached.php +++ b/tests/lib/memcache/memcached.php @@ -11,6 +11,8 @@ namespace Test\Memcache; class Memcached extends Cache { static public function setUpBeforeClass() { + parent::setUpBeforeClass(); + if (!\OC\Memcache\Memcached::isAvailable()) { self::markTestSkipped('The memcached extension is not available.'); } @@ -20,7 +22,8 @@ class Memcached extends Cache { } } - public function setUp() { + protected function setUp() { + parent::setUp(); $this->instance = new \OC\Memcache\Memcached(uniqid()); } } diff --git a/tests/lib/memcache/xcache.php b/tests/lib/memcache/xcache.php index f59afda3966..b97d5545c6e 100644 --- a/tests/lib/memcache/xcache.php +++ b/tests/lib/memcache/xcache.php @@ -10,7 +10,9 @@ namespace Test\Memcache; class XCache extends Cache { - public function setUp() { + protected function setUp() { + parent::setUp(); + if (!\OC\Memcache\XCache::isAvailable()) { $this->markTestSkipped('The xcache extension is not available.'); return; diff --git a/tests/lib/migrate.php b/tests/lib/migrate.php index 3f87bbc1ac8..9c1e980c445 100644 --- a/tests/lib/migrate.php +++ b/tests/lib/migrate.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_Migrate extends PHPUnit_Framework_TestCase { +class Test_Migrate extends \Test\TestCase { public $users; public $tmpfiles = array(); @@ -38,7 +38,7 @@ class Test_Migrate extends PHPUnit_Framework_TestCase { * @return string the test users id */ public function generateUser() { - $username = uniqid(); + $username = $this->getUniqueID(); \OC_User::createUser($username, 'password'); \OC_Util::tearDownFS(); \OC_User::setUserId(''); diff --git a/tests/lib/naturalsort.php b/tests/lib/naturalsort.php index 09a0e6a5f9d..e022a855309 100644 --- a/tests/lib/naturalsort.php +++ b/tests/lib/naturalsort.php @@ -6,9 +6,11 @@ * See the COPYING-README file. */ -class Test_NaturalSort extends PHPUnit_Framework_TestCase { +class Test_NaturalSort extends \Test\TestCase { public function setUp() { + parent::setUp(); + if(!class_exists('Collator')) { $this->markTestSkipped('The intl module is not available, natural sorting will not work as expected.'); return; diff --git a/tests/lib/ocs/privatedata.php b/tests/lib/ocs/privatedata.php index 534fc21b07a..20f1dd38362 100644 --- a/tests/lib/ocs/privatedata.php +++ b/tests/lib/ocs/privatedata.php @@ -20,19 +20,15 @@ * */ -class Test_OC_OCS_Privatedata extends PHPUnit_Framework_TestCase -{ - +class Test_OC_OCS_Privatedata extends \Test\TestCase { private $appKey; - public function setUp() { + protected function setUp() { + parent::setUp(); \OC::$server->getSession()->set('user_id', 'user1'); $this->appKey = uniqid('app'); } - public function tearDown() { - } - public function testGetEmptyOne() { $params = array('app' => $this->appKey, 'key' => '123'); $result = OC_OCS_Privatedata::get($params); diff --git a/tests/lib/preferences-singleton.php b/tests/lib/preferences-singleton.php index 7abf5a6be36..01e15acdfe1 100644 --- a/tests/lib/preferences-singleton.php +++ b/tests/lib/preferences-singleton.php @@ -7,8 +7,10 @@ * See the COPYING-README file. */ -class Test_Preferences extends PHPUnit_Framework_TestCase { +class Test_Preferences extends \Test\TestCase { public static function setUpBeforeClass() { + parent::setUpBeforeClass(); + $query = \OC_DB::prepare('INSERT INTO `*PREFIX*preferences` VALUES(?, ?, ?, ?)'); $query->execute(array("Someuser", "someapp", "somekey", "somevalue")); @@ -34,6 +36,8 @@ class Test_Preferences extends PHPUnit_Framework_TestCase { $query->execute(array('Someuser')); $query->execute(array('Anotheruser')); $query->execute(array('Anuser')); + + parent::tearDownAfterClass(); } public function testGetUsers() { diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php index fe8e3e8b48c..193b1f80280 100644 --- a/tests/lib/preferences.php +++ b/tests/lib/preferences.php @@ -7,7 +7,7 @@ * See the COPYING-README file. */ -class Test_Preferences_Object extends PHPUnit_Framework_TestCase { +class Test_Preferences_Object extends \Test\TestCase { public function testGetUsers() { $statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false); diff --git a/tests/lib/preview.php b/tests/lib/preview.php index 288dd2aa417..2a6761403f4 100644 --- a/tests/lib/preview.php +++ b/tests/lib/preview.php @@ -8,7 +8,7 @@ namespace Test; -class Preview extends \Test\TestCase { +class Preview extends TestCase { /** * @var string diff --git a/tests/lib/public/contacts.php b/tests/lib/public/contacts.php index d6008876a00..151e98d3905 100644 --- a/tests/lib/public/contacts.php +++ b/tests/lib/public/contacts.php @@ -19,17 +19,12 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -class Test_Contacts extends PHPUnit_Framework_TestCase -{ - - public function setUp() { - +class Test_Contacts extends \Test\TestCase { + protected function setUp() { + parent::setUp(); OCP\Contacts::clear(); } - public function tearDown() { - } - public function testDisabledIfEmpty() { // pretty simple $this->assertFalse(OCP\Contacts::isEnabled()); diff --git a/tests/lib/public/ocpconfig.php b/tests/lib/public/ocpconfig.php index 43a9ca625ee..947d2b3c9ef 100644 --- a/tests/lib/public/ocpconfig.php +++ b/tests/lib/public/ocpconfig.php @@ -19,12 +19,11 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -class Test_OCPConfig extends PHPUnit_Framework_TestCase -{ +class Test_OCPConfig extends \Test\TestCase { public function testSetAppValueIfSetToNull() { - $key = uniqid("key-"); + $key = $this->getUniqueID('key-'); $result = \OCP\Config::setAppValue('unit-test', $key, null); $this->assertTrue($result); diff --git a/tests/lib/repair.php b/tests/lib/repair.php index 121f41dedd9..248db382140 100644 --- a/tests/lib/repair.php +++ b/tests/lib/repair.php @@ -29,7 +29,7 @@ class TestRepairStep extends BasicEmitter implements \OC\RepairStep{ } } -class Test_Repair extends PHPUnit_Framework_TestCase { +class Test_Repair extends \Test\TestCase { public function testRunRepairStep() { $output = array(); diff --git a/tests/lib/repair/repaircollation.php b/tests/lib/repair/repaircollation.php index 362feb8463f..e711fcd9d83 100644 --- a/tests/lib/repair/repaircollation.php +++ b/tests/lib/repair/repaircollation.php @@ -21,7 +21,7 @@ class TestCollationRepair extends \OC\Repair\Collation { * * @see \OC\Repair\RepairMimeTypes */ -class TestRepairCollation extends PHPUnit_Framework_TestCase { +class TestRepairCollation extends \Test\TestCase { /** * @var TestCollationRepair @@ -43,7 +43,9 @@ class TestRepairCollation extends PHPUnit_Framework_TestCase { */ private $config; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->connection = \OC_DB::getConnection(); $this->config = \OC::$server->getConfig(); if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) { @@ -57,8 +59,9 @@ class TestRepairCollation extends PHPUnit_Framework_TestCase { $this->repair = new TestCollationRepair($this->config, $this->connection); } - public function tearDown() { + protected function tearDown() { $this->connection->getSchemaManager()->dropTable($this->tableName); + parent::tearDown(); } public function testCollationConvert() { diff --git a/tests/lib/repair/repairinnodb.php b/tests/lib/repair/repairinnodb.php index e7d2442f127..21d7d978821 100644 --- a/tests/lib/repair/repairinnodb.php +++ b/tests/lib/repair/repairinnodb.php @@ -11,7 +11,7 @@ * * @see \OC\Repair\RepairMimeTypes */ -class TestRepairInnoDB extends PHPUnit_Framework_TestCase { +class TestRepairInnoDB extends \Test\TestCase { /** @var \OC\RepairStep */ private $repair; @@ -22,7 +22,9 @@ class TestRepairInnoDB extends PHPUnit_Framework_TestCase { /** @var string */ private $tableName; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->connection = \OC_DB::getConnection(); if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) { $this->markTestSkipped("Test only relevant on MySql"); @@ -35,8 +37,9 @@ class TestRepairInnoDB extends PHPUnit_Framework_TestCase { $this->repair = new \OC\Repair\InnoDB(); } - public function tearDown() { + protected function tearDown() { $this->connection->getSchemaManager()->dropTable($this->tableName); + parent::tearDown(); } public function testInnoDBConvert() { diff --git a/tests/lib/repair/repairlegacystorage.php b/tests/lib/repair/repairlegacystorage.php index 4528c5288df..ac845657cd9 100644 --- a/tests/lib/repair/repairlegacystorage.php +++ b/tests/lib/repair/repairlegacystorage.php @@ -11,7 +11,7 @@ * * @see \OC\Repair\RepairLegacyStorages */ -class TestRepairLegacyStorages extends PHPUnit_Framework_TestCase { +class TestRepairLegacyStorages extends \Test\TestCase { private $user; private $repair; @@ -22,7 +22,9 @@ class TestRepairLegacyStorages extends PHPUnit_Framework_TestCase { private $legacyStorageId; private $newStorageId; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->config = \OC::$server->getConfig(); $this->connection = \OC_DB::getConnection(); $this->oldDataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/'); @@ -30,7 +32,7 @@ class TestRepairLegacyStorages extends PHPUnit_Framework_TestCase { $this->repair = new \OC\Repair\RepairLegacyStorages($this->config, $this->connection); } - public function tearDown() { + protected function tearDown() { \OC_User::deleteUser($this->user); $sql = 'DELETE FROM `*PREFIX*storages`'; @@ -39,6 +41,8 @@ class TestRepairLegacyStorages extends PHPUnit_Framework_TestCase { $this->connection->executeQuery($sql); \OCP\Config::setSystemValue('datadirectory', $this->oldDataDir); $this->config->setAppValue('core', 'repairlegacystoragesdone', 'no'); + + parent::tearDown(); } function prepareSettings($dataDir, $userId) { diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php index 7754864a69e..6eaf68d8a44 100644 --- a/tests/lib/repair/repairmimetypes.php +++ b/tests/lib/repair/repairmimetypes.php @@ -11,26 +11,29 @@ * * @see \OC\Repair\RepairMimeTypes */ -class TestRepairMimeTypes extends PHPUnit_Framework_TestCase { +class TestRepairMimeTypes extends \Test\TestCase { /** @var \OC\RepairStep */ private $repair; private $storage; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->storage = new \OC\Files\Storage\Temporary(array()); $this->repair = new \OC\Repair\RepairMimeTypes(); } - public function tearDown() { + protected function tearDown() { $this->storage->getCache()->clear(); $sql = 'DELETE FROM `*PREFIX*storages` WHERE `id` = ?'; \OC_DB::executeAudited($sql, array($this->storage->getId())); $this->clearMimeTypes(); DummyFileCache::clearCachedMimeTypes(); + + parent::tearDown(); } private function clearMimeTypes() { diff --git a/tests/lib/request.php b/tests/lib/request.php index b89bf92ece7..254048723e7 100644 --- a/tests/lib/request.php +++ b/tests/lib/request.php @@ -6,19 +6,23 @@ * See the COPYING-README file. */ -class Test_Request extends PHPUnit_Framework_TestCase { +class Test_Request extends \Test\TestCase { + + protected function setUp() { + parent::setUp(); - public function setUp() { OC::$server->getConfig()->setSystemValue('overwritewebroot', '/domain.tld/ownCloud'); OC::$server->getConfig()->setSystemValue('trusted_proxies', array()); OC::$server->getConfig()->setSystemValue('forwarded_for_headers', array()); } - public function tearDown() { + protected function tearDown() { OC::$server->getConfig()->setSystemValue('overwritewebroot', ''); OC::$server->getConfig()->setSystemValue('trusted_proxies', array()); OC::$server->getConfig()->setSystemValue('forwarded_for_headers', array()); + + parent::tearDown(); } public function testScriptNameOverWrite() { @@ -240,7 +244,7 @@ class Test_Request extends PHPUnit_Framework_TestCase { } public function trustedDomainDataProvider() { - $trustedHostTestList = array('host.one.test:8080', 'host.two.test:8080'); + $trustedHostTestList = array('host.one.test', 'host.two.test', '[1fff:0:a88:85a3::ac1f]'); return array( // empty defaults to true array(null, 'host.one.test:8080', true), @@ -249,8 +253,12 @@ class Test_Request extends PHPUnit_Framework_TestCase { // trust list when defined array($trustedHostTestList, 'host.two.test:8080', true), - array($trustedHostTestList, 'host.two.test:9999', false), + array($trustedHostTestList, 'host.two.test:9999', true), array($trustedHostTestList, 'host.three.test:8080', false), + array($trustedHostTestList, 'host.two.test:8080:aa:222', false), + array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]', true), + array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801', true), + array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801:34', false), // trust localhost regardless of trust list array($trustedHostTestList, 'localhost', true), diff --git a/tests/lib/security/certificate.php b/tests/lib/security/certificate.php index 898f583a43c..361f2f8c38d 100644 --- a/tests/lib/security/certificate.php +++ b/tests/lib/security/certificate.php @@ -8,7 +8,7 @@ use \OC\Security\Certificate; -class CertificateTest extends \PHPUnit_Framework_TestCase { +class CertificateTest extends \Test\TestCase { /** @var Certificate That contains a valid certificate */ protected $goodCertificate; @@ -17,7 +17,9 @@ class CertificateTest extends \PHPUnit_Framework_TestCase { /** @var Certificate That contains an expired certificate */ protected $expiredCertificate; - function setUp() { + protected function setUp() { + parent::setUp(); + $goodCertificate = file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt'); $this->goodCertificate = new Certificate($goodCertificate, 'GoodCertificate'); $badCertificate = file_get_contents(__DIR__ . '/../../data/certificates/badCertificate.crt'); diff --git a/tests/lib/security/certificatemanager.php b/tests/lib/security/certificatemanager.php index 01b3afb03ee..cff6932b670 100644 --- a/tests/lib/security/certificatemanager.php +++ b/tests/lib/security/certificatemanager.php @@ -17,7 +17,9 @@ class CertificateManagerTest extends \Test\TestCase { /** @var \OC\User\User */ private $user; - function setUp() { + protected function setUp() { + parent::setUp(); + $this->username = $this->getUniqueID('', 20); OC_User::createUser($this->username, $this->getUniqueID('', 20)); @@ -31,8 +33,9 @@ class CertificateManagerTest extends \Test\TestCase { $this->certificateManager = new CertificateManager($this->user); } - function tearDown() { + protected function tearDown() { \OC_User::deleteUser($this->username); + parent::tearDown(); } protected function assertEqualsArrays($expected, $actual) { diff --git a/tests/lib/security/crypto.php b/tests/lib/security/crypto.php index 0f89253839e..1571cf89248 100644 --- a/tests/lib/security/crypto.php +++ b/tests/lib/security/crypto.php @@ -8,7 +8,7 @@ use \OC\Security\Crypto; -class CryptoTest extends \PHPUnit_Framework_TestCase { +class CryptoTest extends \Test\TestCase { public function defaultEncryptionProvider() { @@ -23,6 +23,7 @@ class CryptoTest extends \PHPUnit_Framework_TestCase { protected $crypto; protected function setUp() { + parent::setUp(); $this->crypto = new Crypto(\OC::$server->getConfig(), \OC::$server->getSecureRandom()); } diff --git a/tests/lib/security/securerandom.php b/tests/lib/security/securerandom.php index 2920077fa1d..d9bbd0e71e5 100644 --- a/tests/lib/security/securerandom.php +++ b/tests/lib/security/securerandom.php @@ -8,7 +8,7 @@ use \OC\Security\SecureRandom; -class SecureRandomTest extends \PHPUnit_Framework_TestCase { +class SecureRandomTest extends \Test\TestCase { public function stringGenerationProvider() { return array( @@ -34,6 +34,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase { protected $rng; protected function setUp() { + parent::setUp(); $this->rng = new \OC\Security\SecureRandom(); } diff --git a/tests/lib/security/stringutils.php b/tests/lib/security/stringutils.php index 039f3d3756a..060315debb4 100644 --- a/tests/lib/security/stringutils.php +++ b/tests/lib/security/stringutils.php @@ -8,7 +8,7 @@ use \OC\Security\StringUtils; -class StringUtilsTest extends \PHPUnit_Framework_TestCase { +class StringUtilsTest extends \Test\TestCase { public function dataProvider() { diff --git a/tests/lib/session/memory.php b/tests/lib/session/memory.php index 2dc236b73bf..84dee548a1e 100644 --- a/tests/lib/session/memory.php +++ b/tests/lib/session/memory.php @@ -10,7 +10,8 @@ namespace Test\Session; class Memory extends Session { - public function setUp() { + protected function setUp() { + parent::setUp(); $this->instance = new \OC\Session\Memory(uniqid()); } } diff --git a/tests/lib/session/session.php b/tests/lib/session/session.php index 9ce11274c84..a1ed01b2ec8 100644 --- a/tests/lib/session/session.php +++ b/tests/lib/session/session.php @@ -9,14 +9,15 @@ namespace Test\Session; -abstract class Session extends \PHPUnit_Framework_TestCase { +abstract class Session extends \Test\TestCase { /** * @var \OC\Session\Session */ protected $instance; - public function tearDown() { + protected function tearDown() { $this->instance->clear(); + parent::tearDown(); } public function testNotExistsEmpty() { diff --git a/tests/lib/setup.php b/tests/lib/setup.php index 2c1569dd800..8373ba316d6 100644 --- a/tests/lib/setup.php +++ b/tests/lib/setup.php @@ -8,14 +8,16 @@ use OCP\IConfig; -class Test_OC_Setup extends PHPUnit_Framework_TestCase { +class Test_OC_Setup extends \Test\TestCase { /** @var IConfig */ protected $config; /** @var \OC_Setup */ protected $setupClass; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->config = $this->getMock('\OCP\IConfig'); $this->setupClass = $this->getMock('\OC_Setup', array('class_exists', 'is_callable'), array($this->config)); } diff --git a/tests/lib/share/helper.php b/tests/lib/share/helper.php index 367507417a0..76046d360bc 100644 --- a/tests/lib/share/helper.php +++ b/tests/lib/share/helper.php @@ -19,7 +19,7 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -class Test_Share_Helper extends PHPUnit_Framework_TestCase { +class Test_Share_Helper extends \Test\TestCase { public function expireDateProvider() { return array( diff --git a/tests/lib/share/searchresultsorter.php b/tests/lib/share/searchresultsorter.php index eaf93400a7d..97ef0f9478a 100644 --- a/tests/lib/share/searchresultsorter.php +++ b/tests/lib/share/searchresultsorter.php @@ -19,7 +19,7 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -class Test_Share_Search extends \PHPUnit_Framework_TestCase { +class Test_Share_Search extends \Test\TestCase { public function testSort() { $search = 'lin'; $sorter = new \OC\Share\SearchResultSorter($search, 'foobar'); diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php index 7644dadadc7..7ae458a797d 100644 --- a/tests/lib/share/share.php +++ b/tests/lib/share/share.php @@ -19,7 +19,7 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -class Test_Share extends Test\TestCase { +class Test_Share extends \Test\TestCase { protected $itemType; protected $userBackend; @@ -37,6 +37,7 @@ class Test_Share extends Test\TestCase { protected function setUp() { parent::setUp(); + OC_User::clearBackends(); OC_User::useBackend('dummy'); $this->user1 = $this->getUniqueID('user1_'); @@ -81,6 +82,7 @@ class Test_Share extends Test\TestCase { $query = OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `item_type` = ?'); $query->execute(array('test')); OC_Appconfig::setValue('core', 'shareapi_allow_resharing', $this->resharing); + parent::tearDown(); } diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php index 6f92f487037..9a3b6bc9266 100644 --- a/tests/lib/streamwrappers.php +++ b/tests/lib/streamwrappers.php @@ -20,7 +20,7 @@ * */ -class Test_StreamWrappers extends PHPUnit_Framework_TestCase { +class Test_StreamWrappers extends \Test\TestCase { public function testFakeDir() { $items = array('foo', 'bar'); \OC\Files\Stream\Dir::register('test', $items); diff --git a/tests/lib/tags.php b/tests/lib/tags.php index 57b64f1cd36..ab714bde3df 100644 --- a/tests/lib/tags.php +++ b/tests/lib/tags.php @@ -20,13 +20,14 @@ * */ -class Test_Tags extends PHPUnit_Framework_TestCase { +class Test_Tags extends \Test\TestCase { protected $objectType; protected $user; protected $backupGlobals = FALSE; - public function setUp() { + protected function setUp() { + parent::setUp(); OC_User::clearBackends(); OC_User::useBackend('dummy'); @@ -39,9 +40,11 @@ class Test_Tags extends PHPUnit_Framework_TestCase { } - public function tearDown() { + protected function tearDown() { //$query = OC_DB::prepare('DELETE FROM `*PREFIX*vcategories` WHERE `item_type` = ?'); //$query->execute(array('test')); + + parent::tearDown(); } public function testInstantiateWithDefaults() { diff --git a/tests/lib/template.php b/tests/lib/template.php index 819d592aacf..d77284a5bf2 100644 --- a/tests/lib/template.php +++ b/tests/lib/template.php @@ -20,9 +20,11 @@ * */ -class Test_TemplateFunctions extends PHPUnit_Framework_TestCase { +class Test_TemplateFunctions extends \Test\TestCase { + + protected function setUp() { + parent::setUp(); - public function setUp() { $loader = new \OC\Autoloader(); $loader->load('OC_Template'); } diff --git a/tests/lib/template/resourcelocator.php b/tests/lib/template/resourcelocator.php index cd354df0036..f350fd144e1 100644 --- a/tests/lib/template/resourcelocator.php +++ b/tests/lib/template/resourcelocator.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_ResourceLocator extends PHPUnit_Framework_TestCase { +class Test_ResourceLocator extends \Test\TestCase { /** * @param string $theme diff --git a/tests/lib/templatelayout.php b/tests/lib/templatelayout.php index 0335c7c88ee..1035dae122d 100644 --- a/tests/lib/templatelayout.php +++ b/tests/lib/templatelayout.php @@ -11,23 +11,27 @@ namespace OC\Test; /** * @package OC\Test */ -class OC_TemplateLayout extends \PHPUnit_Framework_TestCase { +class OC_TemplateLayout extends \Test\TestCase { - private $oldServerUri; + private $oldServerURI; private $oldScriptName; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->oldServerURI = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : null; $this->oldScriptName = $_SERVER['SCRIPT_NAME']; } - public function tearDown() { + protected function tearDown() { if ($this->oldServerURI === null) { unset($_SERVER['REQUEST_URI']); } else { $_SERVER['REQUEST_URI'] = $this->oldServerURI; } $_SERVER['SCRIPT_NAME'] = $this->oldScriptName; + + parent::tearDown(); } /** diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php index 85b94094393..05311e820a7 100644 --- a/tests/lib/tempmanager.php +++ b/tests/lib/tempmanager.php @@ -21,18 +21,21 @@ class NullLogger extends Log { } } -class TempManager extends \PHPUnit_Framework_TestCase { +class TempManager extends \Test\TestCase { protected $baseDir; - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->baseDir = get_temp_dir() . '/oc_tmp_test'; if (!is_dir($this->baseDir)) { mkdir($this->baseDir); } } - public function tearDown() { + protected function tearDown() { \OC_Helper::rmdirr($this->baseDir); + parent::tearDown(); } /** diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php index a4b4b0103f0..315cd6858ed 100644 --- a/tests/lib/testcase.php +++ b/tests/lib/testcase.php @@ -30,4 +30,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' ); } + + public static function tearDownAfterClass() { + if (\OC_Util::runningOnWindows()) { + $rootDirectory = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data-autotest'); + $mapper = new \OC\Files\Mapper($rootDirectory); + $mapper->removePath($rootDirectory, true, true); + } + + parent::tearDownAfterClass(); + } } diff --git a/tests/lib/updater.php b/tests/lib/updater.php index 4488744fa1d..cc82450cfb6 100644 --- a/tests/lib/updater.php +++ b/tests/lib/updater.php @@ -8,7 +8,7 @@ namespace OC; -class UpdaterTest extends \PHPUnit_Framework_TestCase { +class UpdaterTest extends \Test\TestCase { public function testVersionCompatbility() { return array( diff --git a/tests/lib/urlgenerator.php b/tests/lib/urlgenerator.php index 066272731ee..a92aaddeb4c 100644 --- a/tests/lib/urlgenerator.php +++ b/tests/lib/urlgenerator.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_Urlgenerator extends PHPUnit_Framework_TestCase { +class Test_Urlgenerator extends \Test\TestCase { /** * @small diff --git a/tests/lib/user.php b/tests/lib/user.php index e2c3282a19f..cb0c661b2a4 100644 --- a/tests/lib/user.php +++ b/tests/lib/user.php @@ -9,13 +9,15 @@ namespace Test; -class User extends \PHPUnit_Framework_TestCase { +class User extends TestCase { /** * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend */ private $backend; protected function setUp(){ + parent::setUp(); + $this->backend = $this->getMock('\OC_User_Dummy'); $manager = \OC_User::getManager(); $manager->registerBackend($this->backend); diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php index 15b28e61bd5..c825ec05775 100644 --- a/tests/lib/user/manager.php +++ b/tests/lib/user/manager.php @@ -9,7 +9,7 @@ namespace Test\User; -class Manager extends \PHPUnit_Framework_TestCase { +class Manager extends \Test\TestCase { public function testUserExistsSingleBackendExists() { /** * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php index 5126049d77f..8d9d024197c 100644 --- a/tests/lib/user/session.php +++ b/tests/lib/user/session.php @@ -12,7 +12,7 @@ namespace Test\User; use OC\Session\Memory; use OC\User\User; -class Session extends \PHPUnit_Framework_TestCase { +class Session extends \Test\TestCase { public function testGetUser() { $session = $this->getMock('\OC\Session\Memory', array(), array('')); $session->expects($this->once()) diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php index 7a1db861c98..6aa7243a75a 100644 --- a/tests/lib/user/user.php +++ b/tests/lib/user/user.php @@ -12,7 +12,7 @@ namespace Test\User; use OC\AllConfig; use OC\Hooks\PublicEmitter; -class User extends \PHPUnit_Framework_TestCase { +class User extends \Test\TestCase { public function testDisplayName() { /** * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend diff --git a/tests/lib/util.php b/tests/lib/util.php index 9a3185b3f79..6de599b070e 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_Util extends PHPUnit_Framework_TestCase { +class Test_Util extends \Test\TestCase { public function testGetVersion() { $version = \OC_Util::getVersion(); $this->assertTrue(is_array($version)); diff --git a/tests/lib/utilcheckserver.php b/tests/lib/utilcheckserver.php index 73a1d0e95a6..bb9b7a24452 100644 --- a/tests/lib/utilcheckserver.php +++ b/tests/lib/utilcheckserver.php @@ -9,7 +9,7 @@ /** * Tests for server check functions */ -class Test_Util_CheckServer extends PHPUnit_Framework_TestCase { +class Test_Util_CheckServer extends \Test\TestCase { private $datadir; @@ -32,16 +32,19 @@ class Test_Util_CheckServer extends PHPUnit_Framework_TestCase { return $config; } - public function setUp() { + protected function setUp() { + parent::setUp(); + $this->datadir = \OC_Helper::tmpFolder(); file_put_contents($this->datadir . '/.ocdata', ''); \OC::$server->getSession()->set('checkServer_succeeded', false); } - public function tearDown() { + protected function tearDown() { // clean up @unlink($this->datadir . '/.ocdata'); + parent::tearDown(); } /** diff --git a/tests/lib/vobject.php b/tests/lib/vobject.php index db5b0f99f06..6fabf30e48f 100644 --- a/tests/lib/vobject.php +++ b/tests/lib/vobject.php @@ -6,9 +6,11 @@ * See the COPYING-README file. */ -class Test_VObject extends PHPUnit_Framework_TestCase { +class Test_VObject extends \Test\TestCase { + + protected function setUp() { + parent::setUp(); - public function setUp() { Sabre\VObject\Property::$classMap['SUMMARY'] = 'OC\VObject\StringProperty'; Sabre\VObject\Property::$classMap['ORG'] = 'OC\VObject\CompoundProperty'; } diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml index 3805bb1ac79..282f5477c30 100644 --- a/tests/phpunit-autotest.xml +++ b/tests/phpunit-autotest.xml @@ -9,6 +9,7 @@ <testsuite name='ownCloud'> <directory suffix='.php'>lib/</directory> <directory suffix='.php'>settings/</directory> + <directory suffix='.php'>core/</directory> <file>apps.php</file> </testsuite> <!-- filters for code coverage --> diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist index 21c63ea0469..95abe473965 100644 --- a/tests/phpunit.xml.dist +++ b/tests/phpunit.xml.dist @@ -2,6 +2,8 @@ <phpunit bootstrap="bootstrap.php"> <testsuite name='ownCloud'> <directory suffix='.php'>lib/</directory> + <directory suffix='.php'>settings/</directory> + <directory suffix='.php'>core/</directory> <file>apps.php</file> </testsuite> <!-- filters for code coverage --> diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/settings/controller/mailsettingscontrollertest.php index 6d3485d28e4..f6ebade7b17 100644 --- a/tests/settings/controller/mailsettingscontrollertest.php +++ b/tests/settings/controller/mailsettingscontrollertest.php @@ -14,11 +14,13 @@ use \OC\Settings\Application; /** * @package OC\Settings\Controller */ -class MailSettingscontrollerTest extends \PHPUnit_Framework_TestCase { +class MailSettingsControllerTest extends \Test\TestCase { private $container; protected function setUp() { + parent::setUp(); + $app = new Application(); $this->container = $app->getContainer(); $this->container['Config'] = $this->getMockBuilder('\OCP\IConfig') |