diff --git a/apps/files_encryption/ajax/mode.php b/apps/files_encryption/ajax/mode.php
deleted file mode 100644
index 64c5be94401..00000000000
--- a/apps/files_encryption/ajax/mode.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-use OCA\Encryption\Keymanager;
-
-OCP\JSON::checkAppEnabled('files_encryption');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$mode = $_POST['mode'];
-$changePasswd = false;
-$passwdChanged = false;
-
-if ( isset($_POST['newpasswd']) && isset($_POST['oldpasswd']) ) {
- $oldpasswd = $_POST['oldpasswd'];
- $newpasswd = $_POST['newpasswd'];
- $changePasswd = true;
- $passwdChanged = Keymanager::changePasswd($oldpasswd, $newpasswd);
-}
-
-$query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );
-$result = $query->execute(array(\OCP\User::getUser()));
-
-if ($result->fetchRow()){
- $query = OC_DB::prepare( 'UPDATE *PREFIX*encryption SET mode = ? WHERE uid = ?' );
-} else {
- $query = OC_DB::prepare( 'INSERT INTO *PREFIX*encryption ( mode, uid ) VALUES( ?, ? )' );
-}
-
-if ( (!$changePasswd || $passwdChanged) && $query->execute(array($mode, \OCP\User::getUser())) ) {
- OCP\JSON::success();
-} else {
- OCP\JSON::error();
-}
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index e426f237bbe..08728622525 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -12,7 +12,7 @@ OC_FileProxy::register( new OCA\Encryption\Proxy() );
// User-related hooks
OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
-OCP\Util::connectHook( 'OC_User', 'post_setPassword','OCA\Encryption\Hooks', 'setPassphrase' );
+OCP\Util::connectHook( 'OC_User', 'pre_setPassword','OCA\Encryption\Hooks', 'setPassphrase' );
// Sharing-related hooks
OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
@@ -43,6 +43,6 @@ if (
}
-// Reguster settings scripts
+// Register settings scripts
OCP\App::registerAdmin( 'files_encryption', 'settings' );
-OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
\ No newline at end of file
+OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 065ef9d2410..7e4f677ce9d 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -38,12 +38,15 @@ class Hooks {
*/
public static function login( $params ) {
+ // Manually initialise Filesystem{} singleton with correct
+ // fake root path, in order to avoid fatal webdav errors
\OC\Files\Filesystem::init( $params['uid'] . '/' . 'files' . '/' );
$view = new \OC_FilesystemView( '/' );
$util = new Util( $view, $params['uid'] );
+ // Check files_encryption infrastructure is ready for action
if ( ! $util->ready() ) {
\OC_Log::write( 'Encryption library', 'User account "' . $params['uid'] . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
@@ -104,14 +107,16 @@ class Hooks {
* @param array $params keys: uid, password
*/
public static function setPassphrase( $params ) {
-
+
// Only attempt to change passphrase if server-side encryption
// is in use (client-side encryption does not have access to
// the necessary keys)
if ( Crypt::mode() == 'server' ) {
+ $session = new Session();
+
// Get existing decrypted private key
- $privateKey = $_SESSION['privateKey'];
+ $privateKey = $session->getPrivateKey();
// Encrypt private key with new user pwd as passphrase
$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $privateKey, $params['password'] );
@@ -160,16 +165,6 @@ class Hooks {
* @brief
*/
public static function postShared( $params ) {
-
- // Delete existing catfile
- Keymanager::deleteFileKey( );
-
- // Generate new catfile and env keys
- Crypt::multiKeyEncrypt( $plainContent, $publicKeys );
-
- // Save env keys to user folders
-
-
}
/**
diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
deleted file mode 100644
index 1a53e99d2b4..00000000000
--- a/apps/files_encryption/js/settings-personal.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (c) 2012, Bjoern Schiessle
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-$(document).ready(function(){
- $('input[name=encryption_mode]').change(function(){
- var prevmode = document.getElementById('prev_encryption_mode').value
- var client=$('input[value="client"]:checked').val()
- ,server=$('input[value="server"]:checked').val()
- ,user=$('input[value="user"]:checked').val()
- ,none=$('input[value="none"]:checked').val()
- if (client) {
- $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'client' });
- if (prevmode == 'server') {
- OC.dialogs.info(t('encryption', 'Please switch to your ownCloud client and change your encryption password to complete the conversion.'), t('encryption', 'switched to client side encryption'));
- }
- } else if (server) {
- if (prevmode == 'client') {
- OC.dialogs.form([{text:'Login password', name:'newpasswd', type:'password'},{text:'Encryption password used on the client', name:'oldpasswd', type:'password'}],t('encryption', 'Change encryption password to login password'), function(data) {
- $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server', newpasswd: data[0].value, oldpasswd: data[1].value }, function(result) {
- if (result.status != 'success') {
- document.getElementById(prevmode+'_encryption').checked = true;
- OC.dialogs.alert(t('encryption', 'Please check your passwords and try again.'), t('encryption', 'Could not change your file encryption password to your login password'))
- } else {
- console.log("alles super");
- }
- }, true);
- });
- } else {
- $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server' });
- }
- } else {
- $.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'none' });
- }
- })
-})
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
index 60563bde859..0be857bb73e 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings.js
@@ -9,38 +9,11 @@ $(document).ready(function(){
$('#encryption_blacklist').multiSelect({
oncheck:blackListChange,
onuncheck:blackListChange,
- createText:'...',
+ createText:'...'
});
function blackListChange(){
var blackList=$('#encryption_blacklist').val().join(',');
OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
}
-
- //TODO: Handle switch between client and server side encryption
- $('input[name=encryption_mode]').change(function(){
- var client=$('input[value="client"]:checked').val()
- ,server=$('input[value="server"]:checked').val()
- ,user=$('input[value="user"]:checked').val()
- ,none=$('input[value="none"]:checked').val()
- ,disable=false
- if (client) {
- OC.AppConfig.setValue('files_encryption','mode','client');
- disable = true;
- } else if (server) {
- OC.AppConfig.setValue('files_encryption','mode','server');
- disable = true;
- } else if (user) {
- OC.AppConfig.setValue('files_encryption','mode','user');
- disable = true;
- } else {
- OC.AppConfig.setValue('files_encryption','mode','none');
- }
- if (disable) {
- document.getElementById('server_encryption').disabled = true;
- document.getElementById('client_encryption').disabled = true;
- document.getElementById('user_encryption').disabled = true;
- document.getElementById('none_encryption').disabled = true;
- }
- })
})
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 815cf1af003..1b888f7714b 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -5,5 +5,8 @@
"Please check your passwords and try again." => "Comproveu les contrasenyes i proveu-ho de nou.",
"Could not change your file encryption password to your login password" => "No s'ha pogut canviar la contrasenya d'encriptació de fitxers per la d'accés",
"Encryption" => "Encriptatge",
+"File encryption is enabled." => "L'encriptació de fitxers està activada.",
+"The following file types will not be encrypted:" => "Els tipus de fitxers següents no s'encriptaran:",
+"Exclude the following file types from encryption:" => "Exclou els tipus de fitxers següents de l'encriptatge:",
"None" => "Cap"
);
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index 27d2ae544b5..3278f13920a 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -5,5 +5,8 @@
"Please check your passwords and try again." => "Zkontrolujte, prosím, své heslo a zkuste to znovu.",
"Could not change your file encryption password to your login password" => "Nelze změnit šifrovací heslo na přihlašovací.",
"Encryption" => "Šifrování",
+"File encryption is enabled." => "Šifrování je povoleno.",
+"The following file types will not be encrypted:" => "Následující typy souborů nebudou šifrovány:",
+"Exclude the following file types from encryption:" => "Vyjmout následující typy souborů ze šifrování:",
"None" => "Žádné"
);
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index c3c69e09007..465af23efdd 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -5,5 +5,8 @@
"Please check your passwords and try again." => "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut.",
"Could not change your file encryption password to your login password" => "Ihr Verschlüsselungspasswort konnte nicht als Anmeldepasswort gesetzt werden.",
"Encryption" => "Verschlüsselung",
+"File encryption is enabled." => "Datei-Verschlüsselung ist aktiviert",
+"The following file types will not be encrypted:" => "Die folgenden Datei-Typen werden nicht verschlüsselt:",
+"Exclude the following file types from encryption:" => "Die folgenden Datei-Typen von der Verschlüsselung ausnehmen:",
"None" => "Keine"
);
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 87f984c2c10..73b5f273d1f 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -5,5 +5,8 @@
"Please check your passwords and try again." => "Por favor revise su contraseña e intentelo de nuevo.",
"Could not change your file encryption password to your login password" => "No se pudo cambiar la contraseña de cifrado de archivos de su contraseña de inicio de sesión",
"Encryption" => "Cifrado",
+"File encryption is enabled." => "La encriptacion de archivo esta activada.",
+"The following file types will not be encrypted:" => "Los siguientes tipos de archivo no seran encriptados:",
+"Exclude the following file types from encryption:" => "Excluir los siguientes tipos de archivo de la encriptacion:",
"None" => "Ninguno"
);
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 608778b2ec8..7d431e6e462 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -5,5 +5,8 @@
"Please check your passwords and try again." => "Veuillez vérifier vos mots de passe et réessayer.",
"Could not change your file encryption password to your login password" => "Impossible de convertir votre mot de passe de chiffrement en mot de passe de connexion",
"Encryption" => "Chiffrement",
+"File encryption is enabled." => "Le chiffrement des fichiers est activé",
+"The following file types will not be encrypted:" => "Les fichiers de types suivants ne seront pas chiffrés :",
+"Exclude the following file types from encryption:" => "Ne pas chiffrer les fichiers dont les types sont les suivants :",
"None" => "Aucun"
);
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 86e1a66c458..ffa20b718d9 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -5,5 +5,8 @@
"Please check your passwords and try again." => "Controlla la password e prova ancora.",
"Could not change your file encryption password to your login password" => "Impossibile convertire la password di cifratura nella password di accesso",
"Encryption" => "Cifratura",
+"File encryption is enabled." => "La cifratura dei file è abilitata.",
+"The following file types will not be encrypted:" => "I seguenti tipi di file non saranno cifrati:",
+"Exclude the following file types from encryption:" => "Escludi i seguenti tipi di file dalla cifratura:",
"None" => "Nessuna"
);
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 8d3df1f06ae..b7aeb8d8348 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -5,5 +5,8 @@
"Please check your passwords and try again." => "パスワードを確認してもう一度行なってください。",
"Could not change your file encryption password to your login password" => "ファイル暗号化パスワードをログインパスワードに変更できませんでした。",
"Encryption" => "暗号化",
+"File encryption is enabled." => "ファイルの暗号化は有効です。",
+"The following file types will not be encrypted:" => "次のファイルタイプは暗号化されません:",
+"Exclude the following file types from encryption:" => "次のファイルタイプを暗号化から除外:",
"None" => "なし"
);
diff --git a/apps/files_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
index 7b94bb99e1a..1aae1377516 100644
--- a/apps/files_encryption/l10n/lv.php
+++ b/apps/files_encryption/l10n/lv.php
@@ -5,5 +5,8 @@
"Please check your passwords and try again." => "Lūdzu, pārbaudiet savas paroles un mēģiniet vēlreiz.",
"Could not change your file encryption password to your login password" => "Nevarēja mainīt datņu šifrēšanas paroli uz ierakstīšanās paroli",
"Encryption" => "Šifrēšana",
+"File encryption is enabled." => "Datņu šifrēšana ir aktivēta.",
+"The following file types will not be encrypted:" => "Sekojošās datnes netiks šifrētas:",
+"Exclude the following file types from encryption:" => "Sekojošos datņu tipus izslēgt no šifrēšanas:",
"None" => "Nav"
);
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index fc8a7954a9e..c434330049b 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,8 +1,12 @@
"Schakel om naar uw eigen ownCloud client en wijzig uw versleutelwachtwoord om de conversie af te ronden.",
"switched to client side encryption" => "overgeschakeld naar client side encryptie",
"Change encryption password to login password" => "Verander encryptie wachtwoord naar login wachtwoord",
"Please check your passwords and try again." => "Controleer uw wachtwoorden en probeer het opnieuw.",
"Could not change your file encryption password to your login password" => "Kon het bestandsencryptie wachtwoord niet veranderen naar het login wachtwoord",
"Encryption" => "Versleuteling",
+"File encryption is enabled." => "Bestandsversleuteling geactiveerd.",
+"The following file types will not be encrypted:" => "De volgende bestandstypen zullen niet worden versleuteld:",
+"Exclude the following file types from encryption:" => "Sluit de volgende bestandstypen uit van versleuteling:",
"None" => "Geen"
);
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index c11cf74ecfb..651885fe022 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,4 +1,12 @@
"Пожалуйста переключитесь на Ваш клиент ownCloud и поменяйте пароль шиврования для завершения преобразования.",
+"switched to client side encryption" => "переключён на шифрование со стороны клиента",
+"Change encryption password to login password" => "Изменить пароль шифрования для пароля входа",
+"Please check your passwords and try again." => "Пожалуйста проверьте пароли и попробуйте снова.",
+"Could not change your file encryption password to your login password" => "Невозможно изменить Ваш пароль файла шифрования для пароля входа",
"Encryption" => "Шифрование",
+"File encryption is enabled." => "Шифрование файла включено.",
+"The following file types will not be encrypted:" => "Следующие типы файлов не будут зашифрованы:",
+"Exclude the following file types from encryption:" => "Исключить следующие типы файлов из шифрованных:",
"None" => "Ничего"
);
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 3a1e4c7e194..dc2907e704f 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -5,5 +5,8 @@
"Please check your passwords and try again." => "Skontrolujte si heslo a skúste to znovu.",
"Could not change your file encryption password to your login password" => "Nie je možné zmeniť šifrovacie heslo na prihlasovacie",
"Encryption" => "Šifrovanie",
+"File encryption is enabled." => "Kryptovanie súborov nastavené.",
+"The following file types will not be encrypted:" => "Uvedené typy súborov nebudú kryptované:",
+"Exclude the following file types from encryption:" => "Nekryptovať uvedené typy súborov",
"None" => "Žiadne"
);
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index c3f92dc66eb..e5294974e4e 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -5,5 +5,8 @@
"Please check your passwords and try again." => "Kontrollera dina lösenord och försök igen.",
"Could not change your file encryption password to your login password" => "Kunde inte ändra ditt filkrypteringslösenord till ditt loginlösenord",
"Encryption" => "Kryptering",
+"File encryption is enabled." => "Filkryptering är aktiverat.",
+"The following file types will not be encrypted:" => "Följande filtyper kommer inte att krypteras:",
+"Exclude the following file types from encryption:" => "Exkludera följande filtyper från kryptering:",
"None" => "Ingen"
);
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index e3ffacabc9a..c7a414c5080 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -4,8 +4,8 @@
* ownCloud
*
* @author Sam Tuke, Frank Karlitschek, Robin Appelman
- * @copyright 2012 Sam Tuke samtuke@owncloud.com,
- * Robin Appelman icewind@owncloud.com, Frank Karlitschek
+ * @copyright 2012 Sam Tuke samtuke@owncloud.com,
+ * Robin Appelman icewind@owncloud.com, Frank Karlitschek
* frank@owncloud.org
*
* This library is free software; you can redistribute it and/or
@@ -45,35 +45,17 @@ class Crypt {
* @return string 'client' or 'server'
*/
public static function mode( $user = null ) {
-
-// $mode = \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' );
-//
-// if ( $mode == 'user') {
-// if ( !$user ) {
-// $user = \OCP\User::getUser();
-// }
-// $mode = 'none';
-// if ( $user ) {
-// $query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );
-// $result = $query->execute(array($user));
-// if ($row = $result->fetchRow()){
-// $mode = $row['mode'];
-// }
-// }
-// }
-//
-// return $mode;
return 'server';
-
+
}
-
- /**
- * @brief Create a new encryption keypair
- * @return array publicKey, privatekey
- */
+
+ /**
+ * @brief Create a new encryption keypair
+ * @return array publicKey, privatekey
+ */
public static function createKeypair() {
-
+
$res = openssl_pkey_new();
// Get private key
@@ -81,576 +63,543 @@ class Crypt {
// Get public key
$publicKey = openssl_pkey_get_details( $res );
-
+
$publicKey = $publicKey['key'];
-
+
return( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );
-
+
}
-
- /**
- * @brief Add arbitrary padding to encrypted data
- * @param string $data data to be padded
- * @return padded data
- * @note In order to end up with data exactly 8192 bytes long we must
- * add two letters. It is impossible to achieve exactly 8192 length
- * blocks with encryption alone, hence padding is added to achieve the
- * required length.
- */
+
+ /**
+ * @brief Add arbitrary padding to encrypted data
+ * @param string $data data to be padded
+ * @return padded data
+ * @note In order to end up with data exactly 8192 bytes long we must
+ * add two letters. It is impossible to achieve exactly 8192 length
+ * blocks with encryption alone, hence padding is added to achieve the
+ * required length.
+ */
public static function addPadding( $data ) {
-
+
$padded = $data . 'xx';
-
+
return $padded;
-
+
}
-
- /**
- * @brief Remove arbitrary padding to encrypted data
- * @param string $padded padded data to remove padding from
- * @return unpadded data on success, false on error
- */
+
+ /**
+ * @brief Remove arbitrary padding to encrypted data
+ * @param string $padded padded data to remove padding from
+ * @return unpadded data on success, false on error
+ */
public static function removePadding( $padded ) {
-
+
if ( substr( $padded, -2 ) == 'xx' ) {
-
+
$data = substr( $padded, 0, -2 );
-
+
return $data;
-
+
} else {
-
+
// TODO: log the fact that unpadded data was submitted for removal of padding
return false;
-
+
}
-
+
}
-
- /**
- * @brief Check if a file's contents contains an IV and is symmetrically encrypted
- * @return true / false
- * @note see also OCA\Encryption\Util->isEncryptedPath()
- */
+
+ /**
+ * @brief Check if a file's contents contains an IV and is symmetrically encrypted
+ * @return true / false
+ * @note see also OCA\Encryption\Util->isEncryptedPath()
+ */
public static function isCatfile( $content ) {
-
+
if ( !$content ) {
-
+
return false;
-
+
}
-
+
$noPadding = self::removePadding( $content );
-
+
// Fetch encryption metadata from end of file
$meta = substr( $noPadding, -22 );
-
+
// Fetch IV from end of file
$iv = substr( $meta, -16 );
-
+
// Fetch identifier from start of metadata
$identifier = substr( $meta, 0, 6 );
-
+
if ( $identifier == '00iv00') {
-
+
return true;
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
* Check if a file is encrypted according to database file cache
* @param string $path
* @return bool
*/
public static function isEncryptedMeta( $path ) {
-
+
// TODO: Use DI to get \OC\Files\Filesystem out of here
-
+
// Fetch all file metadata from DB
$metadata = \OC\Files\Filesystem::getFileInfo( $path, '' );
-
+
// Return encryption status
return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];
-
+
}
-
- /**
- * @brief Check if a file is encrypted via legacy system
- * @param string $relPath The path of the file, relative to user/data;
- * e.g. filename or /Docs/filename, NOT admin/files/filename
- * @return true / false
- */
+
+ /**
+ * @brief Check if a file is encrypted via legacy system
+ * @param string $relPath The path of the file, relative to user/data;
+ * e.g. filename or /Docs/filename, NOT admin/files/filename
+ * @return true / false
+ */
public static function isLegacyEncryptedContent( $data, $relPath ) {
-
+
// Fetch all file metadata from DB
$metadata = \OC\Files\Filesystem::getFileInfo( $relPath, '' );
-
+
// If a file is flagged with encryption in DB, but isn't a
// valid content + IV combination, it's probably using the
// legacy encryption system
- if (
- isset( $metadata['encrypted'] )
- and $metadata['encrypted'] === true
- and ! self::isCatfile( $data )
+ if (
+ isset( $metadata['encrypted'] )
+ and $metadata['encrypted'] === true
+ and ! self::isCatfile( $data )
) {
-
+
return true;
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
- /**
- * @brief Symmetrically encrypt a string
- * @returns encrypted file
- */
+
+ /**
+ * @brief Symmetrically encrypt a string
+ * @returns encrypted file
+ */
public static function encrypt( $plainContent, $iv, $passphrase = '' ) {
-
+
if ( $encryptedContent = openssl_encrypt( $plainContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
return $encryptedContent;
-
+
} else {
-
+
\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of content failed', \OC_Log::ERROR );
-
+
return false;
-
+
}
-
+
}
-
- /**
- * @brief Symmetrically decrypt a string
- * @returns decrypted file
- */
+
+ /**
+ * @brief Symmetrically decrypt a string
+ * @returns decrypted file
+ */
public static function decrypt( $encryptedContent, $iv, $passphrase ) {
-
+
if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
return $plainContent;
-
-
+
+
} else {
-
+
throw new \Exception( 'Encryption library: Decryption (symmetric) of content failed' );
-
- return false;
-
+
}
-
+
}
-
- /**
- * @brief Concatenate encrypted data with its IV and padding
- * @param string $content content to be concatenated
- * @param string $iv IV to be concatenated
- * @returns string concatenated content
- */
+
+ /**
+ * @brief Concatenate encrypted data with its IV and padding
+ * @param string $content content to be concatenated
+ * @param string $iv IV to be concatenated
+ * @returns string concatenated content
+ */
public static function concatIv ( $content, $iv ) {
-
+
$combined = $content . '00iv00' . $iv;
-
+
return $combined;
-
+
}
-
- /**
- * @brief Split concatenated data and IV into respective parts
- * @param string $catFile concatenated data to be split
- * @returns array keys: encrypted, iv
- */
+
+ /**
+ * @brief Split concatenated data and IV into respective parts
+ * @param string $catFile concatenated data to be split
+ * @returns array keys: encrypted, iv
+ */
public static function splitIv ( $catFile ) {
-
+
// Fetch encryption metadata from end of file
$meta = substr( $catFile, -22 );
-
+
// Fetch IV from end of file
$iv = substr( $meta, -16 );
-
+
// Remove IV and IV identifier text to expose encrypted content
$encrypted = substr( $catFile, 0, -22 );
-
+
$split = array(
'encrypted' => $encrypted
- , 'iv' => $iv
+ , 'iv' => $iv
);
-
+
return $split;
-
+
}
-
- /**
- * @brief Symmetrically encrypts a string and returns keyfile content
- * @param $plainContent content to be encrypted in keyfile
- * @returns encrypted content combined with IV
- * @note IV need not be specified, as it will be stored in the returned keyfile
- * and remain accessible therein.
- */
+
+ /**
+ * @brief Symmetrically encrypts a string and returns keyfile content
+ * @param $plainContent content to be encrypted in keyfile
+ * @returns encrypted content combined with IV
+ * @note IV need not be specified, as it will be stored in the returned keyfile
+ * and remain accessible therein.
+ */
public static function symmetricEncryptFileContent( $plainContent, $passphrase = '' ) {
-
+
if ( !$plainContent ) {
-
+
return false;
-
+
}
-
+
$iv = self::generateIv();
-
+
if ( $encryptedContent = self::encrypt( $plainContent, $iv, $passphrase ) ) {
-
- // Combine content to encrypt with IV identifier and actual IV
- $catfile = self::concatIv( $encryptedContent, $iv );
-
- $padded = self::addPadding( $catfile );
-
- return $padded;
-
+
+ // Combine content to encrypt with IV identifier and actual IV
+ $catfile = self::concatIv( $encryptedContent, $iv );
+
+ $padded = self::addPadding( $catfile );
+
+ return $padded;
+
} else {
-
+
\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of keyfile content failed', \OC_Log::ERROR );
-
+
return false;
-
+
}
-
+
}
/**
- * @brief Symmetrically decrypts keyfile content
- * @param string $source
- * @param string $target
- * @param string $key the decryption key
- * @returns decrypted content
- *
- * This function decrypts a file
- */
+ * @brief Symmetrically decrypts keyfile content
+ * @param string $source
+ * @param string $target
+ * @param string $key the decryption key
+ * @returns decrypted content
+ *
+ * This function decrypts a file
+ */
public static function symmetricDecryptFileContent( $keyfileContent, $passphrase = '' ) {
-
+
if ( !$keyfileContent ) {
-
+
throw new \Exception( 'Encryption library: no data provided for decryption' );
-
+
}
-
+
// Remove padding
$noPadding = self::removePadding( $keyfileContent );
-
+
// Split into enc data and catfile
$catfile = self::splitIv( $noPadding );
-
+
if ( $plainContent = self::decrypt( $catfile['encrypted'], $catfile['iv'], $passphrase ) ) {
-
+
return $plainContent;
-
+
}
-
+
}
-
+
/**
- * @brief Creates symmetric keyfile content using a generated key
- * @param string $plainContent content to be encrypted
- * @returns array keys: key, encrypted
- * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
- *
- * This function decrypts a file
- */
+ * @brief Creates symmetric keyfile content using a generated key
+ * @param string $plainContent content to be encrypted
+ * @returns array keys: key, encrypted
+ * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
+ *
+ * This function decrypts a file
+ */
public static function symmetricEncryptFileContentKeyfile( $plainContent ) {
-
+
$key = self::generateKey();
-
+
if( $encryptedContent = self::symmetricEncryptFileContent( $plainContent, $key ) ) {
-
+
return array(
'key' => $key
- , 'encrypted' => $encryptedContent
+ , 'encrypted' => $encryptedContent
);
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
/**
- * @brief Create asymmetrically encrypted keyfile content using a generated key
- * @param string $plainContent content to be encrypted
- * @returns array keys: key, encrypted
- * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
- *
- * This function decrypts a file
- */
+ * @brief Create asymmetrically encrypted keyfile content using a generated key
+ * @param string $plainContent content to be encrypted
+ * @returns array keys: key, encrypted
+ * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
+ *
+ * This function decrypts a file
+ */
public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {
-
+
// Set empty vars to be set by openssl by reference
$sealed = '';
$envKeys = array();
-
+
if( openssl_seal( $plainContent, $sealed, $envKeys, $publicKeys ) ) {
-
+
return array(
'keys' => $envKeys
- , 'encrypted' => $sealed
+ , 'encrypted' => $sealed
);
-
+
} else {
-
+
return false;
-
+
}
-
- }
-
- /**
- * @brief Asymmetrically encrypt a file using multiple public keys
- * @param string $plainContent content to be encrypted
- * @returns string $plainContent decrypted string
- * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
- *
- * This function decrypts a file
- */
- public static function multiKeyDecrypt( $encryptedContent, $envKey, $privateKey ) {
-
- if ( !$encryptedContent ) {
-
- return false;
-
- }
-
- if ( openssl_open( $encryptedContent, $plainContent, $envKey, $privateKey ) ) {
-
- return $plainContent;
-
- } else {
-
- \OC_Log::write( 'Encryption library', 'Decryption (asymmetric) of sealed content failed', \OC_Log::ERROR );
-
- return false;
-
- }
-
- }
-
- /**
- * @brief Asymetrically encrypt a string using a public key
- * @returns encrypted file
- */
- public static function keyEncrypt( $plainContent, $publicKey ) {
-
- openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
-
- return $encryptedContent;
-
- }
-
- /**
- * @brief Asymetrically decrypt a file using a private key
- * @returns decrypted file
- */
- public static function keyDecrypt( $encryptedContent, $privatekey ) {
-
- openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
-
- return $plainContent;
-
+
}
- /**
- * @brief Encrypts content symmetrically and generates keyfile asymmetrically
- * @returns array containing catfile and new keyfile.
- * keys: data, key
- * @note this method is a wrapper for combining other crypt class methods
- */
+ /**
+ * @brief Asymmetrically encrypt a file using multiple public keys
+ * @param string $plainContent content to be encrypted
+ * @returns string $plainContent decrypted string
+ * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
+ *
+ * This function decrypts a file
+ */
+ public static function multiKeyDecrypt( $encryptedContent, $envKey, $privateKey ) {
+
+ if ( !$encryptedContent ) {
+
+ return false;
+
+ }
+
+ if ( openssl_open( $encryptedContent, $plainContent, $envKey, $privateKey ) ) {
+
+ return $plainContent;
+
+ } else {
+
+ \OC_Log::write( 'Encryption library', 'Decryption (asymmetric) of sealed content failed', \OC_Log::ERROR );
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Asymmetrically encrypt a string using a public key
+ * @returns encrypted file
+ */
+ public static function keyEncrypt( $plainContent, $publicKey ) {
+
+ openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
+
+ return $encryptedContent;
+
+ }
+
+ /**
+ * @brief Asymetrically decrypt a file using a private key
+ * @returns decrypted file
+ */
+ public static function keyDecrypt( $encryptedContent, $privatekey ) {
+
+ openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
+
+ return $plainContent;
+
+ }
+
+ /**
+ * @brief Encrypts content symmetrically and generates keyfile asymmetrically
+ * @returns array containing catfile and new keyfile.
+ * keys: data, key
+ * @note this method is a wrapper for combining other crypt class methods
+ */
public static function keyEncryptKeyfile( $plainContent, $publicKey ) {
-
+
// Encrypt plain data, generate keyfile & encrypted file
$cryptedData = self::symmetricEncryptFileContentKeyfile( $plainContent );
-
+
// Encrypt keyfile
$cryptedKey = self::keyEncrypt( $cryptedData['key'], $publicKey );
-
+
return array( 'data' => $cryptedData['encrypted'], 'key' => $cryptedKey );
-
+
}
-
- /**
- * @brief Takes catfile, keyfile, and private key, and
- * performs decryption
- * @returns decrypted content
- * @note this method is a wrapper for combining other crypt class methods
- */
+
+ /**
+ * @brief Takes catfile, keyfile, and private key, and
+ * performs decryption
+ * @returns decrypted content
+ * @note this method is a wrapper for combining other crypt class methods
+ */
public static function keyDecryptKeyfile( $catfile, $keyfile, $privateKey ) {
-
+
// Decrypt the keyfile with the user's private key
$decryptedKeyfile = self::keyDecrypt( $keyfile, $privateKey );
-
+
// Decrypt the catfile symmetrically using the decrypted keyfile
$decryptedData = self::symmetricDecryptFileContent( $catfile, $decryptedKeyfile );
-
+
return $decryptedData;
-
+
}
-
+
/**
- * @brief Symmetrically encrypt a file by combining encrypted component data blocks
- */
+ * @brief Symmetrically encrypt a file by combining encrypted component data blocks
+ */
public static function symmetricBlockEncryptFileContent( $plainContent, $key ) {
-
+
$crypted = '';
-
+
$remaining = $plainContent;
-
+
$testarray = array();
-
+
while( strlen( $remaining ) ) {
-
+
//echo "\n\n\$block = ".substr( $remaining, 0, 6126 );
-
+
// Encrypt a chunk of unencrypted data and add it to the rest
$block = self::symmetricEncryptFileContent( substr( $remaining, 0, 6126 ), $key );
-
+
$padded = self::addPadding( $block );
-
+
$crypted .= $block;
-
+
$testarray[] = $block;
-
+
// Remove the data already encrypted from remaining unencrypted data
$remaining = substr( $remaining, 6126 );
-
+
}
-
- //echo "hags ";
-
- //echo "\n\n\n\$crypted = $crypted\n\n\n";
-
- //print_r($testarray);
-
+
return $crypted;
}
/**
- * @brief Symmetrically decrypt a file by combining encrypted component data blocks
- */
+ * @brief Symmetrically decrypt a file by combining encrypted component data blocks
+ */
public static function symmetricBlockDecryptFileContent( $crypted, $key ) {
-
+
$decrypted = '';
-
+
$remaining = $crypted;
-
+
$testarray = array();
-
+
while( strlen( $remaining ) ) {
-
+
$testarray[] = substr( $remaining, 0, 8192 );
-
+
// Decrypt a chunk of unencrypted data and add it to the rest
$decrypted .= self::symmetricDecryptFileContent( $remaining, $key );
-
+
// Remove the data already encrypted from remaining unencrypted data
$remaining = substr( $remaining, 8192 );
-
+
}
-
- //echo "\n\n\$testarray = "; print_r($testarray);
-
+
return $decrypted;
-
+
}
-
- /**
- * @brief Generates a pseudo random initialisation vector
- * @return String $iv generated IV
- */
+
+ /**
+ * @brief Generates a pseudo random initialisation vector
+ * @return String $iv generated IV
+ */
public static function generateIv() {
-
+
if ( $random = openssl_random_pseudo_bytes( 12, $strong ) ) {
-
+
if ( !$strong ) {
-
+
// If OpenSSL indicates randomness is insecure, log error
\OC_Log::write( 'Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OC_Log::WARN );
-
+
}
-
+
// We encode the iv purely for string manipulation
// purposes - it gets decoded before use
$iv = base64_encode( $random );
-
+
return $iv;
-
+
} else {
-
- throw new Exception( 'Generating IV failed' );
-
+
+ throw new \Exception( 'Generating IV failed' );
+
}
-
+
}
-
- /**
- * @brief Generate a pseudo random 1024kb ASCII key
- * @returns $key Generated key
- */
+
+ /**
+ * @brief Generate a pseudo random 1024kb ASCII key
+ * @returns $key Generated key
+ */
public static function generateKey() {
-
+
// Generate key
if ( $key = base64_encode( openssl_random_pseudo_bytes( 183, $strong ) ) ) {
-
+
if ( !$strong ) {
-
+
// If OpenSSL indicates randomness is insecure, log error
- throw new Exception ( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );
-
+ throw new \Exception ( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );
+
}
-
+
return $key;
-
+
} else {
-
+
return false;
-
+
}
-
+
}
- public static function changekeypasscode( $oldPassword, $newPassword ) {
-
- if ( \OCP\User::isLoggedIn() ) {
-
- $key = Keymanager::getPrivateKey( $user, $view );
-
- if ( ( $key = Crypt::symmetricDecryptFileContent($key,$oldpasswd) ) ) {
-
- if ( ( $key = Crypt::symmetricEncryptFileContent( $key, $newpasswd ) ) ) {
-
- Keymanager::setPrivateKey( $key );
-
- return true;
- }
-
- }
-
- }
-
- return false;
-
- }
-
/**
* @brief Get the blowfish encryption handeler for a key
* @param $key string (optional)
@@ -659,21 +608,21 @@ class Crypt {
* if the key is left out, the default handeler will be used
*/
public static function getBlowfish( $key = '' ) {
-
+
if ( $key ) {
-
+
return new \Crypt_Blowfish( $key );
-
+
} else {
-
+
return false;
-
+
}
-
+
}
-
+
public static function legacyCreateKey( $passphrase ) {
-
+
// Generate a random integer
$key = mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 );
@@ -681,9 +630,9 @@ class Crypt {
$legacyEncKey = self::legacyEncrypt( $key, $passphrase );
return $legacyEncKey;
-
+
}
-
+
/**
* @brief encrypts content using legacy blowfish system
* @param $content the cleartext message you want to encrypt
@@ -693,54 +642,54 @@ class Crypt {
* This function encrypts an content
*/
public static function legacyEncrypt( $content, $passphrase = '' ) {
-
+
$bf = self::getBlowfish( $passphrase );
-
+
return $bf->encrypt( $content );
-
+
}
-
+
/**
- * @brief decrypts content using legacy blowfish system
- * @param $content the cleartext message you want to decrypt
- * @param $key the encryption key (optional)
- * @returns cleartext content
- *
- * This function decrypts an content
- */
+ * @brief decrypts content using legacy blowfish system
+ * @param $content the cleartext message you want to decrypt
+ * @param $key the encryption key (optional)
+ * @returns cleartext content
+ *
+ * This function decrypts an content
+ */
public static function legacyDecrypt( $content, $passphrase = '' ) {
-
+
$bf = self::getBlowfish( $passphrase );
-
+
$decrypted = $bf->decrypt( $content );
-
+
$trimmed = rtrim( $decrypted, "\0" );
-
+
return $trimmed;
-
+
}
-
+
public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKey, $newPassphrase ) {
-
+
$decrypted = self::legacyDecrypt( $legacyEncryptedContent, $legacyPassphrase );
-
+
$recrypted = self::keyEncryptKeyfile( $decrypted, $publicKey );
-
+
return $recrypted;
-
+
}
-
+
/**
- * @brief Re-encryptes a legacy blowfish encrypted file using AES with integrated IV
- * @param $legacyContent the legacy encrypted content to re-encrypt
- * @returns cleartext content
- *
- * This function decrypts an content
- */
+ * @brief Re-encryptes a legacy blowfish encrypted file using AES with integrated IV
+ * @param $legacyContent the legacy encrypted content to re-encrypt
+ * @returns cleartext content
+ *
+ * This function decrypts an content
+ */
public static function legacyRecrypt( $legacyContent, $legacyPassphrase, $newPassphrase ) {
-
+
// TODO: write me
-
+
}
-
+
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 43af70dacc2..95587797154 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -1,325 +1,323 @@
-
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library. If not, see .
- *
- */
-
-namespace OCA\Encryption;
-
-/**
- * @brief Class to manage storage and retrieval of encryption keys
- * @note Where a method requires a view object, it's root must be '/'
- */
-class Keymanager {
-
- /**
- * @brief retrieve the ENCRYPTED private key from a user
- *
- * @return string private key or false
- * @note the key returned by this method must be decrypted before use
- */
- public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
-
- $path = '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
-
- $key = $view->file_get_contents( $path );
-
- return $key;
- }
-
- /**
- * @brief retrieve public key for a specified user
- * @return string public key or false
- */
- public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
-
- return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
-
- }
-
- /**
- * @brief retrieve both keys from a user (private and public)
- * @return array keys: privateKey, publicKey
- */
- public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
-
- return array(
- 'publicKey' => self::getPublicKey( $view, $userId )
- , 'privateKey' => self::getPrivateKey( $view, $userId )
- );
-
- }
-
- /**
- * @brief Retrieve public keys of all users with access to a file
- * @param string $path Path to file
- * @return array of public keys for the given file
- * @note Checks that the sharing app is enabled should be performed
- * by client code, that isn't checked here
- */
- public static function getPublicKeys( \OC_FilesystemView $view, $userId, $filePath ) {
-
- $path = ltrim( $path, '/' );
-
- $filepath = '/' . $userId . '/files/' . $filePath;
-
- // Check if sharing is enabled
- if ( OC_App::isEnabled( 'files_sharing' ) ) {
-
-
-
- } else {
-
- // check if it is a file owned by the user and not shared at all
- $userview = new \OC_FilesystemView( '/'.$userId.'/files/' );
-
- if ( $userview->file_exists( $path ) ) {
-
- $users[] = $userId;
-
- }
-
- }
-
- $view = new \OC_FilesystemView( '/public-keys/' );
-
- $keylist = array();
-
- $count = 0;
-
- foreach ( $users as $user ) {
-
- $keylist['key'.++$count] = $view->file_get_contents( $user.'.public.key' );
-
- }
-
- return $keylist;
-
- }
-
- /**
- * @brief store file encryption key
- *
- * @param string $path relative path of the file, including filename
- * @param string $key
- * @return bool true/false
- * @note The keyfile is not encrypted here. Client code must
- * asymmetrically encrypt the keyfile before passing it to this method
- */
- public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
-
- $basePath = '/' . $userId . '/files_encryption/keyfiles';
-
- $targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );
-
- if ( $view->is_dir( $basePath . '/' . $targetPath ) ) {
-
-
-
- } else {
-
- // Save the keyfile in parallel directory
- return $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
-
- }
-
- }
-
- /**
- * @brief retrieve keyfile for an encrypted file
- * @param string file name
- * @return string file key or false on failure
- * @note The keyfile returned is asymmetrically encrypted. Decryption
- * of the keyfile must be performed by client code
- */
- public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
-
- $filePath_f = ltrim( $filePath, '/' );
-
- $catfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
-
- if ( $view->file_exists( $catfilePath ) ) {
-
- return $view->file_get_contents( $catfilePath );
-
- } else {
-
- return false;
-
- }
-
- }
-
- /**
- * @brief Delete a keyfile
- *
- * @param OC_FilesystemView $view
- * @param string $userId username
- * @param string $path path of the file the key belongs to
- * @return bool Outcome of unlink operation
- * @note $path must be relative to data/user/files. e.g. mydoc.txt NOT
- * /data/admin/files/mydoc.txt
- */
- public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
-
- $trimmed = ltrim( $path, '/' );
- $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed . '.key';
-
- // Unlink doesn't tell us if file was deleted (not found returns
- // true), so we perform our own test
- if ( $view->file_exists( $keyPath ) ) {
-
- return $view->unlink( $keyPath );
-
- } else {
-
- \OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
-
- return false;
-
- }
-
- }
-
- /**
- * @brief store private key from the user
- * @param string key
- * @return bool
- * @note Encryption of the private key must be performed by client code
- * as no encryption takes place here
- */
- public static function setPrivateKey( $key ) {
-
- $user = \OCP\User::getUser();
-
- $view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
-
- \OC_FileProxy::$enabled = false;
-
- if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
-
- return $view->file_put_contents( $user . '.private.key', $key );
-
- \OC_FileProxy::$enabled = true;
-
- }
-
- /**
- * @brief store private keys from the user
- *
- * @param string privatekey
- * @param string publickey
- * @return bool true/false
- */
- public static function setUserKeys($privatekey, $publickey) {
-
- return ( self::setPrivateKey( $privatekey ) && self::setPublicKey( $publickey ) );
-
- }
-
- /**
- * @brief store public key of the user
- *
- * @param string key
- * @return bool true/false
- */
- public static function setPublicKey( $key ) {
-
- $view = new \OC_FilesystemView( '/public-keys' );
-
- \OC_FileProxy::$enabled = false;
-
- if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
-
- return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
-
- \OC_FileProxy::$enabled = true;
-
- }
-
- /**
- * @note 'shareKey' is a more user-friendly name for env_key
- */
- public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
-
- $basePath = '/' . $userId . '/files_encryption/share-keys';
-
- $shareKeyPath = self::keySetPreparation( $view, $path, $basePath, $userId );
-
- return $view->file_put_contents( $basePath . '/' . $shareKeyPath . '.shareKey', $shareKey );
-
- }
-
- /**
- * @brief Make preparations to vars and filesystem for saving a keyfile
- */
- public static function keySetPreparation( \OC_FilesystemView $view, $path, $basePath, $userId ) {
-
- $targetPath = ltrim( $path, '/' );
-
- $path_parts = pathinfo( $targetPath );
-
- // If the file resides within a subdirectory, create it
- if (
- isset( $path_parts['dirname'] )
- && ! $view->file_exists( $basePath . '/' . $path_parts['dirname'] )
- ) {
-
- $view->mkdir( $basePath . '/' . $path_parts['dirname'] );
-
- }
-
- return $targetPath;
-
- }
-
- /**
- * @brief change password of private encryption key
- *
- * @param string $oldpasswd old password
- * @param string $newpasswd new password
- * @return bool true/false
- */
- public static function changePasswd($oldpasswd, $newpasswd) {
-
- if ( \OCP\User::checkPassword(\OCP\User::getUser(), $newpasswd) ) {
- return Crypt::changekeypasscode($oldpasswd, $newpasswd);
- }
- return false;
-
- }
-
- /**
- * @brief Fetch the legacy encryption key from user files
- * @param string $login used to locate the legacy key
- * @param string $passphrase used to decrypt the legacy key
- * @return true / false
- *
- * if the key is left out, the default handeler will be used
- */
- public function getLegacyKey() {
-
- $user = \OCP\User::getUser();
- $view = new \OC_FilesystemView( '/' . $user );
- return $view->file_get_contents( 'encryption.key' );
-
- }
-
+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see .
+ *
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * @brief Class to manage storage and retrieval of encryption keys
+ * @note Where a method requires a view object, it's root must be '/'
+ */
+class Keymanager {
+
+ /**
+ * @brief retrieve the ENCRYPTED private key from a user
+ *
+ * @return string private key or false
+ * @note the key returned by this method must be decrypted before use
+ */
+ public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
+
+ $path = '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
+
+ $key = $view->file_get_contents( $path );
+
+ return $key;
+ }
+
+ /**
+ * @brief retrieve public key for a specified user
+ * @param \OC_FilesystemView $view
+ * @param $userId
+ * @return string public key or false
+ */
+ public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
+
+ return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
+
+ }
+
+ /**
+ * @brief retrieve both keys from a user (private and public)
+ * @param \OC_FilesystemView $view
+ * @param $userId
+ * @return array keys: privateKey, publicKey
+ */
+ public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
+
+ return array(
+ 'publicKey' => self::getPublicKey( $view, $userId )
+ , 'privateKey' => self::getPrivateKey( $view, $userId )
+ );
+
+ }
+
+ /**
+ * @brief Retrieve public keys of all users with access to a file
+ * @param string $path Path to file
+ * @return array of public keys for the given file
+ * @note Checks that the sharing app is enabled should be performed
+ * by client code, that isn't checked here
+ */
+ public static function getPublicKeys( \OC_FilesystemView $view, $userId, $filePath ) {
+
+ $path = ltrim( $path, '/' );
+
+ $filepath = '/' . $userId . '/files/' . $filePath;
+
+ // Check if sharing is enabled
+ if ( OC_App::isEnabled( 'files_sharing' ) ) {
+
+
+
+ } else {
+
+ // check if it is a file owned by the user and not shared at all
+ $userview = new \OC_FilesystemView( '/'.$userId.'/files/' );
+
+ if ( $userview->file_exists( $path ) ) {
+
+ $users[] = $userId;
+
+ }
+
+ }
+
+ $view = new \OC_FilesystemView( '/public-keys/' );
+
+ $keylist = array();
+
+ $count = 0;
+
+ foreach ( $users as $user ) {
+
+ $keylist['key'.++$count] = $view->file_get_contents( $user.'.public.key' );
+
+ }
+
+ return $keylist;
+
+ }
+
+ /**
+ * @brief store file encryption key
+ *
+ * @param string $path relative path of the file, including filename
+ * @param string $key
+ * @return bool true/false
+ * @note The keyfile is not encrypted here. Client code must
+ * asymmetrically encrypt the keyfile before passing it to this method
+ */
+ public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
+
+ $basePath = '/' . $userId . '/files_encryption/keyfiles';
+
+ $targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );
+
+ if ( $view->is_dir( $basePath . '/' . $targetPath ) ) {
+
+
+
+ } else {
+
+ // Save the keyfile in parallel directory
+ return $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
+
+ }
+
+ }
+
+ /**
+ * @brief retrieve keyfile for an encrypted file
+ * @param \OC_FilesystemView $view
+ * @param $userId
+ * @param $filePath
+ * @internal param \OCA\Encryption\file $string name
+ * @return string file key or false
+ * @note The keyfile returned is asymmetrically encrypted. Decryption
+ * of the keyfile must be performed by client code
+ */
+ public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
+
+ $filePath_f = ltrim( $filePath, '/' );
+
+ $catfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+
+ if ( $view->file_exists( $catfilePath ) ) {
+
+ return $view->file_get_contents( $catfilePath );
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief Delete a keyfile
+ *
+ * @param OC_FilesystemView $view
+ * @param string $userId username
+ * @param string $path path of the file the key belongs to
+ * @return bool Outcome of unlink operation
+ * @note $path must be relative to data/user/files. e.g. mydoc.txt NOT
+ * /data/admin/files/mydoc.txt
+ */
+ public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
+
+ $trimmed = ltrim( $path, '/' );
+ $keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed . '.key';
+
+ // Unlink doesn't tell us if file was deleted (not found returns
+ // true), so we perform our own test
+ if ( $view->file_exists( $keyPath ) ) {
+
+ return $view->unlink( $keyPath );
+
+ } else {
+
+ \OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
+
+ return false;
+
+ }
+
+ }
+
+ /**
+ * @brief store private key from the user
+ * @param string key
+ * @return bool
+ * @note Encryption of the private key must be performed by client code
+ * as no encryption takes place here
+ */
+ public static function setPrivateKey( $key ) {
+
+ $user = \OCP\User::getUser();
+
+ $view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
+
+ \OC_FileProxy::$enabled = false;
+
+ if ( !$view->file_exists( '' ) )
+ $view->mkdir( '' );
+
+ return $view->file_put_contents( $user . '.private.key', $key );
+
+ }
+
+ /**
+ * @brief store private keys from the user
+ *
+ * @param string privatekey
+ * @param string publickey
+ * @return bool true/false
+ */
+ public static function setUserKeys($privatekey, $publickey) {
+
+ return ( self::setPrivateKey( $privatekey ) && self::setPublicKey( $publickey ) );
+
+ }
+
+ /**
+ * @brief store public key of the user
+ *
+ * @param string key
+ * @return bool true/false
+ */
+ public static function setPublicKey( $key ) {
+
+ $view = new \OC_FilesystemView( '/public-keys' );
+
+ \OC_FileProxy::$enabled = false;
+
+ if ( !$view->file_exists( '' ) )
+ $view->mkdir( '' );
+
+ return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
+
+
+ }
+
+ /**
+ * @brief store file encryption key
+ *
+ * @param string $path relative path of the file, including filename
+ * @param string $key
+ * @param null $view
+ * @param string $dbClassName
+ * @return bool true/false
+ * @note The keyfile is not encrypted here. Client code must
+ * asymmetrically encrypt the keyfile before passing it to this method
+ */
+ public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
+
+ $basePath = '/' . $userId . '/files_encryption/share-keys';
+
+ $shareKeyPath = self::keySetPreparation( $view, $path, $basePath, $userId );
+
+ return $view->file_put_contents( $basePath . '/' . $shareKeyPath . '.shareKey', $shareKey );
+
+ }
+
+ /**
+ * @brief Make preparations to vars and filesystem for saving a keyfile
+ */
+ public static function keySetPreparation( \OC_FilesystemView $view, $path, $basePath, $userId ) {
+
+ $targetPath = ltrim( $path, '/' );
+
+ $path_parts = pathinfo( $targetPath );
+
+ // If the file resides within a subdirectory, create it
+ if (
+ isset( $path_parts['dirname'] )
+ && ! $view->file_exists( $basePath . '/' . $path_parts['dirname'] )
+ ) {
+
+ $view->mkdir( $basePath . '/' . $path_parts['dirname'] );
+
+ }
+
+ return $targetPath;
+
+ }
+
+ /**
+ * @brief Fetch the legacy encryption key from user files
+ * @param string $login used to locate the legacy key
+ * @param string $passphrase used to decrypt the legacy key
+ * @return true / false
+ *
+ * if the key is left out, the default handler will be used
+ */
+ public function getLegacyKey() {
+
+ $user = \OCP\User::getUser();
+ $view = new \OC_FilesystemView( '/' . $user );
+ return $view->file_get_contents( 'encryption.key' );
+
+ }
+
}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index d4b993b4c06..65d7d57a05a 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -173,7 +173,7 @@ class Stream {
// $count will always be 8192 https://bugs.php.net/bug.php?id=21641
// This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
- \OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', OCP\Util::FATAL );
+ \OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL );
die();
@@ -209,7 +209,7 @@ class Stream {
}
/**
- * @brief Encrypt and pad data ready for writting to disk
+ * @brief Encrypt and pad data ready for writing to disk
* @param string $plainData data to be encrypted
* @param string $key key to use for encryption
* @return encrypted data on success, false on failure
@@ -403,7 +403,7 @@ class Stream {
$encrypted = $this->preWriteEncrypt( $chunk, $this->keyfile );
// Write the data chunk to disk. This will be
- // addended to the last data chunk if the file
+ // attended to the last data chunk if the file
// being handled totals more than 6126 bytes
fwrite( $this->handle, $encrypted );
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 355ffb90ef0..52bc74db27a 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -69,11 +69,6 @@ class Util {
//// DONE: add method to fetch legacy key
//// DONE: add method to decrypt legacy encrypted data
- //// TODO: add method to encrypt all user files using new system
- //// TODO: add method to decrypt all user files using new system
- //// TODO: add method to encrypt all user files using old system
- //// TODO: add method to decrypt all user files using old system
-
// Admin UI:
@@ -93,7 +88,6 @@ class Util {
// Integration testing:
- //// TODO: test new encryption with webdav
//// TODO: test new encryption with versioning
//// TODO: test new encryption with sharing
//// TODO: test new encryption with proxies
@@ -278,7 +272,7 @@ class Util {
// will eat server resources :(
if (
Keymanager::getFileKey( $this->view, $this->userId, $file )
- && Crypt::isCatfile( $filePath )
+ && Crypt::isCatfile( $data )
) {
$found['encrypted'][] = array( 'name' => $file, 'path' => $filePath );
@@ -391,7 +385,6 @@ class Util {
}
- // FIXME: Legacy recrypting here isn't finished yet
// Encrypt legacy encrypted files
if (
! empty( $legacyPassphrase )
@@ -437,6 +430,11 @@ class Util {
}
+ /**
+ * @brief Return important encryption related paths
+ * @param string $pathName Name of the directory to return the path of
+ * @return string path
+ */
public function getPath( $pathName ) {
switch ( $pathName ) {
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 6fe4ea6d564..af0273cfdc4 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -12,8 +12,6 @@ $blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_b
$tmpl->assign( 'blacklist', $blackList );
-OCP\Util::addscript('files_encryption','settings-personal');
-
return $tmpl->fetchPage();
return null;
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 1f71efb1735..47467c52c08 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -16,7 +16,7 @@
-
+
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index 2eb61a738e3..6e277f67711 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,4 +1,5 @@
"Лозинка",
-"Submit" => "Пошаљи"
+"Submit" => "Пошаљи",
+"Download" => "Преузми"
);
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
new file mode 100644
index 00000000000..7a6bd1342ea
--- /dev/null
+++ b/apps/files_trashbin/ajax/delete.php
@@ -0,0 +1,24 @@
+ array("filename" => $file)));
+} else {
+ $l = OC_L10N::get('files_trashbin');
+ OCP\JSON::error(array("data" => array("message" => $l->t("Couldn't delete %s permanently", array($file)))));
+}
+
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index ee1c64aaaf2..cc010979c51 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -22,7 +22,7 @@ foreach ($list as $file) {
$timestamp = null;
}
- if ( !OCA_Trash\Trashbin::restore($file, $filename, $timestamp) ) {
+ if ( !OCA\Files_Trashbin\Trashbin::restore($file, $filename, $timestamp) ) {
$error[] = $filename;
} else {
$success[$i]['filename'] = $file;
@@ -37,8 +37,10 @@ if ( $error ) {
foreach ( $error as $e ) {
$filelist .= $e.', ';
}
- OCP\JSON::error(array("data" => array("message" => "Couldn't restore ".rtrim($filelist,', '), "success" => $success, "error" => $error)));
+ $l = OC_L10N::get('files_trashbin');
+ $message = $l->t("Couldn't restore %s", array(rtrim($filelist,', ')));
+ OCP\JSON::error(array("data" => array("message" => $message,
+ "success" => $success, "error" => $error)));
} else {
OCP\JSON::success(array("data" => array("success" => $success)));
}
-
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index 3741d42c781..b1a15cd13d1 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -1,7 +1,7 @@
';
+ deleteAction[0].outerHTML = newHTML;
+
+ $.post(OC.filePath('files_trashbin','ajax','delete.php'),
+ {file:tr.attr('data-file') },
+ function(result){
+ if ( result.status == 'success' ) {
+ var row = document.getElementById(result.data.filename);
+ row.parentNode.removeChild(row);
+ } else {
+ deleteAction[0].outerHTML = oldHTML;
+ OC.dialogs.alert(result.data.message, 'Error');
+ }
+ });
+
+ });
+
// Sets the select_all checkbox behaviour :
$('#select_all').click(function() {
if($(this).attr('checked')){
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index 3af33c8a310..803b0c81ef0 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -1,5 +1,8 @@
"No s'ha pogut esborrar permanentment %s",
+"Couldn't restore %s" => "No s'ha pogut restaurar %s",
"perform restore operation" => "executa l'operació de restauració",
+"delete file permanently" => "esborra el fitxer permanentment",
"Name" => "Nom",
"Deleted" => "Eliminat",
"1 folder" => "1 carpeta",
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index caaaea37436..eeb27784d3e 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -1,5 +1,8 @@
"Nelze trvale odstranit %s",
+"Couldn't restore %s" => "Nelze obnovit %s",
"perform restore operation" => "provést obnovu",
+"delete file permanently" => "trvale odstranit soubor",
"Name" => "Název",
"Deleted" => "Smazáno",
"1 folder" => "1 složka",
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 45e30d85a3b..e293bf0b2eb 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -1,5 +1,6 @@
"Führe die Wiederherstellung aus",
+"delete file permanently" => "Datei entgültig löschen",
"Name" => "Name",
"Deleted" => "Gelöscht",
"1 folder" => "1 Ordner",
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index b191ffc4246..c14b9776473 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -1,5 +1,8 @@
"No se puede eliminar %s permanentemente",
+"Couldn't restore %s" => "No se puede restaurar %s",
"perform restore operation" => "Restaurar",
+"delete file permanently" => "Eliminar archivo permanentemente",
"Name" => "Nombre",
"Deleted" => "Eliminado",
"1 folder" => "1 carpeta",
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index 51ade82d908..609b2fa9bd7 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -1,5 +1,8 @@
"Impossible d'effacer %s de façon permanente",
+"Couldn't restore %s" => "Impossible de restaurer %s",
"perform restore operation" => "effectuer l'opération de restauration",
+"delete file permanently" => "effacer définitivement le fichier",
"Name" => "Nom",
"Deleted" => "Effacé",
"1 folder" => "1 dossier",
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index 7def431a42a..8627682d088 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -1,5 +1,8 @@
"Impossibile eliminare %s definitivamente",
+"Couldn't restore %s" => "Impossibile ripristinare %s",
"perform restore operation" => "esegui operazione di ripristino",
+"delete file permanently" => "elimina il file definitivamente",
"Name" => "Nome",
"Deleted" => "Eliminati",
"1 folder" => "1 cartella",
diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php
index 0b4e1954e74..2bccf3f3bd5 100644
--- a/apps/files_trashbin/l10n/ja_JP.php
+++ b/apps/files_trashbin/l10n/ja_JP.php
@@ -1,5 +1,8 @@
"%s を完全に削除出来ませんでした",
+"Couldn't restore %s" => "%s を復元出来ませんでした",
"perform restore operation" => "復元操作を実行する",
+"delete file permanently" => "ファイルを完全に削除する",
"Name" => "名前",
"Deleted" => "削除済み",
"1 folder" => "1 フォルダ",
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index 017a8d285c0..5ecb99b9892 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -1,5 +1,8 @@
"Nevarēja pilnībā izdzēst %s",
+"Couldn't restore %s" => "Nevarēja atjaunot %s",
"perform restore operation" => "veikt atjaunošanu",
+"delete file permanently" => "dzēst datni pavisam",
"Name" => "Nosaukums",
"Deleted" => "Dzēsts",
"1 folder" => "1 mape",
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index 4efa6ecf662..a41a5c2fd9c 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -1,5 +1,6 @@
"uitvoeren restore operatie",
+"delete file permanently" => "verwijder bestanden definitief",
"Name" => "Naam",
"Deleted" => "Verwijderd",
"1 folder" => "1 map",
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index 23d739a2ff7..f6c85a6800e 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -1,7 +1,14 @@
"%s не может быть удалён навсегда",
+"Couldn't restore %s" => "%s не может быть восстановлен",
+"perform restore operation" => "выполнить операцию восстановления",
+"delete file permanently" => "удалить файл навсегда",
"Name" => "Имя",
+"Deleted" => "Удалён",
"1 folder" => "1 папка",
"{count} folders" => "{count} папок",
"1 file" => "1 файл",
-"{count} files" => "{count} файлов"
+"{count} files" => "{count} файлов",
+"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
+"Restore" => "Восстановить"
);
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 8ef2658cf24..c5b1408e2cc 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -3,5 +3,6 @@
"1 folder" => "1 папка",
"{count} folders" => "{количество} папок",
"1 file" => "1 файл",
-"{count} files" => "{количество} файлов"
+"{count} files" => "{количество} файлов",
+"Restore" => "Восстановить"
);
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index 81d43614d7b..759850783e2 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -1,5 +1,7 @@
"Nemožno obnoviť %s",
"perform restore operation" => "vykonať obnovu",
+"delete file permanently" => "trvalo zmazať súbor",
"Name" => "Meno",
"Deleted" => "Zmazané",
"1 folder" => "1 priečinok",
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index ca4dba04967..5bde85e7056 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -1,4 +1,5 @@
"utför återställning",
"Name" => "Namn",
"Deleted" => "Raderad",
"1 folder" => "1 mapp",
diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php
index d3bee105b51..d6a62d447b8 100644
--- a/apps/files_trashbin/lib/hooks.php
+++ b/apps/files_trashbin/lib/hooks.php
@@ -24,7 +24,7 @@
* This class contains all hooks.
*/
-namespace OCA_Trash;
+namespace OCA\Files_Trashbin;
class Hooks {
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index a7eff3d44e0..bc6562b2080 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -20,7 +20,7 @@
*
*/
-namespace OCA_Trash;
+namespace OCA\Files_Trashbin;
class Trashbin {
@@ -65,7 +65,7 @@ class Trashbin {
if ( \OCP\App::isEnabled('files_versions') ) {
if ( $view->is_dir('files_versions'.$file_path) ) {
$view->rename('files_versions'.$file_path, 'versions_trashbin/'. $deleted.'.d'.$timestamp);
- } else if ( $versions = \OCA_Versions\Storage::getVersions($file_path) ) {
+ } else if ( $versions = \OCA\Files_Versions\Storage::getVersions($file_path) ) {
foreach ($versions as $v) {
$view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'versions_trashbin/'. $deleted.'.v'.$v['version'].'.d'.$timestamp);
}
@@ -150,6 +150,45 @@ class Trashbin {
return false;
}
+ /**
+ * delete file from trash bin permanently
+ * @param $filename path to the file
+ * @param $timestamp of deletion time
+ * @return true/false
+ */
+ public static function delete($filename, $timestamp=null) {
+
+ $user = \OCP\User::getUser();
+ $view = new \OC_FilesystemView('/'.$user);
+
+ if ( $timestamp ) {
+ $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');
+ $query->execute(array($user,$filename,$timestamp));
+ $file = $filename.'.d'.$timestamp;
+ } else {
+ $file = $filename;
+ }
+
+ if ( \OCP\App::isEnabled('files_versions') ) {
+ if ($view->is_dir('versions_trashbin/'.$file)) {
+ $view->unlink('versions_trashbin/'.$file);
+ } else if ( $versions = self::getVersionsFromTrash($file, $timestamp) ) {
+ foreach ($versions as $v) {
+ if ($timestamp ) {
+ $view->unlink('versions_trashbin/'.$filename.'.v'.$v.'.d'.$timestamp);
+ } else {
+ $view->unlink('versions_trashbin/'.$file.'.v'.$v);
+ }
+ }
+ }
+ }
+
+ $view->unlink('/files_trashbin/'.$file);
+
+ return true;
+ }
+
+
/**
* clean up the trash bin
*/
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index c3e51b4becd..24e4a0e6c69 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -9,7 +9,7 @@
t('Nothing in here. Your trash bin is empty!')?>
-
+
+
+
+ *dbprefix*file_map
+
+
+
+
+ logic_path
+ text
+
+ true
+ 512
+
+
+
+ physic_path
+ text
+
+ true
+ 512
+
+
+
+ file_map_lp_index
+ true
+
+ logic_path
+ ascending
+
+
+
+
+ file_map_pp_index
+ true
+
+ physic_path
+ ascending
+
+
+
+
+
+
+
*dbprefix*mimetypes
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index cee3db1d1b3..b0c9bf67feb 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 17:00+0000\n"
-"Last-Translator: Jano Barnard \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +51,8 @@ msgid "No category to add?"
msgstr ""
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -156,59 +157,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Instellings"
-#: js/js.js:760
+#: js/js.js:764
msgid "seconds ago"
msgstr ""
-#: js/js.js:761
+#: js/js.js:765
msgid "1 minute ago"
msgstr ""
-#: js/js.js:762
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:763
+#: js/js.js:767
msgid "1 hour ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:765
+#: js/js.js:769
msgid "today"
msgstr ""
-#: js/js.js:766
+#: js/js.js:770
msgid "yesterday"
msgstr ""
-#: js/js.js:767
+#: js/js.js:771
msgid "{days} days ago"
msgstr ""
-#: js/js.js:768
+#: js/js.js:772
msgid "last month"
msgstr ""
-#: js/js.js:769
+#: js/js.js:773
msgid "{months} months ago"
msgstr ""
-#: js/js.js:770
+#: js/js.js:774
msgid "months ago"
msgstr ""
-#: js/js.js:771
+#: js/js.js:775
msgid "last year"
msgstr ""
-#: js/js.js:772
+#: js/js.js:776
msgid "years ago"
msgstr ""
@@ -467,7 +468,7 @@ msgstr ""
msgid "Add"
msgstr ""
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr ""
@@ -477,71 +478,75 @@ msgid ""
"OpenSSL extension."
msgstr ""
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr ""
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"For information how to properly configure your server, please see the documentation."
msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Skep `n admin-rekening"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Gevorderd"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr ""
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Stel databasis op"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "sal gebruik word"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Databasis-gebruiker"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Databasis-wagwoord"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Databasis naam"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr ""
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Maak opstelling klaar"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "webdienste onder jou beheer"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Teken uit"
@@ -571,6 +576,10 @@ msgstr "onthou"
msgid "Log in"
msgstr "Teken aan"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "vorige"
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index 3814f1cfa0c..43e9f26707c 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,46 +17,60 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr ""
@@ -68,11 +82,15 @@ msgstr ""
msgid "Unshare"
msgstr ""
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr ""
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr ""
@@ -177,31 +195,31 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr ""
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr ""
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr ""
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr ""
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index ca4278cffc8..6fd4dfb314f 100644
--- a/l10n/af_ZA/files_trashbin.po
+++ b/l10n/af_ZA/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr ""
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr ""
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr ""
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr ""
diff --git a/l10n/af_ZA/files_versions.po b/l10n/af_ZA/files_versions.po
index 6cb41d2c080..14eaae14745 100644
--- a/l10n/af_ZA/files_versions.po
+++ b/l10n/af_ZA/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME \n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,10 +17,45 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr ""
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index f621a8914be..a768c32d6cd 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 17:00+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr ""
@@ -45,10 +54,6 @@ msgstr ""
msgid "Unable to delete group"
msgstr ""
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr ""
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr ""
@@ -111,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr ""
@@ -188,67 +193,83 @@ msgstr ""
msgid "Download iOS Client"
msgstr ""
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Wagwoord"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr ""
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Nuwe wagwoord"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr ""
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr ""
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr ""
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr ""
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr ""
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr ""
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr ""
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -213,7 +213,7 @@ msgid "Use TLS"
msgstr ""
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
#: templates/settings.php:39
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 100a7f42a6e..f3cdb9f639c 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -52,8 +52,9 @@ msgid "No category to add?"
msgstr "ألا توجد فئة للإضافة؟"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "هذه الفئة موجودة مسبقاً"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "تشرين الثاني"
msgid "December"
msgstr "كانون الاول"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "تعديلات"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "منذ ثواني"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "منذ دقيقة"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "{minutes} منذ دقائق"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr ""
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "اليوم"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr ""
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr ""
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr ""
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr ""
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr ""
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr ""
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr ""
@@ -468,7 +469,7 @@ msgstr "عدل الفئات"
msgid "Add"
msgstr "أدخل"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "تحذير أمان"
@@ -478,71 +479,75 @@ msgid ""
"OpenSSL extension."
msgstr "لا يوجد مولّد أرقام عشوائية ، الرجاء تفعيل الـ PHP OpenSSL extension."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr ""
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"For information how to properly configure your server, please see the documentation."
msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "أضف مستخدم رئيسي "
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "خيارات متقدمة"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "مجلد المعلومات"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "أسس قاعدة البيانات"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "سيتم استخدمه"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "مستخدم قاعدة البيانات"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "كلمة سر مستخدم قاعدة البيانات"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "إسم قاعدة البيانات"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "مساحة جدول قاعدة البيانات"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "خادم قاعدة البيانات"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "انهاء التعديلات"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "خدمات الوب تحت تصرفك"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "الخروج"
@@ -564,14 +569,18 @@ msgstr "الرجاء إعادة تعيين كلمة السر لتأمين حسا
msgid "Lost your password?"
msgstr "هل نسيت كلمة السر؟"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "تذكر"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "أدخل"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "السابق"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index eefbee4f65e..ce179ab2fb8 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -18,46 +18,60 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "تم ترفيع الملفات بنجاح."
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "حجم الملف الذي تريد ترفيعه أعلى مما MAX_FILE_SIZE يسمح به في واجهة ال HTML."
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "لم يتم ترفيع أي من الملفات"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "المجلد المؤقت غير موجود"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr ""
@@ -69,11 +83,15 @@ msgstr "الملفات"
msgid "Unshare"
msgstr "إلغاء مشاركة"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "محذوف"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr ""
@@ -178,31 +196,31 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "الاسم"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "حجم"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "معدل"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr ""
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr ""
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr ""
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr ""
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index d892fd2a983..70c6ea95dde 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "اسم"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr ""
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr ""
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr ""
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr ""
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index 8224c627626..b915753cedc 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "السجل الزمني"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "أصدرة الملفات"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index c3a33123458..e3785a9b5a7 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -24,6 +24,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "فشل تحميل القائمة من الآب ستور"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "لم يتم التأكد من الشخصية بنجاح"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "المجموعة موجودة مسبقاً"
@@ -48,10 +57,6 @@ msgstr "البريد الإلكتروني غير صالح"
msgid "Unable to delete group"
msgstr "فشل إزالة المجموعة"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "لم يتم التأكد من الشخصية بنجاح"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "فشل إزالة المستخدم"
@@ -114,7 +119,7 @@ msgstr "خطأ"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "حفظ"
@@ -191,67 +196,83 @@ msgstr "تحميل عميل آندرويد"
msgid "Download iOS Client"
msgstr "تحميل عميل آي أو أس"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "كلمات السر"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "لقد تم تغيير كلمة السر"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "لم يتم تعديل كلمة السر بنجاح"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "كلمات السر الحالية"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "كلمات سر جديدة"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "أظهر"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "عدل كلمة السر"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "العنوان البريدي"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "عنوانك البريدي"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "اللغة"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "ساعد في الترجمه"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "إصدار"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -213,7 +213,7 @@ msgid "Use TLS"
msgstr ""
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
#: templates/settings.php:39
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 692a844f771..aaa4f3d190d 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -54,7 +54,8 @@ msgid "No category to add?"
msgstr ""
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -159,59 +160,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Настройки"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "преди секунди"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "преди 1 минута"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "преди 1 час"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "днес"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr ""
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "последният месец"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr ""
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr ""
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "последната година"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "последните години"
@@ -470,7 +471,7 @@ msgstr ""
msgid "Add"
msgstr "Добавяне"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr ""
@@ -480,71 +481,75 @@ msgid ""
"OpenSSL extension."
msgstr ""
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr ""
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"For information how to properly configure your server, please see the documentation."
msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr ""
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr ""
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr ""
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr ""
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr ""
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr ""
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr ""
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "уеб услуги под Ваш контрол"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr ""
@@ -566,14 +571,18 @@ msgstr ""
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr ""
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index b1a38c33dba..f4b6a8ca674 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -19,46 +19,60 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Липсва временна папка"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr ""
@@ -70,11 +84,15 @@ msgstr "Файлове"
msgid "Unshare"
msgstr ""
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Изтриване"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Преименуване"
@@ -179,31 +197,31 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Име"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Размер"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Променено"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr ""
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr ""
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr ""
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr ""
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 61fe9f67efc..cf5275530e1 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Име"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr ""
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr ""
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr ""
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr ""
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index be466434b93..c79f0e63842 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "История"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index f056463c578..4cef09976a2 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -24,6 +24,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Възникна проблем с идентификацията"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr ""
@@ -48,10 +57,6 @@ msgstr ""
msgid "Unable to delete group"
msgstr ""
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Възникна проблем с идентификацията"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr ""
@@ -114,7 +119,7 @@ msgstr "Грешка"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr ""
@@ -191,67 +196,83 @@ msgstr ""
msgid "Download iOS Client"
msgstr ""
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Парола"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr ""
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr ""
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr ""
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr ""
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr ""
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr ""
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr ""
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr ""
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -213,7 +213,7 @@ msgid "Use TLS"
msgstr ""
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
#: templates/settings.php:39
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 00bc3030b2f..6b0d2ba2698 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 13:58+0000\n"
-"Last-Translator: Shubhra Paul \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,8 +52,9 @@ msgid "No category to add?"
msgstr "যোগ করার মত কোন ক্যাটেগরি নেই ?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "এই ক্যাটেগরিটি পূর্ব থেকেই বিদ্যমানঃ"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "নভেম্বর"
msgid "December"
msgstr "ডিসেম্বর"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "নিয়ামকসমূহ"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "সেকেন্ড পূর্বে"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "1 মিনিট পূর্বে"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "{minutes} মিনিট পূর্বে"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "1 ঘন্টা পূর্বে"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "{hours} ঘন্টা পূর্বে"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "আজ"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "গতকাল"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "{days} দিন পূর্বে"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "গতমাস"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "{months} মাস পূর্বে"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "মাস পূর্বে"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "গত বছর"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "বছর পূর্বে"
@@ -468,7 +469,7 @@ msgstr "ক্যাটেগরি সম্পাদনা"
msgid "Add"
msgstr "যোগ কর"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "নিরাপত্তাজনিত সতর্কতা"
@@ -478,71 +479,75 @@ msgid ""
"OpenSSL extension."
msgstr ""
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr ""
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"For information how to properly configure your server, please see the documentation."
msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "প্রশাসক একাউন্ট তৈরী করুন"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "সুচারু"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "ডাটা ফোল্ডার "
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "ডাটাবেচ কনফিগার করুন"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "ব্যবহৃত হবে"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "ডাটাবেজ ব্যবহারকারী"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "ডাটাবেজ কূটশব্দ"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "ডাটাবেজের নাম"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "ডাটাবেজ টেবলস্পেস"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "ডাটাবেজ হোস্ট"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "সেটআপ সুসম্পন্ন কর"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "ওয়েব সার্ভিসের নিয়ন্ত্রণ আপনার হাতের মুঠোয়"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "প্রস্থান"
@@ -564,14 +569,18 @@ msgstr ""
msgid "Lost your password?"
msgstr "কূটশব্দ হারিয়েছেন?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "মনে রাখ"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "প্রবেশ"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "পূর্ববর্তী"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 8192e6fedfc..023ecf7d1e7 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -18,46 +18,60 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "কোন ফাইল আপলোড করা হয় নি। সমস্যা অজ্ঞাত।"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "কোন সমস্যা নেই, ফাইল আপলোড সুসম্পন্ন হয়েছে"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "আপলোড করা ফাইলটি php.ini তে বর্ণিত upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "আপলোড করা ফাইলটি HTML ফর্মে নির্ধারিত MAX_FILE_SIZE নির্দেশিত সর্বোচ্চ আকার অতিক্রম করেছে "
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "কোন ফাইল আপলোড করা হয় নি"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "অস্থায়ী ফোল্ডার খোয়া গিয়েছে"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "ডিস্কে লিখতে ব্যর্থ"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "ভুল ডিরেক্টরি"
@@ -69,11 +83,15 @@ msgstr "ফাইল"
msgid "Unshare"
msgstr "ভাগাভাগি বাতিল "
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "মুছে ফেল"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "পূনঃনামকরণ"
@@ -178,31 +196,31 @@ msgstr "URL ফাঁকা রাখা যাবে না।"
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud এর জন্য সংরক্ষিত।"
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "নাম"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "আকার"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "পরিবর্তিত"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "১টি ফোল্ডার"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} টি ফোল্ডার"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "১টি ফাইল"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} টি ফাইল"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index 8cb4d9688e8..ff75311f2f1 100644
--- a/l10n/bn_BD/files_trashbin.po
+++ b/l10n/bn_BD/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "রাম"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "১টি ফোল্ডার"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} টি ফোল্ডার"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "১টি ফাইল"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} টি ফাইল"
diff --git a/l10n/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po
index 2af1e4efdd9..3c072f78160 100644
--- a/l10n/bn_BD/files_versions.po
+++ b/l10n/bn_BD/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,45 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "ইতিহাস"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "ফাইল ভার্সন করা"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index e5911603308..946bd8cd254 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -22,6 +22,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "অনুমোদন ঘটিত সমস্যা"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান"
@@ -46,10 +55,6 @@ msgstr "ই-মেইলটি সঠিক নয়"
msgid "Unable to delete group"
msgstr "গোষ্ঠী মুছে ফেলা সম্ভব হলো না "
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "অনুমোদন ঘটিত সমস্যা"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না "
@@ -112,7 +117,7 @@ msgstr "সমস্যা"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "সংরক্ষণ করা হচ্ছে.."
@@ -189,67 +194,83 @@ msgstr "অ্যান্ড্রয়েড ক্লায়েন্ট ডা
msgid "Download iOS Client"
msgstr "iOS ক্লায়েন্ট ডাউনলোড করুন"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "কূটশব্দ"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে "
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "বর্তমান কূটশব্দ"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "নতুন কূটশব্দ"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "প্রদর্শন"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "কূটশব্দ পরিবর্তন করুন"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "ই-মেইল "
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "আপনার ই-মেইল ঠিকানা"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "ভাষা"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "অনুবাদ করতে সহায়তা করুন"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "আপনার ownCloud এ সংযুক্ত হতে এই ঠিকানাটি আপনার ফাইল ব্যবস্থাপকে ব্যবহার করুন"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "ভার্সন"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -213,8 +213,8 @@ msgid "Use TLS"
msgstr "TLS ব্যবহার কর"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "SSL সংযোগের জন্য এটি ব্যবহার করবেন না, তাহলে ব্যর্থ হবেনই।"
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 4c045d1fe1e..10f01f6ce35 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: rogerc \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -53,8 +53,9 @@ msgid "No category to add?"
msgstr "No voleu afegir cap categoria?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Aquesta categoria ja existeix:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Aquesta categoria ja existeix: %s"
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Desembre"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Arranjament"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "segons enrere"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "fa 1 minut"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "fa {minutes} minuts"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "fa 1 hora"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "fa {hours} hores"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "avui"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "ahir"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "fa {days} dies"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "el mes passat"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "fa {months} mesos"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "mesos enrere"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "l'any passat"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "anys enrere"
@@ -469,7 +470,7 @@ msgstr "Edita les categories"
msgid "Add"
msgstr "Afegeix"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Avís de seguretat"
@@ -479,71 +480,75 @@ msgid ""
"OpenSSL extension."
msgstr "No està disponible el generador de nombres aleatoris segurs, habiliteu l'extensió de PHP OpenSSL."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Sense un generador de nombres aleatoris segurs un atacant podria predir els senyals per restablir la contrasenya i prendre-us el compte."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "La carpeta de dades i els fitxers provablement són accessibles des d'internet. El fitxer .htaccess que proporciona ownCloud no funciona. Us recomanem que configureu el vostre servidor web de manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de la carpeta arrel del servidor web."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Crea un compte d'administrador"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Avançat"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Carpeta de dades"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Configura la base de dades"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "s'usarà"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Usuari de la base de dades"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Contrasenya de la base de dades"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Nom de la base de dades"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Espai de taula de la base de dades"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Ordinador central de la base de dades"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Acaba la configuració"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "controleu els vostres serveis web"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Surt"
@@ -565,14 +570,18 @@ msgstr "Canvieu la contrasenya de nou per assegurar el vostre compte."
msgid "Lost your password?"
msgstr "Heu perdut la contrasenya?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "recorda'm"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Inici de sessió"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Acreditacions alternatives"
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "anterior"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 758bde167ae..eb952e6f7c2 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 08:40+0000\n"
-"Last-Translator: rogerc \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,46 +24,60 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "No s'ha carregat cap fitxer. Error desconegut"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "El fitxer s'ha pujat correctament"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "El fitxer només s'ha pujat parcialment"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "El fitxer no s'ha pujat"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "S'ha perdut un fitxer temporal"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Ha fallat en escriure al disc"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "No hi ha prou espai disponible"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Directori no vàlid."
@@ -75,11 +89,15 @@ msgstr "Fitxers"
msgid "Unshare"
msgstr "Deixa de compartir"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Esborra permanentment"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Suprimeix"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Reanomena"
@@ -184,31 +202,31 @@ msgstr "La URL no pot ser buida"
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Nom"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Mida"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 carpeta"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} carpetes"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 fitxer"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} fitxers"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index c5cc2dc2b4a..481b00ceee9 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 07:20+0000\n"
+"Last-Translator: rogerc \n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,15 +47,15 @@ msgstr "Encriptatge"
#: templates/settings-personal.php:7
msgid "File encryption is enabled."
-msgstr ""
+msgstr "L'encriptació de fitxers està activada."
#: templates/settings-personal.php:11
msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Els tipus de fitxers següents no s'encriptaran:"
#: templates/settings.php:7
msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Exclou els tipus de fitxers següents de l'encriptatge:"
#: templates/settings.php:12
msgid "None"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 3bb530ebc63..4c5e094e6d5 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 15:22+0000\n"
+"Last-Translator: rogerc \n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,31 +18,45 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "No s'ha pogut esborrar permanentment %s"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "No s'ha pogut restaurar %s"
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr "executa l'operació de restauració"
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "esborra el fitxer permanentment"
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Nom"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr "Eliminat"
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 carpeta"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} carpetes"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 fitxer"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} fitxers"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index 0db50601e4c..43021a3304d 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.po
@@ -4,14 +4,15 @@
#
# Translators:
# , 2012.
+# , 2013.
# , 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 15:40+0000\n"
+"Last-Translator: rogerc \n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +20,45 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "No s'ha pogut revertir: %s"
+
+#: history.php:40
+msgid "success"
+msgstr "èxit"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "El fitxer %s s'ha revertit a la versió %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "fallada"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "El fitxer %s no s'ha pogut revertir a la versió %s"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "No hi ha versións antigues disponibles"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "No heu especificat el camí"
+
#: js/versions.js:16
msgid "History"
msgstr "Historial"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "Reverteix un fitxer a una versió anterior fent clic en el seu botó de reverteix"
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Fitxers de Versions"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 4ad389d707e..3234dabdadf 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 16:48+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 15:20+0000\n"
"Last-Translator: rogerc \n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -27,6 +27,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "No s'ha pogut carregar la llista des de l'App Store"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Error d'autenticació"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "No s'ha pogut canviar el nom a mostrar"
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "El grup ja existeix"
@@ -51,10 +60,6 @@ msgstr "El correu electrònic no és vàlid"
msgid "Unable to delete group"
msgstr "No es pot eliminar el grup"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Error d'autenticació"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "No es pot eliminar l'usuari"
@@ -117,7 +122,7 @@ msgstr "Error"
msgid "Updated"
msgstr "Actualitzada"
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "S'està desant..."
@@ -194,67 +199,83 @@ msgstr " Baixa el client per Android"
msgid "Download iOS Client"
msgstr "Baixa el client per iOS"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Contrasenya"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "La seva contrasenya s'ha canviat"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "No s'ha pogut canviar la contrasenya"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Contrasenya actual"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Contrasenya nova"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "mostra"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Canvia la contrasenya"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Nom a mostrar"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "El vostre nom a mostrar ha canviat"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "No s'ha pogut canviar el vostre nom a mostrar"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Canvia el nom a mostrar"
+
+#: templates/personal.php:55
msgid "Email"
msgstr "Correu electrònic"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Correu electrònic"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Ajudeu-nos amb la traducció"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Versió"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -215,8 +215,8 @@ msgid "Use TLS"
msgstr "Usa TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "No ho useu en connexions SSL, fallarà."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr "No ho useu adicionalment per a conexions LDAPS, fallarà."
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 1f2c45b65f5..65f55a38758 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: Tomáš Chvátal \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -54,8 +54,9 @@ msgid "No category to add?"
msgstr "Žádná kategorie k přidání?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Tato kategorie již existuje: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Kategorie již existuje: %s"
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -159,59 +160,59 @@ msgstr "Listopad"
msgid "December"
msgstr "Prosinec"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Nastavení"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "před pár vteřinami"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "před minutou"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "před {minutes} minutami"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "před hodinou"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "před {hours} hodinami"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "dnes"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "včera"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "před {days} dny"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "minulý mesíc"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "před {months} měsíci"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "před měsíci"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "před lety"
@@ -470,7 +471,7 @@ msgstr "Upravit kategorie"
msgid "Add"
msgstr "Přidat"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Bezpečnostní upozornění"
@@ -480,71 +481,75 @@ msgid ""
"OpenSSL extension."
msgstr "Není dostupný žádný bezpečný generátor náhodných čísel. Povolte, prosím, rozšíření OpenSSL v PHP."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Bez bezpečného generátoru náhodných čísel může útočník předpovědět token pro obnovu hesla a převzít kontrolu nad Vaším účtem."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Váš adresář dat a všechny Vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess, který je poskytován ownCloud, nefunguje. Důrazně Vám doporučujeme nastavit váš webový server tak, aby nebyl adresář dat přístupný, nebo přesunout adresář dat mimo kořenovou složku dokumentů webového serveru."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Vytvořit účet správce"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Pokročilé"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Složka s daty"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Nastavit databázi"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "bude použito"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Uživatel databáze"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Heslo databáze"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Název databáze"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Tabulkový prostor databáze"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Hostitel databáze"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Dokončit nastavení"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "webové služby pod Vaší kontrolou"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Odhlásit se"
@@ -566,14 +571,18 @@ msgstr "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účt
msgid "Lost your password?"
msgstr "Ztratili jste své heslo?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "zapamatovat si"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Přihlásit"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Alternativní přihlášení"
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "předchozí"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 36e541de84c..16812c71df7 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:40+0000\n"
-"Last-Translator: Tomáš Chvátal \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,46 +20,60 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Soubor nebyl odeslán. Neznámá chyba"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Soubor byl odeslán úspěšně"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný v formuláři HTML"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Soubor byl odeslán pouze částečně"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Žádný soubor nebyl odeslán"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Chybí adresář pro dočasné soubory"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Zápis na disk selhal"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Nedostatek dostupného místa"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Neplatný adresář"
@@ -71,11 +85,15 @@ msgstr "Soubory"
msgid "Unshare"
msgstr "Zrušit sdílení"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Trvale odstranit"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Smazat"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Přejmenovat"
@@ -180,31 +198,31 @@ msgstr "URL nemůže být prázdná"
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřní potřeby Owncloud"
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Název"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Velikost"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Změněno"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 složka"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} složky"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 soubor"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} soubory"
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 2df7a8af809..ea06c00d305 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 09:51+0000\n"
+"Last-Translator: Tomáš Chvátal \n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,15 +47,15 @@ msgstr "Šifrování"
#: templates/settings-personal.php:7
msgid "File encryption is enabled."
-msgstr ""
+msgstr "Šifrování je povoleno."
#: templates/settings-personal.php:11
msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Následující typy souborů nebudou šifrovány:"
#: templates/settings.php:7
msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Vyjmout následující typy souborů ze šifrování:"
#: templates/settings.php:12
msgid "None"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index 29c424b5de7..5055b347339 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 06:40+0000\n"
+"Last-Translator: Tomáš Chvátal \n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,31 +18,45 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "Nelze trvale odstranit %s"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "Nelze obnovit %s"
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr "provést obnovu"
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "trvale odstranit soubor"
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Název"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr "Smazáno"
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 složka"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} složky"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 soubor"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} soubory"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 3e62a18ee40..928ac501c8a 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -4,14 +4,14 @@
#
# Translators:
# Martin , 2012.
-# Tomáš Chvátal , 2012.
+# Tomáš Chvátal , 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 06:40+0000\n"
+"Last-Translator: Tomáš Chvátal \n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,45 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "Nelze navrátit: %s"
+
+#: history.php:40
+msgid "success"
+msgstr "úspěch"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "Soubor %s byl navrácen na verzi %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "sehlhání"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "Soubor %s nemohl být navrácen na verzi %s"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "Nejsou dostupné žádné starší verze"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Nezadána cesta"
+
#: js/versions.js:16
msgid "History"
msgstr "Historie"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "Navraťte soubor do předchozí verze kliknutím na tlačítko navrátit"
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Verzování souborů"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index c232c3b36df..edfcef8add0 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 08:10+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 12:41+0000\n"
"Last-Translator: Tomáš Chvátal \n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -27,6 +27,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Nelze načíst seznam z App Store"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Chyba ověření"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Nelze změnit zobrazované jméno"
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "Skupina již existuje"
@@ -51,10 +60,6 @@ msgstr "Neplatný e-mail"
msgid "Unable to delete group"
msgstr "Nelze smazat skupinu"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Chyba ověření"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Nelze smazat uživatele"
@@ -117,7 +122,7 @@ msgstr "Chyba"
msgid "Updated"
msgstr "Aktualizováno"
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Ukládám..."
@@ -194,67 +199,83 @@ msgstr "Stáhnout klienta pro android"
msgid "Download iOS Client"
msgstr "Stáhnout klienta pro iOS"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Heslo"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "Vaše heslo bylo změněno"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Vaše heslo nelze změnit"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Současné heslo"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Nové heslo"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "zobrazit"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Změnit heslo"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Zobrazované jméno"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Vaše zobrazované jméno bylo změněno"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Nelze změnit vaše zobrazované jméno"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Změnit zobrazované jméno"
+
+#: templates/personal.php:55
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Vaše e-mailová adresa"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Pro povolení změny hesla vyplňte adresu e-mailu"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Jazyk"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Pomoci s překladem"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Verze"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -215,8 +215,8 @@ msgid "Use TLS"
msgstr "Použít TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Nepoužívejte pro připojení pomocí SSL, připojení selže."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr "Nepoužívejte pro spojení LDAP, selže."
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index d3a5c7d2f98..7ac480d339f 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -59,8 +59,9 @@ msgid "No category to add?"
msgstr "Ingen kategori at tilføje?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Denne kategori eksisterer allerede: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -164,59 +165,59 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Indstillinger"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "1 minut siden"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "{minutes} minutter siden"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "1 time siden"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "{hours} timer siden"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "i dag"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "i går"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "{days} dage siden"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "sidste måned"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "{months} måneder siden"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "sidste år"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "år siden"
@@ -475,7 +476,7 @@ msgstr "Rediger kategorier"
msgid "Add"
msgstr "Tilføj"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Sikkerhedsadvarsel"
@@ -485,71 +486,75 @@ msgid ""
"OpenSSL extension."
msgstr "Ingen sikker tilfældighedsgenerator til tal er tilgængelig. Aktiver venligst OpenSSL udvidelsen."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Uden en sikker tilfældighedsgenerator til tal kan en angriber måske gætte dit gendan kodeord og overtage din konto"
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen som ownCloud leverer virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver på en måske så data mappen ikke længere er tilgængelig eller at du flytter data mappen uden for webserverens dokument rod. "
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Opret en administratorkonto"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Avanceret"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Datamappe"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Konfigurer databasen"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "vil blive brugt"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Databasebruger"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Databasekodeord"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Navn på database"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Database tabelplads"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Databasehost"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Afslut opsætning"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "Webtjenester under din kontrol"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Log ud"
@@ -571,14 +576,18 @@ msgstr "Skift adgangskode for at sikre din konto igen."
msgid "Lost your password?"
msgstr "Mistet dit kodeord?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "husk"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Log ind"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "forrige"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 2768aaf4490..faeb92854c3 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -25,46 +25,60 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Ingen fil blev uploadet. Ukendt fejl."
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Der er ingen fejl, filen blev uploadet med success"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Den uploadede file blev kun delvist uploadet"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Ingen fil blev uploadet"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Mangler en midlertidig mappe"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Fejl ved skrivning til disk."
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Ugyldig mappe."
@@ -76,11 +90,15 @@ msgstr "Filer"
msgid "Unshare"
msgstr "Fjern deling"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Slet"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Omdøb"
@@ -185,31 +203,31 @@ msgstr "URLen kan ikke være tom."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Navn"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Ændret"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 mappe"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 fil"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} filer"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 34a7ae71319..107b90ea909 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Navn"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 mappe"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 fil"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} filer"
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 847d3bda8aa..6ae8e6b45e6 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,45 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "Historik"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionering af filer"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 297100e94e2..b2be1f63796 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -31,6 +31,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Kunne ikke indlæse listen fra App Store"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Adgangsfejl"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "Gruppen findes allerede"
@@ -55,10 +64,6 @@ msgstr "Ugyldig email adresse"
msgid "Unable to delete group"
msgstr "Gruppen kan ikke slettes"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Adgangsfejl"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Bruger kan ikke slettes"
@@ -121,7 +126,7 @@ msgstr "Fejl"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Gemmer..."
@@ -198,67 +203,83 @@ msgstr "Hent Android Klient"
msgid "Download iOS Client"
msgstr "Hent iOS Klient"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Kodeord"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "Din adgangskode blev ændret"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Ude af stand til at ændre dit kodeord"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Nuværende adgangskode"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Ny adgangskode"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "vis"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Skift kodeord"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "Email"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Din emailadresse"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Sprog"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Hjælp med oversættelsen"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Version"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -218,8 +218,8 @@ msgid "Use TLS"
msgstr "Brug TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Brug ikke til SSL forbindelser, da den vil fejle."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index b46bf407176..eb62f53acad 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -23,8 +23,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 00:10+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -66,8 +66,9 @@ msgid "No category to add?"
msgstr "Keine Kategorie hinzuzufügen?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Kategorie existiert bereits:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -171,59 +172,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "vor einer Minute"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "Vor {minutes} Minuten"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "Vor einer Stunde"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "Vor {hours} Stunden"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "Heute"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "Vor {days} Tag(en)"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "Vor {months} Monaten"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "Vor Jahren"
@@ -482,7 +483,7 @@ msgstr "Kategorien bearbeiten"
msgid "Add"
msgstr "Hinzufügen"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Sicherheitswarnung"
@@ -492,71 +493,75 @@ msgid ""
"OpenSSL extension."
msgstr "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere die PHP-Erweiterung für OpenSSL."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Konten zu übernehmen."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass du deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass du dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Administrator-Konto anlegen"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Fortgeschritten"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Datenverzeichnis"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Datenbank einrichten"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "wird verwendet"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Datenbank-Benutzer"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Datenbank-Passwort"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Datenbank-Name"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Datenbank-Tablespace"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Datenbank-Host"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Installation abschließen"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "Web-Services unter Ihrer Kontrolle"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Abmelden"
@@ -578,14 +583,18 @@ msgstr "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen."
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "merken"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Einloggen"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "Zurück"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 06930bfca5c..a016e0c1074 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -28,8 +28,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 00:10+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -38,46 +38,60 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Datei fehlerfrei hochgeladen."
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Die Datei wurde nur teilweise hochgeladen."
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Es wurde keine Datei hochgeladen."
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Temporärer Ordner fehlt."
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Fehler beim Schreiben auf die Festplatte"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Nicht genug Speicherplatz verfügbar"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Ungültiges Verzeichnis."
@@ -89,11 +103,15 @@ msgstr "Dateien"
msgid "Unshare"
msgstr "Nicht mehr freigeben"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Löschen"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Umbenennen"
@@ -198,31 +216,31 @@ msgstr "Die URL darf nicht leer sein."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten."
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Name"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Größe"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Bearbeitet"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 Ordner"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 Datei"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} Dateien"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index ae8505b00e4..b9692802ff3 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -19,31 +19,45 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr "Wiederherstellung ausführen"
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Name"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr "gelöscht"
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 Ordner"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 Datei"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} Dateien"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index a3e251c142c..e969e096065 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -22,10 +22,45 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "Historie"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Dateiversionierung"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 25f769704b0..701892688ca 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -26,8 +26,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -40,6 +40,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Fehler bei der Anmeldung"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "Gruppe existiert bereits"
@@ -64,10 +73,6 @@ msgstr "Ungültige E-Mail Adresse"
msgid "Unable to delete group"
msgstr "Gruppe konnte nicht gelöscht werden"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Fehler bei der Anmeldung"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Benutzer konnte nicht gelöscht werden"
@@ -130,7 +135,7 @@ msgstr "Fehler"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Speichern..."
@@ -207,67 +212,83 @@ msgstr "Android-Client herunterladen"
msgid "Download iOS Client"
msgstr "iOS-Client herunterladen"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Passwort"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "Dein Passwort wurde geändert."
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Passwort konnte nicht geändert werden"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Aktuelles Passwort"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Neues Passwort"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "zeigen"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "E-Mail"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Deine E-Mail-Adresse"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Hilf bei der Übersetzung"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Version"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -222,8 +222,8 @@ msgid "Use TLS"
msgstr "Nutze TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Verwende dies nicht für SSL-Verbindungen, es wird fehlschlagen."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 9ec9f4bed29..c67c4205fbf 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -18,14 +18,15 @@
# , 2012.
# Phi Lieb <>, 2012.
# , 2013.
+# Susi <>, 2013.
# , 2012.
# , 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -67,8 +68,9 @@ msgid "No category to add?"
msgstr "Keine Kategorie hinzuzufügen?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Kategorie existiert bereits:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Die Kategorie '%s' existiert bereits."
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -172,59 +174,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "Vor 1 Minute"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "Vor {minutes} Minuten"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "Vor einer Stunde"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "Vor {hours} Stunden"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "Heute"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "Vor {days} Tag(en)"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "Vor {months} Monaten"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "Vor Jahren"
@@ -483,7 +485,7 @@ msgstr "Kategorien bearbeiten"
msgid "Add"
msgstr "Hinzufügen"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Sicherheitshinweis"
@@ -493,71 +495,75 @@ msgid ""
"OpenSSL extension."
msgstr "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Internet erreichbar. Die von ownCloud bereitgestellte .htaccess Datei funktioniert nicht. Wir empfehlen Ihnen dringend, Ihren Webserver so zu konfigurieren, dass das Datenverzeichnis nicht mehr über das Internet erreichbar ist. Alternativ können Sie auch das Datenverzeichnis aus dem Dokumentenverzeichnis des Webservers verschieben."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Administrator-Konto anlegen"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Fortgeschritten"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Datenverzeichnis"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Datenbank einrichten"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "wird verwendet"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Datenbank-Benutzer"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Datenbank-Passwort"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Datenbank-Name"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Datenbank-Tablespace"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Datenbank-Host"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Installation abschließen"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "Web-Services unter Ihrer Kontrolle"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Abmelden"
@@ -579,14 +585,18 @@ msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "merken"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Einloggen"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Alternative Logins"
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "Zurück"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 474d7e5ab28..4ff85767805 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -22,6 +22,7 @@
# Phi Lieb <>, 2012.
# Phillip Schichtel , 2013.
# , 2013.
+# Susi <>, 2013.
# , 2012.
# Thomas Müller <>, 2012.
# , 2012.
@@ -29,9 +30,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 19:21+0000\n"
-"Last-Translator: quick_wango \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -39,46 +40,60 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Die Datei wurde nur teilweise hochgeladen."
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Es wurde keine Datei hochgeladen."
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Der temporäre Ordner fehlt."
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Fehler beim Schreiben auf die Festplatte"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Nicht genügend Speicherplatz verfügbar"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Ungültiges Verzeichnis."
@@ -90,11 +105,15 @@ msgstr "Dateien"
msgid "Unshare"
msgstr "Nicht mehr freigeben"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Entgültig löschen"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Löschen"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Umbenennen"
@@ -199,31 +218,31 @@ msgstr "Die URL darf nicht leer sein."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten"
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Name"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Größe"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Bearbeitet"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 Ordner"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 Datei"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} Dateien"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index 8d49245d9f5..af3fe444bfe 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -8,13 +8,14 @@
# , 2012.
# Marc-Andre Husyk , 2013.
# Marcel Kühlhorn , 2013.
+# Susi <>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-08 00:09+0100\n"
+"PO-Revision-Date: 2013-02-07 08:20+0000\n"
+"Last-Translator: Susi <>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,15 +51,15 @@ msgstr "Verschlüsselung"
#: templates/settings-personal.php:7
msgid "File encryption is enabled."
-msgstr ""
+msgstr "Datei-Verschlüsselung ist aktiviert"
#: templates/settings-personal.php:11
msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Die folgenden Datei-Typen werden nicht verschlüsselt:"
#: templates/settings.php:7
msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Die folgenden Datei-Typen von der Verschlüsselung ausnehmen:"
#: templates/settings.php:12
msgid "None"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index f08dcbd0043..755e0968dbd 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -5,12 +5,13 @@
# Translators:
# I Robot , 2013.
# Phillip Schichtel , 2013.
+# Susi <>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -19,31 +20,45 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr "Führe die Wiederherstellung aus"
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "Datei entgültig löschen"
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Name"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr "Gelöscht"
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 Ordner"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 Datei"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} Dateien"
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index bef0ee6b762..e6c6d61cb21 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -6,15 +6,16 @@
# , 2012.
# I Robot , 2012.
# , 2012.
+# , 2013.
# , 2012.
# , 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 12:20+0000\n"
+"Last-Translator: JamFX \n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,10 +23,45 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr "Erfolgreich"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr "Fehlgeschlagen"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "keine älteren Versionen verfügbar"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Kein Pfad angegeben"
+
#: js/versions.js:16
msgid "History"
msgstr "Historie"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Dateiversionierung"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index ffbcc368ff6..e198138298e 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -20,6 +20,7 @@
# Phillip Schichtel , 2013.
# , 2012.
# , 2013.
+# Susi <>, 2013.
# , 2012.
# , 2012.
# , 2012.
@@ -28,9 +29,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 00:10+0000\n"
-"Last-Translator: Lukas Reschke \n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 08:10+0000\n"
+"Last-Translator: Susi <>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -42,6 +43,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Fehler bei der Anmeldung"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Das Ändern des Anzeigenamens ist nicht möglich"
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "Die Gruppe existiert bereits"
@@ -66,10 +76,6 @@ msgstr "Ungültige E-Mail-Adresse"
msgid "Unable to delete group"
msgstr "Die Gruppe konnte nicht gelöscht werden"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Fehler bei der Anmeldung"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Der Benutzer konnte nicht gelöscht werden"
@@ -132,7 +138,7 @@ msgstr "Fehler"
msgid "Updated"
msgstr "Geupdated"
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Speichern..."
@@ -209,67 +215,83 @@ msgstr "Android-Client herunterladen"
msgid "Download iOS Client"
msgstr "iOS-Client herunterladen"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Passwort"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "Ihr Passwort wurde geändert."
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Das Passwort konnte nicht geändert werden"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Aktuelles Passwort"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Neues Passwort"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "zeigen"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Passwort ändern"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Dein Anzeigename wurde geändert"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Das Ändern deines Anzeigenamens ist nicht möglich"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Anzeigenamen ändern"
+
+#: templates/personal.php:55
msgid "Email"
msgstr "E-Mail"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Ihre E-Mail-Adresse"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Sprache"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Helfen Sie bei der Übersetzung"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Version"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -224,8 +224,8 @@ msgid "Use TLS"
msgstr "Nutze TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Verwenden Sie dies nicht für SSL-Verbindungen, es wird fehlschlagen."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 1f2543369b0..6947ca9a5cf 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -58,8 +58,9 @@ msgid "No category to add?"
msgstr "Δεν έχετε κατηγορία να προσθέσετε;"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Αυτή η κατηγορία υπάρχει ήδη:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -163,59 +164,59 @@ msgstr "Νοέμβριος"
msgid "December"
msgstr "Δεκέμβριος"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "1 λεπτό πριν"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "{minutes} λεπτά πριν"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "1 ώρα πριν"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "{hours} ώρες πριν"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "σήμερα"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "χτες"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "{days} ημέρες πριν"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "τελευταίο μήνα"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "{months} μήνες πριν"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "μήνες πριν"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "τελευταίο χρόνο"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "χρόνια πριν"
@@ -474,7 +475,7 @@ msgstr "Επεξεργασία κατηγοριών"
msgid "Add"
msgstr "Προσθήκη"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Προειδοποίηση Ασφαλείας"
@@ -484,71 +485,75 @@ msgid ""
"OpenSSL extension."
msgstr "Δεν είναι διαθέσιμο το πρόσθετο δημιουργίας τυχαίων αριθμών ασφαλείας, παρακαλώ ενεργοποιήστε το πρόσθετο της PHP, OpenSSL."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Χωρίς το πρόσθετο δημιουργίας τυχαίων αριθμών ασφαλείας, μπορεί να διαρρεύσει ο λογαριασμός σας από επιθέσεις στο διαδίκτυο."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Δημιουργήστε έναν λογαριασμό διαχειριστή"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Για προχωρημένους"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Φάκελος δεδομένων"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Ρύθμιση της βάσης δεδομένων"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "θα χρησιμοποιηθούν"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Χρήστης της βάσης δεδομένων"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Συνθηματικό βάσης δεδομένων"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Όνομα βάσης δεδομένων"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Κενά Πινάκων Βάσης Δεδομένων"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Διακομιστής βάσης δεδομένων"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Ολοκλήρωση εγκατάστασης"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "Υπηρεσίες web υπό τον έλεγχό σας"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Αποσύνδεση"
@@ -570,14 +575,18 @@ msgstr "Παρακαλώ αλλάξτε το συνθηματικό σας γι
msgid "Lost your password?"
msgstr "Ξεχάσατε το συνθηματικό σας;"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "απομνημόνευση"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Είσοδος"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "προηγούμενο"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 233012d37cb..8466d5bc77a 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -25,46 +25,60 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Δεν υπάρχει σφάλμα, το αρχείο εστάλει επιτυχώς"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Το απεσταλμένο αρχείο ξεπερνά την οδηγία upload_max_filesize στο php.ini:"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Το αρχείο υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"MAX_FILE_SIZE\" που έχει οριστεί στην HTML φόρμα"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Το αρχείο εστάλει μόνο εν μέρει"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Κανένα αρχείο δεν στάλθηκε"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Λείπει ο προσωρινός φάκελος"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Αποτυχία εγγραφής στο δίσκο"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Μη έγκυρος φάκελος."
@@ -76,11 +90,15 @@ msgstr "Αρχεία"
msgid "Unshare"
msgstr "Διακοπή κοινής χρήσης"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Διαγραφή"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Μετονομασία"
@@ -185,31 +203,31 @@ msgstr "Η URL δεν πρέπει να είναι κενή."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Όνομα"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Μέγεθος"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Τροποποιήθηκε"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 φάκελος"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} φάκελοι"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 αρχείο"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} αρχεία"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index e29ec4d6caf..27cd5e21b4c 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Όνομα"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 φάκελος"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} φάκελοι"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 αρχείο"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} αρχεία"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index 3812c4bda0d..7f82eaf81c7 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,45 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "Ιστορικό"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Εκδόσεις Αρχείων"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index ffd6028e9c1..c6c5dfb10f0 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -33,6 +33,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Σφάλμα στην φόρτωση της λίστας από το App Store"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Σφάλμα πιστοποίησης"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "Η ομάδα υπάρχει ήδη"
@@ -57,10 +66,6 @@ msgstr "Μη έγκυρο email"
msgid "Unable to delete group"
msgstr "Αδυναμία διαγραφής ομάδας"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Σφάλμα πιστοποίησης"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Αδυναμία διαγραφής χρήστη"
@@ -123,7 +128,7 @@ msgstr "Σφάλμα"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Αποθήκευση..."
@@ -200,67 +205,83 @@ msgstr "Λήψη Προγράμματος Android"
msgid "Download iOS Client"
msgstr "Λήψη Προγράμματος iOS"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Συνθηματικό"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "Το συνθηματικό σας έχει αλλάξει"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Τρέχων συνθηματικό"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Νέο συνθηματικό"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "εμφάνιση"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Αλλαγή συνθηματικού"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "Email"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Γλώσσα"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Βοηθήστε στη μετάφραση"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Έκδοση"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -218,8 +218,8 @@ msgid "Use TLS"
msgstr "Χρήση TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Μην χρησιμοποιείτε για συνδέσεις SSL, θα αποτύχει."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index f9f3c0cd8f2..15f0635aa27 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -53,8 +53,9 @@ msgid "No category to add?"
msgstr "Ĉu neniu kategorio estas aldonota?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Ĉi tiu kategorio jam ekzistas: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "Novembro"
msgid "December"
msgstr "Decembro"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Agordo"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "sekundoj antaŭe"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "antaŭ 1 minuto"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "antaŭ {minutes} minutoj"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "antaŭ 1 horo"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "antaŭ {hours} horoj"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "hodiaŭ"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "hieraŭ"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "antaŭ {days} tagoj"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "lastamonate"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "antaŭ {months} monatoj"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "monatoj antaŭe"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "lastajare"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "jaroj antaŭe"
@@ -469,7 +470,7 @@ msgstr "Redakti kategoriojn"
msgid "Add"
msgstr "Aldoni"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Sekureca averto"
@@ -479,71 +480,75 @@ msgid ""
"OpenSSL extension."
msgstr "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr ""
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"For information how to properly configure your server, please see the documentation."
msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Krei administran konton"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Progresinta"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Datuma dosierujo"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Agordi la datumbazon"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "estos uzata"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Datumbaza uzanto"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Datumbaza pasvorto"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Datumbaza nomo"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Datumbaza tabelospaco"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Datumbaza gastigo"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Fini la instalon"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "TTT-servoj sub via kontrolo"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Elsaluti"
@@ -565,14 +570,18 @@ msgstr "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree."
msgid "Lost your password?"
msgstr "Ĉu vi perdis vian pasvorton?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "memori"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Ensaluti"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "maljena"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index d4406185134..139cd4a827f 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -20,46 +20,60 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: "
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "La alŝutita dosiero nur parte alŝutiĝis"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Neniu dosiero estas alŝutita"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Mankas tempa dosierujo"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Malsukcesis skribo al disko"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Ne haveblas sufiĉa spaco"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Nevalida dosierujo."
@@ -71,11 +85,15 @@ msgstr "Dosieroj"
msgid "Unshare"
msgstr "Malkunhavigi"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Forigi"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Alinomigi"
@@ -180,31 +198,31 @@ msgstr "URL ne povas esti malplena."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Nomo"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Grando"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Modifita"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 dosierujo"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} dosierujoj"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 dosiero"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} dosierujoj"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index c1491a33446..407ed42d6da 100644
--- a/l10n/eo/files_trashbin.po
+++ b/l10n/eo/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Nomo"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 dosierujo"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} dosierujoj"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 dosiero"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} dosierujoj"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index 53a59b49120..6e7f83b9ade 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "Historio"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Dosiereldonigo"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index f422c123005..d48c43e7b6f 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -24,6 +24,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ne eblis ŝargi liston el aplikaĵovendejo"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Aŭtentiga eraro"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "La grupo jam ekzistas"
@@ -48,10 +57,6 @@ msgstr "Nevalida retpoŝtadreso"
msgid "Unable to delete group"
msgstr "Ne eblis forigi la grupon"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Aŭtentiga eraro"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Ne eblis forigi la uzanton"
@@ -114,7 +119,7 @@ msgstr "Eraro"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Konservante..."
@@ -191,67 +196,83 @@ msgstr "Elŝuti Android-klienton"
msgid "Download iOS Client"
msgstr "Elŝuti iOS-klienton"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Pasvorto"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "Via pasvorto ŝanĝiĝis"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Ne eblis ŝanĝi vian pasvorton"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Nuna pasvorto"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Nova pasvorto"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "montri"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Ŝanĝi la pasvorton"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "Retpoŝto"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Via retpoŝta adreso"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Lingvo"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Helpu traduki"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Eldono"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -215,8 +215,8 @@ msgid "Use TLS"
msgstr "Uzi TLS-on"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index ecd1cbf9176..ff3f6b2cd57 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -15,13 +15,14 @@
# Rubén Trujillo , 2012.
# , 2011-2012.
# , 2012.
+# Vladimir Martinez Sierra , 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: felix.liberio \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -62,8 +63,9 @@ msgid "No category to add?"
msgstr "¿Ninguna categoría para añadir?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Esta categoría ya existe: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Esta categoria ya existe: %s"
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -167,59 +169,59 @@ msgstr "Noviembre"
msgid "December"
msgstr "Diciembre"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "hace segundos"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "hace 1 minuto"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "hace {minutes} minutos"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "Hace 1 hora"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "Hace {hours} horas"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "hoy"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "hace {days} días"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "mes pasado"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "Hace {months} meses"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "hace meses"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "año pasado"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "hace años"
@@ -478,7 +480,7 @@ msgstr "Editar categorías"
msgid "Add"
msgstr "Añadir"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Advertencia de seguridad"
@@ -488,71 +490,75 @@ msgid ""
"OpenSSL extension."
msgstr "No está disponible un generador de números aleatorios seguro, por favor habilite la extensión OpenSSL de PHP."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de su contraseña y tomar control de su cuenta."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Su directorio de datos y sus archivos están probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Crea una cuenta de administrador"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Avanzado"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Directorio de almacenamiento"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Configurar la base de datos"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "se utilizarán"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Usuario de la base de datos"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Contraseña de la base de datos"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Nombre de la base de datos"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Espacio de tablas de la base de datos"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Host de la base de datos"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Completar la instalación"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "servicios web bajo tu control"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Salir"
@@ -574,14 +580,18 @@ msgstr "Por favor cambie su contraseña para asegurar su cuenta nuevamente."
msgid "Lost your password?"
msgstr "¿Has perdido tu contraseña?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "recuérdame"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Entrar"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Nombre de usuarios alternativos"
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "anterior"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index d5984a7cbf7..589961db7a0 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 22:50+0000\n"
-"Last-Translator: msvladimir \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,6 +27,20 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Fallo no se subió el fichero"
@@ -63,8 +77,8 @@ msgid "Failed to write to disk"
msgstr "La escritura en disco ha fallado"
#: ajax/upload.php:52
-msgid "Not enough space available"
-msgstr "No hay suficiente espacio disponible"
+msgid "Not enough storage available"
+msgstr ""
#: ajax/upload.php:83
msgid "Invalid directory."
@@ -78,11 +92,15 @@ msgstr "Archivos"
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Eliminar permanentemente"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Eliminar"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Renombrar"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index cfd77783345..b7d69adaf02 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -6,13 +6,14 @@
# Felix Liberio , 2013.
# , 2012.
# Raul Fernandez Garcia , 2013.
+# Vladimir Martinez Sierra , 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-05 23:10+0000\n"
+"Last-Translator: msvladimir \n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -48,15 +49,15 @@ msgstr "Cifrado"
#: templates/settings-personal.php:7
msgid "File encryption is enabled."
-msgstr ""
+msgstr "La encriptacion de archivo esta activada."
#: templates/settings-personal.php:11
msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Los siguientes tipos de archivo no seran encriptados:"
#: templates/settings.php:7
msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Excluir los siguientes tipos de archivo de la encriptacion:"
#: templates/settings.php:12
msgid "None"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 14f67707885..7e95d500a1b 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 22:40+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 00:30+0000\n"
"Last-Translator: msvladimir \n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -18,31 +18,45 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "No se puede eliminar %s permanentemente"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "No se puede restaurar %s"
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr "Restaurar"
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "Eliminar archivo permanentemente"
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Nombre"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr "Eliminado"
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 carpeta"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} carpetas"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 archivo"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} archivos"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 41ca2e67dad..279601b80de 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -7,13 +7,14 @@
# , 2012.
# Rubén Trujillo , 2012.
# , 2012.
+# Vladimir Martinez Sierra , 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 00:40+0000\n"
+"Last-Translator: msvladimir \n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,10 +22,45 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "No se puede revertir: %s"
+
+#: history.php:40
+msgid "success"
+msgstr "exitoso"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "El archivo %s fue revertido a la version %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "fallo"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "El archivo %s no puede ser revertido a la version %s"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "No hay versiones antiguas disponibles"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Ruta no especificada"
+
#: js/versions.js:16
msgid "History"
msgstr "Historial"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "Revertir un archivo a una versión anterior haciendo clic en el boton de revertir"
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionado de archivos"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 5087cce0920..ef23546dea6 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:00+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 00:30+0000\n"
"Last-Translator: msvladimir \n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Imposible cargar la lista desde el App Store"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Error de autenticación"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Incapaz de cambiar el nombre"
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "El grupo ya existe"
@@ -58,10 +67,6 @@ msgstr "Correo no válido"
msgid "Unable to delete group"
msgstr "No se pudo eliminar el grupo"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Error de autenticación"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "No se pudo eliminar el usuario"
@@ -124,7 +129,7 @@ msgstr "Error"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Guardando..."
@@ -229,39 +234,55 @@ msgstr "mostrar"
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:38
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Nombre a mostrar"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Su nombre fue cambiado"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Incapaz de cambiar su nombre"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Cambiar nombre"
+
+#: templates/personal.php:55
msgid "Email"
msgstr "Correo electrónico"
-#: templates/personal.php:39
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Tu dirección de correo"
-#: templates/personal.php:40
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Escribe una dirección de correo electrónico para restablecer la contraseña"
-#: templates/personal.php:46 templates/personal.php:47
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:52
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Ayúdanos a traducir"
-#: templates/personal.php:57
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:59
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos"
-#: templates/personal.php:68
+#: templates/personal.php:85
msgid "Version"
msgstr "Version"
-#: templates/personal.php:70
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -221,8 +221,8 @@ msgid "Use TLS"
msgstr "Usar TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "No usarlo para SSL, habrá error."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr "No usar adicionalmente para conecciones LDAPS, estas fallaran"
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index b8625fa972f..b13721f69df 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: cjtess \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -53,8 +53,9 @@ msgid "No category to add?"
msgstr "¿Ninguna categoría para añadir?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Esta categoría ya existe: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "Noviembre"
msgid "December"
msgstr "Diciembre"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "hace 1 minuto"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "hace {minutes} minutos"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "Hace 1 hora"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "{hours} horas atrás"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "hoy"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "hace {days} días"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "{months} meses atrás"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "años atrás"
@@ -469,7 +470,7 @@ msgstr "Editar categorías"
msgid "Add"
msgstr "Agregar"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Advertencia de seguridad"
@@ -479,71 +480,75 @@ msgid ""
"OpenSSL extension."
msgstr "No hay disponible ningún generador de números aleatorios seguro. Por favor habilitá la extensión OpenSSL de PHP."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de tu contraseña y tomar control de tu cuenta."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Tu directorio de datos y tus archivos son probablemente accesibles desde internet. El archivo .htaccess provisto por ownCloud no está funcionando. Te sugerimos que configures tu servidor web de manera que el directorio de datos ya no esté accesible, o que muevas el directorio de datos afuera del directorio raíz de tu servidor web."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Crear una cuenta de administrador"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Avanzado"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Directorio de almacenamiento"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Configurar la base de datos"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "se utilizarán"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Usuario de la base de datos"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Contraseña de la base de datos"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Nombre de la base de datos"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Espacio de tablas de la base de datos"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Host de la base de datos"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Completar la instalación"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "servicios web sobre los que tenés control"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Cerrar la sesión"
@@ -565,14 +570,18 @@ msgstr "Por favor, cambiá tu contraseña para fortalecer nuevamente la segurida
msgid "Lost your password?"
msgstr "¿Perdiste tu contraseña?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "recordame"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Entrar"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "anterior"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 16fb351cdfb..45bc777add8 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -20,46 +20,60 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "El archivo no fue subido. Error desconocido"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "No se han producido errores, el archivo se ha subido con éxito"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "El archivo que intentás subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "El archivo que intentás subir solo se subió parcialmente"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "El archivo no fue subido"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Falta un directorio temporal"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Error al escribir en el disco"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "No hay suficiente espacio disponible"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Directorio invalido."
@@ -71,11 +85,15 @@ msgstr "Archivos"
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Borrar"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Cambiar nombre"
@@ -109,7 +127,7 @@ msgstr "reemplazado {new_name} con {old_name}"
#: js/filelist.js:280
msgid "perform delete operation"
-msgstr ""
+msgstr "Eliminar"
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -180,31 +198,31 @@ msgstr "La URL no puede estar vacía"
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud"
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Nombre"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 directorio"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} directorios"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 archivo"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} archivos"
@@ -262,7 +280,7 @@ msgstr "Desde enlace"
#: templates/index.php:40
msgid "Trash"
-msgstr ""
+msgstr "Papelera"
#: templates/index.php:46
msgid "Cancel upload"
@@ -296,4 +314,4 @@ msgstr "Escaneo actual"
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Actualizando el cache del sistema de archivos"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 7352752bf48..c50739188cc 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Nombre"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 directorio"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} directorios"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 archivo"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} archivos"
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 6ab1eed54d3..e19644ccc5b 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "Historia"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionado de archivos"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 8310f58c95c..a9d2e183b6e 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -24,6 +24,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Imposible cargar la lista desde el App Store"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Error al autenticar"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "El grupo ya existe"
@@ -48,10 +57,6 @@ msgstr "el e-mail no es válido "
msgid "Unable to delete group"
msgstr "No fue posible eliminar el grupo"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Error al autenticar"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "No fue posible eliminar el usuario"
@@ -114,7 +119,7 @@ msgstr "Error"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Guardando..."
@@ -191,67 +196,83 @@ msgstr "Descargar cliente de Android"
msgid "Download iOS Client"
msgstr "Descargar cliente de iOS"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Contraseña"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "Tu contraseña fue cambiada"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "No fue posible cambiar tu contraseña"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Contraseña actual"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Nueva contraseña:"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "mostrar"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Nombre a mostrar"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "Correo electrónico"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Tu dirección de e-mail"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Escribí una dirección de correo electrónico para restablecer la contraseña"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Ayudanos a traducir"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Versión"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@ msgstr ""
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Fallo al borrar la configuración del servidor"
#: ajax/testConfiguration.php:35
msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "La configuración es valida y la conexión pudo ser establecida."
#: ajax/testConfiguration.php:37
msgid ""
@@ -50,27 +50,27 @@ msgstr ""
#: js/settings.js:83
msgid "Keep settings?"
-msgstr ""
+msgstr "¿Mantener preferencias?"
#: js/settings.js:97
msgid "Cannot add server configuration"
-msgstr ""
+msgstr "No se pudo añadir la configuración del servidor"
#: js/settings.js:121
msgid "Connection test succeeded"
-msgstr ""
+msgstr "El este de conexión ha sido completado satisfactoriamente"
#: js/settings.js:126
msgid "Connection test failed"
-msgstr ""
+msgstr "Falló es test de conexión"
#: js/settings.js:136
msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "¿Realmente desea borrar la configuración actual del servidor?"
#: js/settings.js:137
msgid "Confirm Deletion"
-msgstr ""
+msgstr "Confirmar borrado"
#: templates/settings.php:8
msgid ""
@@ -87,11 +87,11 @@ msgstr "Atención: El módulo PHP LDAP no está instalado, este elemento
#: templates/settings.php:15
msgid "Server configuration"
-msgstr ""
+msgstr "Configuración del Servidor"
#: templates/settings.php:17
msgid "Add Server Configuration"
-msgstr ""
+msgstr "Añadir Configuración del Servidor"
#: templates/settings.php:21
msgid "Host"
@@ -175,11 +175,11 @@ msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
#: templates/settings.php:31
msgid "Connection Settings"
-msgstr ""
+msgstr "Configuración de Conección"
#: templates/settings.php:33
msgid "Configuration Active"
-msgstr ""
+msgstr "Configuración activa"
#: templates/settings.php:33
msgid "When unchecked, this configuration will be skipped."
@@ -205,7 +205,7 @@ msgstr ""
#: templates/settings.php:37
msgid "Disable Main Server"
-msgstr ""
+msgstr "Deshabilitar el Servidor Principal"
#: templates/settings.php:37
msgid "When switched on, ownCloud will only connect to the replica server."
@@ -216,8 +216,8 @@ msgid "Use TLS"
msgstr "Usar TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "No usarlo para SSL, dará error."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
@@ -243,7 +243,7 @@ msgstr "en segundos. Cambiarlo vacía la cache."
#: templates/settings.php:43
msgid "Directory Settings"
-msgstr ""
+msgstr "Configuración de Directorio"
#: templates/settings.php:45
msgid "User Display Name Field"
@@ -295,7 +295,7 @@ msgstr "Asociación Grupo-Miembro"
#: templates/settings.php:53
msgid "Special Attributes"
-msgstr ""
+msgstr "Atributos Especiales"
#: templates/settings.php:56
msgid "in bytes"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 319bddaf875..54c76b77460 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -51,8 +51,9 @@ msgid "No category to add?"
msgstr "Pole kategooriat, mida lisada?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "See kategooria on juba olemas: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -156,59 +157,59 @@ msgstr "November"
msgid "December"
msgstr "Detsember"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Seaded"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "1 minut tagasi"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "{minutes} minutit tagasi"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr ""
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "täna"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "eile"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "{days} päeva tagasi"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "viimasel kuul"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr ""
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "kuu tagasi"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "viimasel aastal"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "aastat tagasi"
@@ -467,7 +468,7 @@ msgstr "Muuda kategooriaid"
msgid "Add"
msgstr "Lisa"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Turvahoiatus"
@@ -477,71 +478,75 @@ msgid ""
"OpenSSL extension."
msgstr ""
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr ""
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"For information how to properly configure your server, please see the documentation."
msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Loo admini konto"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Lisavalikud"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Andmete kaust"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Seadista andmebaasi"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "kasutatakse"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Andmebaasi kasutaja"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Andmebaasi parool"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Andmebasi nimi"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Andmebaasi tabeliruum"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Andmebaasi host"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Lõpeta seadistamine"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "veebiteenused sinu kontrolli all"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Logi välja"
@@ -563,14 +568,18 @@ msgstr "Palun muuda parooli, et oma kasutajakonto uuesti turvata."
msgid "Lost your password?"
msgstr "Kaotasid oma parooli?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "pea meeles"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Logi sisse"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "eelm"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index deecc6e8688..c42827d819d 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -19,46 +19,60 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Ühtegi viga pole, fail on üles laetud"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Fail laeti üles ainult osaliselt"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Ühtegi faili ei laetud üles"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Ajutiste failide kaust puudub"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Kettale kirjutamine ebaõnnestus"
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr ""
@@ -70,11 +84,15 @@ msgstr "Failid"
msgid "Unshare"
msgstr "Lõpeta jagamine"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Kustuta"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "ümber"
@@ -179,31 +197,31 @@ msgstr "URL ei saa olla tühi."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Nimi"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Suurus"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Muudetud"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 kaust"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} kausta"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 fail"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} faili"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 818c4c31a5d..e4e1d3e4372 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Nimi"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 kaust"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} kausta"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 fail"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} faili"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index a0309a22fc6..b35f2b2c7e7 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "Ajalugu"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Failide versioonihaldus"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 1dbc6e9f6fd..bd9993e5ebc 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -23,6 +23,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "App Sotre'i nimekirja laadimine ebaõnnestus"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentimise viga"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "Grupp on juba olemas"
@@ -47,10 +56,6 @@ msgstr "Vigane e-post"
msgid "Unable to delete group"
msgstr "Keela grupi kustutamine"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentimise viga"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Keela kasutaja kustutamine"
@@ -113,7 +118,7 @@ msgstr "Viga"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Salvestamine..."
@@ -190,67 +195,83 @@ msgstr ""
msgid "Download iOS Client"
msgstr ""
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Parool"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "Sinu parooli on muudetud"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Sa ei saa oma parooli muuta"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Praegune parool"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Uus parool"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "näita"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Muuda parooli"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "E-post"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Sinu e-posti aadress"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Keel"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Aita tõlkida"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr ""
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -214,8 +214,8 @@ msgid "Use TLS"
msgstr "Kasutaja TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ära kasuta seda SSL ühenduse jaoks, see ei toimi."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 33b40f3114c..faa3a2a3a3b 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: asieriko \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -54,8 +54,9 @@ msgid "No category to add?"
msgstr "Ez dago gehitzeko kategoriarik?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Kategoria hau dagoeneko existitzen da:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -159,59 +160,59 @@ msgstr "Azaroa"
msgid "December"
msgstr "Abendua"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Ezarpenak"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "segundu"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "orain dela minutu 1"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "orain dela {minutes} minutu"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "orain dela ordu bat"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "orain dela {hours} ordu"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "gaur"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "atzo"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "orain dela {days} egun"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "joan den hilabetean"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "orain dela {months} hilabete"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "hilabete"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "joan den urtean"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "urte"
@@ -470,7 +471,7 @@ msgstr "Editatu kategoriak"
msgid "Add"
msgstr "Gehitu"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Segurtasun abisua"
@@ -480,71 +481,75 @@ msgid ""
"OpenSSL extension."
msgstr "Ez dago hausazko zenbaki sortzaile segururik eskuragarri, mesedez gatiu PHP OpenSSL extensioa."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Hausazko zenbaki sortzaile segururik gabe erasotzaile batek pasahitza berrezartzeko kodeak iragarri ditzake eta zure kontuaz jabetu."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Sortu kudeatzaile kontu bat"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Aurreratua"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Datuen karpeta"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Konfiguratu datu basea"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "erabiliko da"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Datubasearen erabiltzailea"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Datubasearen pasahitza"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Datubasearen izena"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Datu basearen taula-lekua"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Datubasearen hostalaria"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Bukatu konfigurazioa"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "web zerbitzuak zure kontrolpean"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Saioa bukatu"
@@ -566,14 +571,18 @@ msgstr "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko."
msgid "Lost your password?"
msgstr "Galdu duzu pasahitza?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "gogoratu"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Hasi saioa"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "aurrekoa"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 2c3f16305dd..e32bbe4ed2f 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -21,46 +21,60 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Ez da fitxategirik igo. Errore ezezaguna"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Ez da arazorik izan, fitxategia ongi igo da"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Igotako fitxategiaren zati bat baino gehiago ez da igo"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Ez da fitxategirik igo"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Aldi baterako karpeta falta da"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Errore bat izan da diskoan idazterakoan"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Ez dago leku nahikorik."
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Baliogabeko karpeta."
@@ -72,11 +86,15 @@ msgstr "Fitxategiak"
msgid "Unshare"
msgstr "Ez elkarbanatu"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Ezabatu"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Berrizendatu"
@@ -181,31 +199,31 @@ msgstr "URLa ezin da hutsik egon."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Izena"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Tamaina"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Aldatuta"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "karpeta bat"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} karpeta"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "fitxategi bat"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} fitxategi"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index a0ee131403b..70120e4257a 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Izena"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "karpeta bat"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} karpeta"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "fitxategi bat"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} fitxategi"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index 64844cd7adf..fdece04b8c3 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "Historia"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Fitxategien Bertsioak"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 7b268d3a9d6..b605292a8ae 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ezin izan da App Dendatik zerrenda kargatu"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentifikazio errorea"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "Taldea dagoeneko existitzenda"
@@ -49,10 +58,6 @@ msgstr "Baliogabeko eposta"
msgid "Unable to delete group"
msgstr "Ezin izan da taldea ezabatu"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentifikazio errorea"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Ezin izan da erabiltzailea ezabatu"
@@ -115,7 +120,7 @@ msgstr "Errorea"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Gordetzen..."
@@ -192,67 +197,83 @@ msgstr "Deskargatu Android bezeroa"
msgid "Download iOS Client"
msgstr "Deskargatu iOS bezeroa"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Pasahitza"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "Zere pasahitza aldatu da"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Ezin izan da zure pasahitza aldatu"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Uneko pasahitza"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Pasahitz berria"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "erakutsi"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Aldatu pasahitza"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Bistaratze Izena"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "E-Posta"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Zure e-posta"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Hizkuntza"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Lagundu itzultzen"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Bertsioa"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -215,8 +215,8 @@ msgid "Use TLS"
msgstr "Erabili TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ez erabili SSL konexioetan, huts egingo du."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 7ac12d0c3a7..de2bbcd7005 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 14:04+0000\n"
-"Last-Translator: miki_mika1362 \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,8 +52,9 @@ msgid "No category to add?"
msgstr "آیا گروه دیگری برای افزودن ندارید"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "این گروه از قبل اضافه شده"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "نوامبر"
msgid "December"
msgstr "دسامبر"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "تنظیمات"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "ثانیهها پیش"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "1 دقیقه پیش"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "{دقیقه ها} دقیقه های پیش"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "1 ساعت پیش"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "{ساعت ها} ساعت ها پیش"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "امروز"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "دیروز"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "{روزها} روزهای پیش"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "ماه قبل"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "{ماه ها} ماه ها پیش"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "ماههای قبل"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "سال قبل"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "سالهای قبل"
@@ -468,7 +469,7 @@ msgstr "ویرایش گروه ها"
msgid "Add"
msgstr "افزودن"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "اخطار امنیتی"
@@ -478,71 +479,75 @@ msgid ""
"OpenSSL extension."
msgstr "هیچ مولد تصادفی امن در دسترس نیست، لطفا فرمت PHP OpenSSL را فعال نمایید."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "بدون وجود یک تولید کننده اعداد تصادفی امن ، یک مهاجم ممکن است این قابلیت را داشته باشد که پیشگویی کند پسوورد های راه انداز گرفته شده و کنترلی روی حساب کاربری شما داشته باشد ."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"For information how to properly configure your server, please see the documentation."
msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "لطفا یک شناسه برای مدیر بسازید"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "حرفه ای"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "پوشه اطلاعاتی"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "پایگاه داده برنامه ریزی شدند"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "استفاده خواهد شد"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "شناسه پایگاه داده"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "پسورد پایگاه داده"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "نام پایگاه داده"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "جدول پایگاه داده"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "هاست پایگاه داده"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "اتمام نصب"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "سرویس وب تحت کنترل شما"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "خروج"
@@ -564,14 +569,18 @@ msgstr "لطفا رمز عبور خود را تغییر دهید تا مجددا
msgid "Lost your password?"
msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "بیاد آوری"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "ورود"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "بازگشت"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index c0c54f59a62..d18c250ecf5 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 11:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -21,46 +21,60 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "هیچ خطایی وجود ندارد فایل با موفقیت بار گذاری شد"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "پرونده آپلود شده بیش ازدستور ماکزیمم_حجم فایل_برای آپلود در php.ini استفاده کرده است."
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "حداکثر حجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "مقدار کمی از فایل بارگذاری شده"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "هیچ فایلی بارگذاری نشده"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "یک پوشه موقت گم شده است"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "فضای کافی در دسترس نیست"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "فهرست راهنما نامعتبر می باشد."
@@ -72,11 +86,15 @@ msgstr "فایل ها"
msgid "Unshare"
msgstr "لغو اشتراک"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "پاک کردن"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "تغییرنام"
@@ -181,31 +199,31 @@ msgstr "URL نمی تواند خالی باشد."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است."
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "نام"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "اندازه"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "تغییر یافته"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 پوشه"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{ شمار} پوشه ها"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 پرونده"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{ شمار } فایل ها"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index d0801cffe9f..a9bffbf81b1 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 12:40+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "نام"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 پوشه"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{ شمار} پوشه ها"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 پرونده"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{ شمار } فایل ها"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index 276a3e16135..a2a96bc6ec1 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:05+0100\n"
-"PO-Revision-Date: 2013-02-03 11:40+0000\n"
-"Last-Translator: miki_mika1362 \n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,45 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "تاریخچه"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index bc13d018d0b..f38f77bf14e 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 13:30+0000\n"
-"Last-Translator: miki_mika1362 \n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,6 +26,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "قادر به بارگذاری لیست از فروشگاه اپ نیستم"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "خطا در اعتبار سنجی"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "این گروه در حال حاضر موجود است"
@@ -50,10 +59,6 @@ msgstr "ایمیل غیر قابل قبول"
msgid "Unable to delete group"
msgstr "حذف گروه امکان پذیر نیست"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "خطا در اعتبار سنجی"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "حذف کاربر امکان پذیر نیست"
@@ -116,7 +121,7 @@ msgstr "خطا"
msgid "Updated"
msgstr "بروز رسانی انجام شد"
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "درحال ذخیره ..."
@@ -221,39 +226,55 @@ msgstr "نمایش"
msgid "Change password"
msgstr "تغییر گذر واژه"
-#: templates/personal.php:38
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "پست الکترونیکی"
-#: templates/personal.php:39
+#: templates/personal.php:56
msgid "Your email address"
msgstr "پست الکترونیکی شما"
-#: templates/personal.php:40
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "پست الکترونیکی را پرکنید تا بازیابی گذرواژه فعال شود"
-#: templates/personal.php:46 templates/personal.php:47
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "زبان"
-#: templates/personal.php:52
+#: templates/personal.php:69
msgid "Help translate"
msgstr "به ترجمه آن کمک کنید"
-#: templates/personal.php:57
+#: templates/personal.php:74
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:59
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:85
msgid "Version"
msgstr "نسخه"
-#: templates/personal.php:70
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -215,7 +215,7 @@ msgid "Use TLS"
msgstr ""
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
#: templates/settings.php:39
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 34672cc2cb0..fef4938627f 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
-"Last-Translator: Jiri Grönroos \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -57,8 +57,9 @@ msgid "No category to add?"
msgstr "Ei lisättävää luokkaa?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Tämä luokka on jo olemassa: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -162,59 +163,59 @@ msgstr "Marraskuu"
msgid "December"
msgstr "Joulukuu"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Asetukset"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "1 minuutti sitten"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "{minutes} minuuttia sitten"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "1 tunti sitten"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "{hours} tuntia sitten"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "tänään"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "eilen"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "{days} päivää sitten"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "viime kuussa"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "{months} kuukautta sitten"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "kuukautta sitten"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "viime vuonna"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "vuotta sitten"
@@ -473,7 +474,7 @@ msgstr "Muokkaa luokkia"
msgid "Add"
msgstr "Lisää"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Turvallisuusvaroitus"
@@ -483,71 +484,75 @@ msgid ""
"OpenSSL extension."
msgstr ""
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr ""
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Luo ylläpitäjän tunnus"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Lisäasetukset"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Datakansio"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Muokkaa tietokantaa"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "käytetään"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Tietokannan käyttäjä"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Tietokannan salasana"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Tietokannan nimi"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Tietokannan taulukkotila"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Tietokantapalvelin"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Viimeistele asennus"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "verkkopalvelut hallinnassasi"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Kirjaudu ulos"
@@ -569,14 +574,18 @@ msgstr "Vaihda salasanasi suojataksesi tilisi uudelleen."
msgid "Lost your password?"
msgstr "Unohditko salasanasi?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "muista"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Kirjaudu sisään"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "edellinen"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 3e3ea718bb0..57096ee2349 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 13:58+0000\n"
-"Last-Translator: Jiri Grönroos \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,46 +22,60 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Ei virheitä, tiedosto lähetettiin onnistuneesti"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Tiedoston lähetys onnistui vain osittain"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Yhtäkään tiedostoa ei lähetetty"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Väliaikaiskansiota ei ole olemassa"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Levylle kirjoitus epäonnistui"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Tilaa ei ole riittävästi"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Virheellinen kansio."
@@ -73,11 +87,15 @@ msgstr "Tiedostot"
msgid "Unshare"
msgstr "Peru jakaminen"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Poista"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Nimeä uudelleen"
@@ -182,31 +200,31 @@ msgstr "Verkko-osoite ei voi olla tyhjä"
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Nimi"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Koko"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Muutettu"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 kansio"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} kansiota"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 tiedosto"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} tiedostoa"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index 3543c5b1193..27afca0a85b 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -18,31 +18,45 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr "suorita palautustoiminto"
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Nimi"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr "Poistettu"
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 kansio"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} kansiota"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 tiedosto"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} tiedostoa"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index 4a04a540a90..f8ce72e1e07 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "Historia"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Tiedostojen versiointi"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index eb214d66683..f31845d910b 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 13:58+0000\n"
-"Last-Translator: Jiri Grönroos \n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Todennusvirhe"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "Ryhmä on jo olemassa"
@@ -48,10 +57,6 @@ msgstr "Virheellinen sähköposti"
msgid "Unable to delete group"
msgstr "Ryhmän poisto epäonnistui"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Todennusvirhe"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Käyttäjän poisto epäonnistui"
@@ -114,7 +119,7 @@ msgstr "Virhe"
msgid "Updated"
msgstr "Päivitetty"
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Tallennetaan..."
@@ -191,67 +196,83 @@ msgstr "Lataa Android-sovellus"
msgid "Download iOS Client"
msgstr "Lataa iOS-sovellus"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Salasana"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "Salasanasi vaihdettiin"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Salasanaasi ei voitu vaihtaa"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Nykyinen salasana"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Uusi salasana"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "näytä"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Vaihda salasana"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Näyttönimi"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "Sähköposti"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Sähköpostiosoitteesi"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Kieli"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Auta kääntämisessä"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Versio"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -216,8 +216,8 @@ msgid "Use TLS"
msgstr "Käytä TLS:ää"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Älä käytä SSL-yhteyttä varten, se epäonnistuu. "
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index ca18cbb340c..1454975ea7f 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -15,14 +15,14 @@
# , 2012.
# , 2012.
# , 2011.
-# Romain DEP. , 2012.
+# Romain DEP. , 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 14:30+0000\n"
-"Last-Translator: ptit_boogy \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -63,8 +63,9 @@ msgid "No category to add?"
msgstr "Pas de catégorie à ajouter ?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Cette catégorie existe déjà : "
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Cette catégorie existe déjà : %s"
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -168,59 +169,59 @@ msgstr "novembre"
msgid "December"
msgstr "décembre"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Paramètres"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "il y a quelques secondes"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "il y a une minute"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "il y a {minutes} minutes"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "Il y a une heure"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "Il y a {hours} heures"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "aujourd'hui"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "hier"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "il y a {days} jours"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "le mois dernier"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "Il y a {months} mois"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "il y a plusieurs mois"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "l'année dernière"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "il y a plusieurs années"
@@ -479,7 +480,7 @@ msgstr "Modifier les catégories"
msgid "Add"
msgstr "Ajouter"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Avertissement de sécurité"
@@ -489,71 +490,75 @@ msgid ""
"OpenSSL extension."
msgstr "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL"
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Votre dossier data et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni par ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de manière à ce que le dossier data ne soit plus accessible ou bien de déplacer le dossier data en dehors du dossier racine des documents du serveur web."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Créer un compte administrateur"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Avancé"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Répertoire des données"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Configurer la base de données"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "sera utilisé"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Utilisateur pour la base de données"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Mot de passe de la base de données"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Nom de la base de données"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Tablespaces de la base de données"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Serveur de la base de données"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Terminer l'installation"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "services web sous votre contrôle"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Se déconnecter"
@@ -575,14 +580,18 @@ msgstr "Veuillez changer votre mot de passe pour sécuriser à nouveau votre com
msgid "Lost your password?"
msgstr "Mot de passe perdu ?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "se souvenir de moi"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Connexion"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr "Logins alternatifs"
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "précédent"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 5a5f892a67e..0e732da55ae 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 14:30+0000\n"
-"Last-Translator: Flywall \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"Last-Translator: I Robot \n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,46 +31,60 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Aucune erreur, le fichier a été téléversé avec succès"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Le fichier n'a été que partiellement téléversé"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Aucun fichier n'a été téléversé"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Il manque un répertoire temporaire"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Erreur d'écriture sur le disque"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Espace disponible insuffisant"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Dossier invalide."
@@ -82,11 +96,15 @@ msgstr "Fichiers"
msgid "Unshare"
msgstr "Ne plus partager"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr "Supprimer de façon définitive"
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Supprimer"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Renommer"
@@ -191,31 +209,31 @@ msgstr "L'URL ne peut-être vide"
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Nom"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Taille"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Modifié"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 dossier"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} dossiers"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 fichier"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} fichiers"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index d20576ced12..ac5a41de001 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 23:05+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 14:02+0000\n"
+"Last-Translator: Romain DEP. \n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,15 +46,15 @@ msgstr "Chiffrement"
#: templates/settings-personal.php:7
msgid "File encryption is enabled."
-msgstr ""
+msgstr "Le chiffrement des fichiers est activé"
#: templates/settings-personal.php:11
msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Les fichiers de types suivants ne seront pas chiffrés :"
#: templates/settings.php:7
msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Ne pas chiffrer les fichiers dont les types sont les suivants :"
#: templates/settings.php:12
msgid "None"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index d8a8b2c7926..23b922f8f1c 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 14:03+0000\n"
+"Last-Translator: Romain DEP. \n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +19,45 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "Impossible d'effacer %s de façon permanente"
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "Impossible de restaurer %s"
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr "effectuer l'opération de restauration"
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr "effacer définitivement le fichier"
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Nom"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr "Effacé"
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 dossier"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} dossiers"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 fichier"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} fichiers"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 1fb4fdb1de2..0bfce6ee9bc 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Romain DEP. , 2012.
+# Romain DEP. , 2012-2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 14:02+0000\n"
+"Last-Translator: Romain DEP. \n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,10 +18,45 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "Impossible de restaurer %s"
+
+#: history.php:40
+msgid "success"
+msgstr "succès"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "Le fichier %s a été restauré dans sa version %s"
+
+#: history.php:49
+msgid "failure"
+msgstr "échec"
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr "Le fichier %s ne peut être restauré dans sa version %s"
+
+#: history.php:68
+msgid "No old versions available"
+msgstr "Aucune ancienne version n'est disponible"
+
+#: history.php:73
+msgid "No path specified"
+msgstr "Aucun chemin spécifié"
+
#: js/versions.js:16
msgid "History"
msgstr "Historique"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr "Restaurez un fichier dans une version antérieure en cliquant sur son bouton de restauration"
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Versionnage des fichiers"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 59ec0fc34ac..edf75b638a0 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -24,9 +24,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-06 00:05+0100\n"
-"PO-Revision-Date: 2013-02-05 20:10+0000\n"
-"Last-Translator: jiminybillybob \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 14:01+0000\n"
+"Last-Translator: Romain DEP. \n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,6 +38,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Impossible de charger la liste depuis l'App Store"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Erreur d'authentification"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr "Impossible de modifier le nom d'affichage"
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "Ce groupe existe déjà"
@@ -62,10 +71,6 @@ msgstr "E-mail invalide"
msgid "Unable to delete group"
msgstr "Impossible de supprimer le groupe"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Erreur d'authentification"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Impossible de supprimer l'utilisateur"
@@ -128,7 +133,7 @@ msgstr "Erreur"
msgid "Updated"
msgstr "Mise à jour effectuée avec succès"
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Sauvegarde..."
@@ -233,39 +238,55 @@ msgstr "Afficher"
msgid "Change password"
msgstr "Changer de mot de passe"
-#: templates/personal.php:38
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr "Nom affiché"
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr "Votre nom d'affichage a bien été modifié"
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr "Impossible de modifier votre nom d'affichage"
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr "Changer le nom affiché"
+
+#: templates/personal.php:55
msgid "Email"
msgstr "E-mail"
-#: templates/personal.php:39
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Votre adresse e-mail"
-#: templates/personal.php:40
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe"
-#: templates/personal.php:46 templates/personal.php:47
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Langue"
-#: templates/personal.php:52
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Aidez à traduire"
-#: templates/personal.php:57
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:59
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers"
-#: templates/personal.php:68
+#: templates/personal.php:85
msgid "Version"
msgstr "Version"
-#: templates/personal.php:70
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 14:02+0000\n"
+"Last-Translator: Romain DEP. \n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -220,8 +220,8 @@ msgid "Use TLS"
msgstr "Utiliser TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ne pas utiliser pour les connexions SSL, car cela échouera."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr "À ne pas utiliser pour les connexions LDAPS (cela échouera)."
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 227dd8bf060..6c9cc0dfe4e 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -53,8 +53,9 @@ msgid "No category to add?"
msgstr "Sen categoría que engadir?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Esta categoría xa existe: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -158,59 +159,59 @@ msgstr "novembro"
msgid "December"
msgstr "decembro"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Configuracións"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "hai 1 minuto"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "hai {minutes} minutos"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "hai 1 hora"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "hai {hours} horas"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "hoxe"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "onte"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "hai {days} días"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "último mes"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "hai {months} meses"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "último ano"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "anos atrás"
@@ -469,7 +470,7 @@ msgstr "Editar categorías"
msgid "Add"
msgstr "Engadir"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Aviso de seguranza"
@@ -479,71 +480,75 @@ msgid ""
"OpenSSL extension."
msgstr "Non hai un xerador de números ao chou dispoñíbel. Active o engadido de OpenSSL para PHP."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Sen un xerador seguro de números ao chou podería acontecer que predicindo as cadeas de texto de reinicio de contrasinais se afagan coa súa conta."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesíbeis a través da Internet. O ficheiro .htaccess que fornece ownCloud non está a empregarse. Suxerimoslle que configure o seu servidor web de tal xeito que o cartafol de datos non estea accesíbel ou mova o cartafol de datos fora do directorio raíz de datos do servidor web."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Crear unha contra de administrador"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Avanzado"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Cartafol de datos"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Configurar a base de datos"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "vai ser utilizado"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Usuario da base de datos"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Contrasinal da base de datos"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Nome da base de datos"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Táboa de espazos da base de datos"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Servidor da base de datos"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Rematar a configuración"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "servizos web baixo o seu control"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Desconectar"
@@ -565,14 +570,18 @@ msgstr "Cambie de novo o seu contrasinal para asegurar a súa conta."
msgid "Lost your password?"
msgstr "Perdeu o contrasinal?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "lembrar"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Conectar"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "anterior"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 020232e7f37..928faa768b9 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -19,46 +19,60 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Non se subiu ningún ficheiro. Erro descoñecido."
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Non hai erros. O ficheiro enviouse correctamente"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "O ficheiro subido excede a directiva indicada polo tamaño_máximo_de_subida de php.ini"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "O ficheiro enviado supera a directiva MAX_FILE_SIZE que foi indicada no formulario HTML"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "O ficheiro enviado foi só parcialmente enviado"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Non se enviou ningún ficheiro"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Falta un cartafol temporal"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Erro ao escribir no disco"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "O espazo dispoñíbel é insuficiente"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "O directorio é incorrecto."
@@ -70,11 +84,15 @@ msgstr "Ficheiros"
msgid "Unshare"
msgstr "Deixar de compartir"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Eliminar"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Mudar o nome"
@@ -179,31 +197,31 @@ msgstr "URL non pode quedar baleiro."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nome de cartafol non válido. O uso de 'Shared' está reservado por Owncloud"
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Nome"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 cartafol"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} cartafoles"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 ficheiro"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} ficheiros"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index be7e4127d3a..9e9dd72adb0 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 cartafol"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} cartafoles"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 ficheiro"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} ficheiros"
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index c0ac98462b7..7bfd504e633 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/files_versions.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,45 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "Historial"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Sistema de versión de ficheiros"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index ccfa410e29f..ca408e99943 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -24,6 +24,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Non foi posíbel cargar a lista desde a App Store"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Produciuse un erro de autenticación"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "O grupo xa existe"
@@ -48,10 +57,6 @@ msgstr "correo incorrecto"
msgid "Unable to delete group"
msgstr "Non é posíbel eliminar o grupo."
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Produciuse un erro de autenticación"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Non é posíbel eliminar o usuario"
@@ -114,7 +119,7 @@ msgstr "Erro"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Gardando..."
@@ -191,67 +196,83 @@ msgstr "Descargar clientes para Android"
msgid "Download iOS Client"
msgstr "Descargar clientes ra iOS"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Contrasinal"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "O seu contrasinal foi cambiado"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Non é posíbel cambiar o seu contrasinal"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Contrasinal actual"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Novo contrasinal"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "amosar"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Cambiar o contrasinal"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "Correo"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "O seu enderezo de correo"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Escriba un enderezo de correo para activar a recuperación do contrasinal"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Axude na tradución"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Versión"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -215,8 +215,8 @@ msgid "Use TLS"
msgstr "Usar TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Non empregalo para conexións SSL: fallará."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 8a781cb282f..63923beacfc 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -55,8 +55,9 @@ msgid "No category to add?"
msgstr "אין קטגוריה להוספה?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "קטגוריה זאת כבר קיימת: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -160,59 +161,59 @@ msgstr "נובמבר"
msgid "December"
msgstr "דצמבר"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "הגדרות"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "שניות"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "לפני דקה אחת"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "לפני {minutes} דקות"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "לפני שעה"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "לפני {hours} שעות"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "היום"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "אתמול"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "לפני {days} ימים"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "חודש שעבר"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "לפני {months} חודשים"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "חודשים"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "שנה שעברה"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "שנים"
@@ -471,7 +472,7 @@ msgstr "עריכת הקטגוריות"
msgid "Add"
msgstr "הוספה"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "אזהרת אבטחה"
@@ -481,71 +482,75 @@ msgid ""
"OpenSSL extension."
msgstr "אין מחולל מספרים אקראיים מאובטח, נא להפעיל את ההרחבה OpenSSL ב־PHP."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "ללא מחולל מספרים אקראיים מאובטח תוקף יכול לנבא את מחרוזות איפוס הססמה ולהשתלט על החשבון שלך."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "יתכן שתיקיית הנתונים והקבצים שלך נגישים דרך האינטרנט. קובץ ה־.htaccess שמסופק על ידי ownCloud כנראה אינו עובד. אנו ממליצים בחום להגדיר את שרת האינטרנט שלך בדרך שבה תיקיית הנתונים לא תהיה זמינה עוד או להעביר את תיקיית הנתונים מחוץ לספריית העל של שרת האינטרנט."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "יצירת חשבון מנהל"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "מתקדם"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "תיקיית נתונים"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "הגדרת מסד הנתונים"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "ינוצלו"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "שם משתמש במסד הנתונים"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "ססמת מסד הנתונים"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "שם מסד הנתונים"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "מרחב הכתובות של מסד הנתונים"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "שרת בסיס נתונים"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "סיום התקנה"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "שירותי רשת בשליטתך"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "התנתקות"
@@ -567,14 +572,18 @@ msgstr "נא לשנות את הססמה שלך כדי לאבטח את חשבונ
msgid "Lost your password?"
msgstr "שכחת את ססמתך?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "שמירת הססמה"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "כניסה"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "הקודם"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index ed74dc9066f..97499d15ec7 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -21,46 +21,60 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "לא הועלה קובץ. טעות בלתי מזוהה."
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "לא אירעה תקלה, הקבצים הועלו בהצלחה"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "הקובץ שהועלה חרג מההנחיה MAX_FILE_SIZE שצוינה בטופס ה־HTML"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "הקובץ שהועלה הועלה בצורה חלקית"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "לא הועלו קבצים"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "תיקייה זמנית חסרה"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "הכתיבה לכונן נכשלה"
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr ""
@@ -72,11 +86,15 @@ msgstr "קבצים"
msgid "Unshare"
msgstr "הסר שיתוף"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "מחיקה"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "שינוי שם"
@@ -181,31 +199,31 @@ msgstr "קישור אינו יכול להיות ריק."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "שם"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "גודל"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "זמן שינוי"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "תיקייה אחת"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} תיקיות"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "קובץ אחד"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} קבצים"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index e2f9372e88e..4291039ce16 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "שם"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "תיקייה אחת"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} תיקיות"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "קובץ אחד"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} קבצים"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index 15bb3e971b3..4d1caaf1149 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,45 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "היסטוריה"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "שמירת הבדלי גרסאות של קבצים"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index cceb07b9d17..018aebd9f60 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "לא ניתן לטעון רשימה מה־App Store"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "שגיאת הזדהות"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "הקבוצה כבר קיימת"
@@ -49,10 +58,6 @@ msgstr "דוא״ל לא חוקי"
msgid "Unable to delete group"
msgstr "לא ניתן למחוק את הקבוצה"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "שגיאת הזדהות"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "לא ניתן למחוק את המשתמש"
@@ -115,7 +120,7 @@ msgstr "שגיאה"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "שומר.."
@@ -192,67 +197,83 @@ msgstr "הורד תוכנה לאנדרואיד"
msgid "Download iOS Client"
msgstr "הורד תוכנה לiOS"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "ססמה"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "הססמה שלך הוחלפה"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "לא ניתן לשנות את הססמה שלך"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "ססמה נוכחית"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "ססמה חדשה"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "הצגה"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "שינוי ססמה"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "דוא״ל"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "כתובת הדוא״ל שלך"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "פה"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "עזרה בתרגום"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים."
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "גרסא"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -214,7 +214,7 @@ msgid "Use TLS"
msgstr ""
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
#: templates/settings.php:39
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 3e666c18c78..4706ee1f2cd 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-30 00:23+0100\n"
-"PO-Revision-Date: 2013-01-29 23:23+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -52,7 +52,8 @@ msgid "No category to add?"
msgstr ""
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
+#, php-format
+msgid "This category already exists: %s"
msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
@@ -157,59 +158,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
+#: js/js.js:284
msgid "Settings"
msgstr ""
-#: js/js.js:762
+#: js/js.js:764
msgid "seconds ago"
msgstr ""
-#: js/js.js:763
+#: js/js.js:765
msgid "1 minute ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:765
+#: js/js.js:767
msgid "1 hour ago"
msgstr ""
-#: js/js.js:766
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:767
+#: js/js.js:769
msgid "today"
msgstr ""
-#: js/js.js:768
+#: js/js.js:770
msgid "yesterday"
msgstr ""
-#: js/js.js:769
+#: js/js.js:771
msgid "{days} days ago"
msgstr ""
-#: js/js.js:770
+#: js/js.js:772
msgid "last month"
msgstr ""
-#: js/js.js:771
+#: js/js.js:773
msgid "{months} months ago"
msgstr ""
-#: js/js.js:772
+#: js/js.js:774
msgid "months ago"
msgstr ""
-#: js/js.js:773
+#: js/js.js:775
msgid "last year"
msgstr ""
-#: js/js.js:774
+#: js/js.js:776
msgid "years ago"
msgstr ""
@@ -468,7 +469,7 @@ msgstr ""
msgid "Add"
msgstr ""
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr ""
@@ -478,71 +479,75 @@ msgid ""
"OpenSSL extension."
msgstr ""
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr ""
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"For information how to properly configure your server, please see the documentation."
msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "व्यवस्थापक खाता बनाएँ"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "उन्नत"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr ""
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "डेटाबेस कॉन्फ़िगर करें "
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr ""
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "डेटाबेस उपयोगकर्ता"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "डेटाबेस पासवर्ड"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr ""
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr ""
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "सेटअप समाप्त करे"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:32
+#: templates/layout.user.php:48
msgid "Log out"
msgstr ""
@@ -564,14 +569,18 @@ msgstr ""
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr ""
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr ""
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "पिछला"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index c56da3dc54c..1bffd04a963 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 17:02+0100\n"
-"PO-Revision-Date: 2013-01-31 16:02+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,46 +17,60 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr ""
@@ -68,11 +82,15 @@ msgstr ""
msgid "Unshare"
msgstr ""
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr ""
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr ""
@@ -177,31 +195,31 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr ""
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr ""
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr ""
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr ""
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index ecec4c0cae6..a0b6e4cede0 100644
--- a/l10n/hi/files_trashbin.po
+++ b/l10n/hi/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr ""
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr ""
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr ""
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr ""
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index 293e4b558a7..65790b4d6ba 100644
--- a/l10n/hi/files_versions.po
+++ b/l10n/hi/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,45 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr ""
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 58343582a26..b0e88f95c9b 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr ""
@@ -45,10 +54,6 @@ msgstr ""
msgid "Unable to delete group"
msgstr ""
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr ""
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr ""
@@ -111,7 +116,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr ""
@@ -188,67 +193,83 @@ msgstr ""
msgid "Download iOS Client"
msgstr ""
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "पासवर्ड"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr ""
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "नया पासवर्ड"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr ""
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr ""
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr ""
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr ""
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr ""
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr ""
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr ""
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -213,7 +213,7 @@ msgid "Use TLS"
msgstr ""
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
#: templates/settings.php:39
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 30f2d56afb1..ebbeae5639d 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -54,8 +54,9 @@ msgid "No category to add?"
msgstr "Nemate kategorija koje možete dodati?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Ova kategorija već postoji: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -159,59 +160,59 @@ msgstr "Studeni"
msgid "December"
msgstr "Prosinac"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Postavke"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "sekundi prije"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr ""
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr ""
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "danas"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "jučer"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr ""
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "prošli mjesec"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr ""
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "mjeseci"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "prošlu godinu"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "godina"
@@ -470,7 +471,7 @@ msgstr "Uredi kategorije"
msgid "Add"
msgstr "Dodaj"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr ""
@@ -480,71 +481,75 @@ msgid ""
"OpenSSL extension."
msgstr ""
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr ""
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"For information how to properly configure your server, please see the documentation."
msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Stvori administratorski račun"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Dodatno"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Mapa baze podataka"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Konfiguriraj bazu podataka"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "će se koristiti"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Korisnik baze podataka"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Lozinka baze podataka"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Ime baze podataka"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Database tablespace"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Poslužitelj baze podataka"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Završi postavljanje"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "web usluge pod vašom kontrolom"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Odjava"
@@ -566,14 +571,18 @@ msgstr ""
msgid "Lost your password?"
msgstr "Izgubili ste lozinku?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "zapamtiti"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Prijava"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "prethodan"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 7a03f6b1977..54726b33311 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -20,46 +20,60 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Datoteka je poslana uspješno i bez pogrešaka"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu"
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Datoteka je poslana samo djelomično"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Ni jedna datoteka nije poslana"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Nedostaje privremena mapa"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Neuspjelo pisanje na disk"
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr ""
@@ -71,11 +85,15 @@ msgstr "Datoteke"
msgid "Unshare"
msgstr "Prekini djeljenje"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Briši"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Promjeni ime"
@@ -180,31 +198,31 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Naziv"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Veličina"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Zadnja promjena"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr ""
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr ""
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr ""
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr ""
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index 0665783c041..a5e90a28bb2 100644
--- a/l10n/hr/files_trashbin.po
+++ b/l10n/hr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Ime"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr ""
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr ""
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr ""
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr ""
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index 0425c2dc568..a1fb9209e3b 100644
--- a/l10n/hr/files_versions.po
+++ b/l10n/hr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,45 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr ""
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index af697fb7817..062d280811c 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -24,6 +24,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Nemogićnost učitavanja liste sa Apps Stora"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Greška kod autorizacije"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr ""
@@ -48,10 +57,6 @@ msgstr "Neispravan email"
msgid "Unable to delete group"
msgstr ""
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Greška kod autorizacije"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr ""
@@ -114,7 +119,7 @@ msgstr "Greška"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Spremanje..."
@@ -191,67 +196,83 @@ msgstr ""
msgid "Download iOS Client"
msgstr ""
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Lozinka"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Nemoguće promijeniti lozinku"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Trenutna lozinka"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Nova lozinka"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "prikaz"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Izmjena lozinke"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "e-mail adresa"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Vaša e-mail adresa"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Jezik"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Pomoć prevesti"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr ""
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -213,7 +213,7 @@ msgid "Use TLS"
msgstr ""
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
#: templates/settings.php:39
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index a30b6c37d61..9cd13d6adf5 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -55,8 +55,9 @@ msgid "No category to add?"
msgstr "Nincs hozzáadandó kategória?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Ez a kategória már létezik: "
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -160,59 +161,59 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Beállítások"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "pár másodperce"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "1 perce"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "{minutes} perce"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "1 órája"
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "{hours} órája"
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "ma"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "tegnap"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "{days} napja"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "múlt hónapban"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "{months} hónapja"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "több hónapja"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "tavaly"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "több éve"
@@ -471,7 +472,7 @@ msgstr "Kategóriák szerkesztése"
msgid "Add"
msgstr "Hozzáadás"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Biztonsági figyelmeztetés"
@@ -481,71 +482,75 @@ msgid ""
"OpenSSL extension."
msgstr "Nem érhető el megfelelő véletlenszám-generátor, telepíteni kellene a PHP OpenSSL kiegészítését."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Megfelelő véletlenszám-generátor hiányában egy támadó szándékú idegen képes lehet megjósolni a jelszóvisszaállító tokent, és Ön helyett belépni."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár nem legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Rendszergazdai belépés létrehozása"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Haladó"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Adatkönyvtár"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Adatbázis konfigurálása"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "adatbázist fogunk használni"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Adatbázis felhasználónév"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Adatbázis jelszó"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Az adatbázis neve"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Az adatbázis táblázattér (tablespace)"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Adatbázis szerver"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "A beállítások befejezése"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "webszolgáltatások saját kézben"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Kilépés"
@@ -567,14 +572,18 @@ msgstr "A biztonsága érdekében változtassa meg a jelszavát!"
msgid "Lost your password?"
msgstr "Elfelejtette a jelszavát?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "emlékezzen"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Bejelentkezés"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "előző"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 595e4cd8217..3b40ac770e6 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -24,46 +24,60 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Nem történt feltöltés. Ismeretlen hiba"
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "A fájlt sikerült feltölteni"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét."
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML formban került megadásra."
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Az eredeti fájlt csak részben sikerült feltölteni."
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Nem töltődött fel semmi"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Hiányzik egy ideiglenes mappa"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Nem sikerült a lemezre történő írás"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Nincs elég szabad hely"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Érvénytelen mappa."
@@ -75,11 +89,15 @@ msgstr "Fájlok"
msgid "Unshare"
msgstr "Megosztás visszavonása"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Törlés"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Átnevezés"
@@ -184,31 +202,31 @@ msgstr "Az URL nem lehet semmi."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges."
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Név"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Méret"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Módosítva"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 mappa"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} mappa"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 fájl"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} fájl"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index 5cabef3a633..0f7239c2cdc 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Név"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 mappa"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} mappa"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 fájl"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} fájl"
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index d5db4ac6033..f2b3829c7aa 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,45 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "Korábbi változatok"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Az állományok verzionálása"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 4be00602dd8..d544d5d95b0 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -24,6 +24,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Nem tölthető le a lista az App Store-ból"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Azonosítási hiba"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "A csoport már létezik"
@@ -48,10 +57,6 @@ msgstr "Hibás email"
msgid "Unable to delete group"
msgstr "A csoport nem törölhető"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Azonosítási hiba"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "A felhasználó nem törölhető"
@@ -114,7 +119,7 @@ msgstr "Hiba"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Mentés..."
@@ -191,67 +196,83 @@ msgstr "Android kliens letöltése"
msgid "Download iOS Client"
msgstr "iOS kliens letöltése"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Jelszó"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "A jelszava megváltozott"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "A jelszó nem változtatható meg"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "A jelenlegi jelszó"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Az új jelszó"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "lássam"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "A jelszó megváltoztatása"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "Email"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Az Ön email címe"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Nyelv"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Segítsen a fordításban!"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait."
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Verzió"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -215,8 +215,8 @@ msgid "Use TLS"
msgstr "Használjunk TLS-t"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ne használjuk SSL-kapcsolat esetén, mert nem fog működni!"
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 6359a737f3e..385d32959dc 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 17:02+0100\n"
-"PO-Revision-Date: 2013-01-30 23:40+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -51,8 +51,9 @@ msgid "No category to add?"
msgstr ""
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Iste categoria jam existe:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -156,59 +157,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Decembre"
-#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
+#: js/js.js:284
msgid "Settings"
msgstr "Configurationes"
-#: js/js.js:762
+#: js/js.js:764
msgid "seconds ago"
msgstr ""
-#: js/js.js:763
+#: js/js.js:765
msgid "1 minute ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:765
+#: js/js.js:767
msgid "1 hour ago"
msgstr ""
-#: js/js.js:766
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:767
+#: js/js.js:769
msgid "today"
msgstr ""
-#: js/js.js:768
+#: js/js.js:770
msgid "yesterday"
msgstr ""
-#: js/js.js:769
+#: js/js.js:771
msgid "{days} days ago"
msgstr ""
-#: js/js.js:770
+#: js/js.js:772
msgid "last month"
msgstr ""
-#: js/js.js:771
+#: js/js.js:773
msgid "{months} months ago"
msgstr ""
-#: js/js.js:772
+#: js/js.js:774
msgid "months ago"
msgstr ""
-#: js/js.js:773
+#: js/js.js:775
msgid "last year"
msgstr ""
-#: js/js.js:774
+#: js/js.js:776
msgid "years ago"
msgstr ""
@@ -467,7 +468,7 @@ msgstr "Modificar categorias"
msgid "Add"
msgstr "Adder"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr ""
@@ -477,71 +478,75 @@ msgid ""
"OpenSSL extension."
msgstr ""
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr ""
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"For information how to properly configure your server, please see the documentation."
msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Crear un conto de administration"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Avantiate"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Dossier de datos"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Configurar le base de datos"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "essera usate"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Usator de base de datos"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Contrasigno de base de datos"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Nomine de base de datos"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Hospite de base de datos"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "servicios web sub tu controlo"
-#: templates/layout.user.php:32
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Clauder le session"
@@ -563,14 +568,18 @@ msgstr ""
msgid "Lost your password?"
msgstr "Tu perdeva le contrasigno?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "memora"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Aperir session"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "prev"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 43dd321da08..1ef72be29ba 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -19,46 +19,60 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Le file incargate solmente esseva incargate partialmente"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Nulle file esseva incargate"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Manca un dossier temporari"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr ""
@@ -70,11 +84,15 @@ msgstr "Files"
msgid "Unshare"
msgstr ""
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Deler"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr ""
@@ -179,31 +197,31 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Nomine"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Dimension"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Modificate"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr ""
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr ""
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr ""
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr ""
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 3d86f721da7..a6fdefcf405 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Nomine"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr ""
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr ""
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr ""
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr ""
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index 7b2dbb7efe9..f3b805ad932 100644
--- a/l10n/ia/files_versions.po
+++ b/l10n/ia/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,45 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr ""
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index f465615a985..47c4885728c 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -23,6 +23,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr ""
@@ -47,10 +56,6 @@ msgstr ""
msgid "Unable to delete group"
msgstr ""
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr ""
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr ""
@@ -113,7 +118,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr ""
@@ -190,67 +195,83 @@ msgstr ""
msgid "Download iOS Client"
msgstr ""
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Contrasigno"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Non pote cambiar tu contrasigno"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Contrasigno currente"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Nove contrasigno"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "monstrar"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Cambiar contrasigno"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "E-posta"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Tu adresse de e-posta"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Linguage"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Adjuta a traducer"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr ""
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -213,7 +213,7 @@ msgid "Use TLS"
msgstr ""
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
#: templates/settings.php:39
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 17776e800e2..315f226f156 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -54,8 +54,9 @@ msgid "No category to add?"
msgstr "Tidak ada kategori yang akan ditambahkan?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Kategori ini sudah ada:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -159,59 +160,59 @@ msgstr "Nopember"
msgid "December"
msgstr "Desember"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Setelan"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "1 menit lalu"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr ""
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "hari ini"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "kemarin"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr ""
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "bulan kemarin"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr ""
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "beberapa bulan lalu"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "tahun kemarin"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "beberapa tahun lalu"
@@ -470,7 +471,7 @@ msgstr "Edit kategori"
msgid "Add"
msgstr "Tambahkan"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "peringatan keamanan"
@@ -480,71 +481,75 @@ msgid ""
"OpenSSL extension."
msgstr ""
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "tanpa generator angka acak, penyerang mungkin dapat menebak token reset kata kunci dan mengambil alih akun anda."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"For information how to properly configure your server, please see the documentation."
msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Buat sebuah akun admin"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Tingkat Lanjut"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Folder data"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Konfigurasi database"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "akan digunakan"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Pengguna database"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Password database"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Nama database"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "tablespace basis data"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Host database"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Selesaikan instalasi"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "web service dibawah kontrol anda"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Keluar"
@@ -566,14 +571,18 @@ msgstr "mohon ubah kata kunci untuk mengamankan akun anda"
msgid "Lost your password?"
msgstr "Lupa password anda?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "selalu login"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Masuk"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "sebelum"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 67a86d94ba0..c3b51b237dd 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -20,46 +20,60 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Tidak ada galat, berkas sukses diunggah"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML."
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Berkas hanya diunggah sebagian"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Tidak ada berkas yang diunggah"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Kehilangan folder temporer"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Gagal menulis ke disk"
-#: ajax/upload.php:51
-msgid "Not enough space available"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr ""
@@ -71,11 +85,15 @@ msgstr "Berkas"
msgid "Unshare"
msgstr "batalkan berbagi"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Hapus"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr ""
@@ -180,31 +198,31 @@ msgstr "tautan tidak boleh kosong"
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Nama"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Ukuran"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr ""
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr ""
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr ""
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr ""
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 29afd3eefda..70eaf1fc216 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "nama"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr ""
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr ""
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr ""
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr ""
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 7b9d5d18745..490e0fc8163 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "riwayat"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "pembuatan versi file"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 92aab7dfbf7..2787995bd72 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "autentikasi bermasalah"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr ""
@@ -49,10 +58,6 @@ msgstr "Email tidak sah"
msgid "Unable to delete group"
msgstr ""
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "autentikasi bermasalah"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr ""
@@ -115,7 +120,7 @@ msgstr "kesalahan"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Menyimpan..."
@@ -192,67 +197,83 @@ msgstr ""
msgid "Download iOS Client"
msgstr ""
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Password"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Tidak dapat merubah password anda"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Password saat ini"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "kata kunci baru"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "perlihatkan"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Rubah password"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "Email"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Alamat email anda"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Masukkan alamat email untuk mengaktifkan pemulihan password"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Bahasa"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Bantu menerjemahkan"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr ""
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the ownCloud community, the \n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -214,8 +214,8 @@ msgid "Use TLS"
msgstr "gunakan TLS"
#: templates/settings.php:38
-msgid "Do not use it for SSL connections, it will fail."
-msgstr "jangan gunakan untuk koneksi SSL, itu akan gagal."
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
#: templates/settings.php:39
msgid "Case insensitve LDAP server (Windows)"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index a1d13cee06d..5dd96b65d4b 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-01-31 23:30+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -52,8 +52,9 @@ msgid "No category to add?"
msgstr "Enginn flokkur til að bæta við?"
#: ajax/vcategories/add.php:37
-msgid "This category already exists: "
-msgstr "Þessi flokkur er þegar til:"
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -157,59 +158,59 @@ msgstr "Nóvember"
msgid "December"
msgstr "Desember"
-#: js/js.js:280
+#: js/js.js:284
msgid "Settings"
msgstr "Stillingar"
-#: js/js.js:759
+#: js/js.js:764
msgid "seconds ago"
msgstr "sek síðan"
-#: js/js.js:760
+#: js/js.js:765
msgid "1 minute ago"
msgstr "1 min síðan"
-#: js/js.js:761
+#: js/js.js:766
msgid "{minutes} minutes ago"
msgstr "{minutes} min síðan"
-#: js/js.js:762
+#: js/js.js:767
msgid "1 hour ago"
msgstr "Fyrir 1 klst."
-#: js/js.js:763
+#: js/js.js:768
msgid "{hours} hours ago"
msgstr "fyrir {hours} klst."
-#: js/js.js:764
+#: js/js.js:769
msgid "today"
msgstr "í dag"
-#: js/js.js:765
+#: js/js.js:770
msgid "yesterday"
msgstr "í gær"
-#: js/js.js:766
+#: js/js.js:771
msgid "{days} days ago"
msgstr "{days} dagar síðan"
-#: js/js.js:767
+#: js/js.js:772
msgid "last month"
msgstr "síðasta mánuði"
-#: js/js.js:768
+#: js/js.js:773
msgid "{months} months ago"
msgstr "fyrir {months} mánuðum"
-#: js/js.js:769
+#: js/js.js:774
msgid "months ago"
msgstr "mánuðir síðan"
-#: js/js.js:770
+#: js/js.js:775
msgid "last year"
msgstr "síðasta ári"
-#: js/js.js:771
+#: js/js.js:776
msgid "years ago"
msgstr "árum síðan"
@@ -468,7 +469,7 @@ msgstr "Breyta flokkum"
msgid "Add"
msgstr "Bæta"
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:23 templates/installation.php:30
msgid "Security Warning"
msgstr "Öryggis aðvörun"
@@ -478,71 +479,75 @@ msgid ""
"OpenSSL extension."
msgstr "Enginn traustur slembitölugjafi í boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina."
-#: templates/installation.php:26
+#: templates/installation.php:25
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
msgstr "Án öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn."
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
#: templates/installation.php:32
msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Gagnamappan þín er að öllum líkindum aðgengileg frá internetinu. Skráin .htaccess sem fylgir með ownCloud er ekki að virka. Við mælum eindregið með því að þú stillir vefþjóninn þannig að gagnamappan verði ekki aðgengileg frá internetinu eða færir hana út fyrir vefrótina."
+"For information how to properly configure your server, please see the documentation."
+msgstr ""
#: templates/installation.php:36
msgid "Create an admin account"
msgstr "Útbúa vefstjóra aðgang"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Advanced"
msgstr "Ítarlegt"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Data folder"
msgstr "Gagnamappa"
-#: templates/installation.php:59
+#: templates/installation.php:61
msgid "Configure the database"
msgstr "Stilla gagnagrunn"
-#: templates/installation.php:64 templates/installation.php:75
-#: templates/installation.php:85 templates/installation.php:95
+#: templates/installation.php:66 templates/installation.php:77
+#: templates/installation.php:87 templates/installation.php:97
msgid "will be used"
msgstr "verður notað"
-#: templates/installation.php:107
+#: templates/installation.php:109
msgid "Database user"
msgstr "Gagnagrunns notandi"
-#: templates/installation.php:111
+#: templates/installation.php:113
msgid "Database password"
msgstr "Gagnagrunns lykilorð"
-#: templates/installation.php:115
+#: templates/installation.php:117
msgid "Database name"
msgstr "Nafn gagnagrunns"
-#: templates/installation.php:123
+#: templates/installation.php:125
msgid "Database tablespace"
msgstr "Töflusvæði gagnagrunns"
-#: templates/installation.php:129
+#: templates/installation.php:131
msgid "Database host"
msgstr "Netþjónn gagnagrunns"
-#: templates/installation.php:134
+#: templates/installation.php:136
msgid "Finish setup"
msgstr "Virkja uppsetningu"
-#: templates/layout.guest.php:34
+#: templates/layout.guest.php:33
msgid "web services under your control"
msgstr "vefþjónusta undir þinni stjórn"
-#: templates/layout.user.php:49
+#: templates/layout.user.php:48
msgid "Log out"
msgstr "Útskrá"
@@ -564,14 +569,18 @@ msgstr "Vinsamlegast breyttu lykilorðinu þínu til að tryggja öryggi þitt."
msgid "Lost your password?"
msgstr "Týndir þú lykilorðinu?"
-#: templates/login.php:39
+#: templates/login.php:41
msgid "remember"
msgstr "muna eftir mér"
-#: templates/login.php:41
+#: templates/login.php:43
msgid "Log in"
msgstr "Skrá inn"
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
#: templates/part.pagenavi.php:3
msgid "prev"
msgstr "fyrra"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index f2e66b04646..a1ea0e3040f 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-01 00:17+0100\n"
-"PO-Revision-Date: 2013-01-31 16:20+0000\n"
+"POT-Creation-Date: 2013-02-09 00:12+0100\n"
+"PO-Revision-Date: 2013-02-08 23:12+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -18,46 +18,60 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/upload.php:17
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
msgstr "Engin skrá var send inn. Óþekkt villa."
-#: ajax/upload.php:24
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr "Engin villa, innsending heppnaðist"
-#: ajax/upload.php:25
+#: ajax/upload.php:27
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Innsend skrá er stærri en upload_max stillingin í php.ini:"
-#: ajax/upload.php:27
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Innsenda skráin er stærri en MAX_FILE_SIZE sem skilgreint er í HTML sniðinu."
-#: ajax/upload.php:29
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr "Einungis hluti af innsendri skrá skilaði sér"
-#: ajax/upload.php:30
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr "Engin skrá skilaði sér"
-#: ajax/upload.php:31
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr "Vantar bráðabirgðamöppu"
-#: ajax/upload.php:32
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr "Tókst ekki að skrifa á disk"
-#: ajax/upload.php:51
-msgid "Not enough space available"
-msgstr "Ekki nægt pláss tiltækt"
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:83
msgid "Invalid directory."
msgstr "Ógild mappa."
@@ -69,11 +83,15 @@ msgstr "Skrár"
msgid "Unshare"
msgstr "Hætta deilingu"
-#: js/fileactions.js:119 templates/index.php:91 templates/index.php:92
+#: js/fileactions.js:119
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:121 templates/index.php:91 templates/index.php:92
msgid "Delete"
msgstr "Eyða"
-#: js/fileactions.js:185
+#: js/fileactions.js:187
msgid "Rename"
msgstr "Endurskýra"
@@ -178,31 +196,31 @@ msgstr "Vefslóð má ekki vera tóm."
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Owncloud"
-#: js/files.js:949 templates/index.php:67
+#: js/files.js:953 templates/index.php:67
msgid "Name"
msgstr "Nafn"
-#: js/files.js:950 templates/index.php:78
+#: js/files.js:954 templates/index.php:78
msgid "Size"
msgstr "Stærð"
-#: js/files.js:951 templates/index.php:80
+#: js/files.js:955 templates/index.php:80
msgid "Modified"
msgstr "Breytt"
-#: js/files.js:970
+#: js/files.js:974
msgid "1 folder"
msgstr "1 mappa"
-#: js/files.js:972
+#: js/files.js:976
msgid "{count} folders"
msgstr "{count} möppur"
-#: js/files.js:980
+#: js/files.js:984
msgid "1 file"
msgstr "1 skrá"
-#: js/files.js:982
+#: js/files.js:986
msgid "{count} files"
msgstr "{count} skrár"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 1fc4aad5716..808dfe5a4c3 100644
--- a/l10n/is/files_trashbin.po
+++ b/l10n/is/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,45 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/trash.js:7 js/trash.js:69
+#: ajax/delete.php:22
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:94
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:100 templates/index.php:17
+#: js/trash.js:33
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:125 templates/index.php:17
msgid "Name"
msgstr "Nafn"
-#: js/trash.js:101 templates/index.php:27
+#: js/trash.js:126 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:110
+#: js/trash.js:135
msgid "1 folder"
msgstr "1 mappa"
-#: js/trash.js:112
+#: js/trash.js:137
msgid "{count} folders"
msgstr "{count} möppur"
-#: js/trash.js:120
+#: js/trash.js:145
msgid "1 file"
msgstr "1 skrá"
-#: js/trash.js:122
+#: js/trash.js:147
msgid "{count} files"
msgstr "{count} skrár"
diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po
index 1a0acfa5b88..5ee90ab20db 100644
--- a/l10n/is/files_versions.po
+++ b/l10n/is/files_versions.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"POT-Creation-Date: 2013-02-08 00:10+0100\n"
+"PO-Revision-Date: 2013-02-07 23:11+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,45 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
#: js/versions.js:16
msgid "History"
msgstr "Saga"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
#: templates/settings.php:3
msgid "Files Versioning"
msgstr "Útgáfur af skrám"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 07750ab9e75..fea2c378784 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-02 00:06+0100\n"
-"PO-Revision-Date: 2013-02-01 23:06+0000\n"
+"POT-Creation-Date: 2013-02-07 00:07+0100\n"
+"PO-Revision-Date: 2013-02-06 23:08+0000\n"
"Last-Translator: I Robot \n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -22,6 +22,15 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ekki tókst að hlaða lista frá forrita síðu"
+#: ajax/changedisplayname.php:19 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Villa við auðkenningu"
+
+#: ajax/changedisplayname.php:28
+msgid "Unable to change display name"
+msgstr ""
+
#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr "Hópur er þegar til"
@@ -46,10 +55,6 @@ msgstr "Ógilt netfang"
msgid "Unable to delete group"
msgstr "Ekki tókst að eyða hóp"
-#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Villa við auðkenningu"
-
#: ajax/removeuser.php:24
msgid "Unable to delete user"
msgstr "Ekki tókst að eyða notenda"
@@ -112,7 +117,7 @@ msgstr "Villa"
msgid "Updated"
msgstr ""
-#: js/personal.js:69
+#: js/personal.js:96
msgid "Saving..."
msgstr "Er að vista ..."
@@ -189,67 +194,83 @@ msgstr "Hlaða niður Andoid hugbúnaði"
msgid "Download iOS Client"
msgstr "Hlaða niður iOS hugbúnaði"
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
+#: templates/personal.php:23 templates/users.php:23 templates/users.php:81
msgid "Password"
msgstr "Lykilorð"
-#: templates/personal.php:22
+#: templates/personal.php:24
msgid "Your password was changed"
msgstr "Lykilorði þínu hefur verið breytt"
-#: templates/personal.php:23
+#: templates/personal.php:25
msgid "Unable to change your password"
msgstr "Ekki tókst að breyta lykilorðinu þínu"
-#: templates/personal.php:24
+#: templates/personal.php:26
msgid "Current password"
msgstr "Núverandi lykilorð"
-#: templates/personal.php:25
+#: templates/personal.php:27
msgid "New password"
msgstr "Nýtt lykilorð"
-#: templates/personal.php:26
+#: templates/personal.php:28
msgid "show"
msgstr "sýna"
-#: templates/personal.php:27
+#: templates/personal.php:29
msgid "Change password"
msgstr "Breyta lykilorði"
-#: templates/personal.php:33
+#: templates/personal.php:41 templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:55
msgid "Email"
msgstr "Netfang"
-#: templates/personal.php:34
+#: templates/personal.php:56
msgid "Your email address"
msgstr "Netfangið þitt"
-#: templates/personal.php:35
+#: templates/personal.php:57
msgid "Fill in an email address to enable password recovery"
msgstr "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði"
-#: templates/personal.php:41 templates/personal.php:42
+#: templates/personal.php:63 templates/personal.php:64
msgid "Language"
msgstr "Tungumál"
-#: templates/personal.php:47
+#: templates/personal.php:69
msgid "Help translate"
msgstr "Hjálpa við þýðingu"
-#: templates/personal.php:52
+#: templates/personal.php:74
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:54
+#: templates/personal.php:76
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu"
-#: templates/personal.php:63
+#: templates/personal.php:85
msgid "Version"
msgstr "Útgáfa"
-#: templates/personal.php:65
+#: templates/personal.php:87
msgid ""
"Developed by the
; ?>)
+