diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index ecfc6abc8d506ae3032cf27dc0f37c1f6a958b2d..5869b7df8ce0c541dc662d631f6224a4f24a596b 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -60,6 +60,7 @@
 "Text file" => "Fitxer de text",
 "Folder" => "Carpeta",
 "From link" => "Des d'enllaç",
+"Deleted files" => "Fitxers esborrats",
 "Cancel upload" => "Cancel·la la pujada",
 "Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
 "Download" => "Baixa",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 7376056e4c379a8659b9025d80896039f335beaa..7eebd649cdeb53c9ec560392c4034756fddac3d2 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -60,6 +60,7 @@
 "Text file" => "Textový soubor",
 "Folder" => "Složka",
 "From link" => "Z odkazu",
+"Deleted files" => "Odstraněné soubory",
 "Cancel upload" => "Zrušit odesílání",
 "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
 "Download" => "Stáhnout",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index d96e512ece25b33c5953d975e653b4ecabe385d3..20fdd2f8153d795217a72e8e19e8f5d84a1f550a 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben - Datei mit diesem Namen existiert bereits.",
-"Could not move %s" => "Konnte %s nicht verschieben",
-"Unable to rename file" => "Konnte Datei nicht umbenennen",
+"Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden - eine Datei mit diesem Namen existiert bereits.",
+"Could not move %s" => "%s konnte nicht verschoben werden",
+"Unable to rename file" => "Die Datei konnte nicht umbenannt werden",
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
 "There is no error, the file uploaded with success" => "Datei fehlerfrei hochgeladen.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
@@ -60,6 +60,7 @@
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
 "From link" => "Von einem Link",
+"Deleted files" => "Gelöschte Dateien",
 "Cancel upload" => "Upload abbrechen",
 "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
 "Download" => "Herunterladen",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 0dfc19ff01bd9570b1c464760a4ffd3d11de8f6a..8d119afada4120740341c2628d755a66d6757495 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -60,6 +60,7 @@
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
 "From link" => "Von einem Link",
+"Deleted files" => "Gelöschte Dateien",
 "Cancel upload" => "Upload abbrechen",
 "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
 "Download" => "Herunterladen",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 2a110afa9602e08d10ca4c1850ddb2479cf5a818..60456d180d3ada4d5758e82f73bd97dadc6044ab 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -60,6 +60,7 @@
 "Text file" => "Αρχείο κειμένου",
 "Folder" => "Φάκελος",
 "From link" => "Από σύνδεσμο",
+"Deleted files" => "Διαγραμμένα αρχεία",
 "Cancel upload" => "Ακύρωση αποστολής",
 "Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!",
 "Download" => "Λήψη",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 0dc423f96f5a88096f25b2c125be4d8f45fc5601..1e87eff9ba49ee18c03fecbc43bf1993069c69c0 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -60,6 +60,7 @@
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
 "From link" => "Desde enlace",
+"Deleted files" => "Archivos Borrados",
 "Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
 "Download" => "Descargar",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 10f19cf4cbb53763ad1d1540139dbd2dc6a2a437..796f1c4009d32c3da7061ca90ccfdfa1ae8863de 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -60,6 +60,7 @@
 "Text file" => "Testu fitxategia",
 "Folder" => "Karpeta",
 "From link" => "Estekatik",
+"Deleted files" => "Ezabatutako fitxategiak",
 "Cancel upload" => "Ezeztatu igoera",
 "Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
 "Download" => "Deskargatu",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 81ac32c09f3a08dd78d2c1d76668db8d57aeb37b..ba6e3ecb4a4981877262ae345b85f659a9dbfc64 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -54,6 +54,7 @@
 "Text file" => "Tekstitiedosto",
 "Folder" => "Kansio",
 "From link" => "Linkistä",
+"Deleted files" => "Poistetut tiedostot",
 "Cancel upload" => "Peru lähetys",
 "Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
 "Download" => "Lataa",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 91896b8e39b660f89516aa971d13c937e063751d..202f2becd36fcd4ffe6ca42428e7fb9cf0b8a1dc 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -17,7 +17,7 @@
 "Delete" => "Eliminar",
 "Rename" => "Renomear",
 "Pending" => "Pendentes",
-"{new_name} already exists" => "xa existe un {new_name}",
+"{new_name} already exists" => "Xa existe un {new_name}",
 "replace" => "substituír",
 "suggest name" => "suxerir nome",
 "cancel" => "cancelar",
@@ -60,8 +60,9 @@
 "Text file" => "Ficheiro de texto",
 "Folder" => "Cartafol",
 "From link" => "Desde a ligazón",
+"Deleted files" => "Ficheiros eliminados",
 "Cancel upload" => "Cancelar o envío",
-"Nothing in here. Upload something!" => "Aquí non hai nada por aquí. Envíe algo.",
+"Nothing in here. Upload something!" => "Aquí non hai nada. Envíe algo.",
 "Download" => "Descargar",
 "Unshare" => "Deixar de compartir",
 "Upload too large" => "Envío demasiado grande",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 9eed324415abe7855be13b3aa3c30465ec943f93..7a11c303f5e25b91016218e40fef225db396b66f 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -60,6 +60,7 @@
 "Text file" => "Szövegfájl",
 "Folder" => "Mappa",
 "From link" => "Feltöltés linkről",
+"Deleted files" => "Törölt fájlok",
 "Cancel upload" => "A feltöltés megszakítása",
 "Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
 "Download" => "Letöltés",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 583a0ca7f7d5427ed64636bd7612632dbee7ab5e..33a2fbda7130c207480dfc2927f59b15ccbddd31 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -60,6 +60,7 @@
 "Text file" => "File di testo",
 "Folder" => "Cartella",
 "From link" => "Da collegamento",
+"Deleted files" => "File eliminati",
 "Cancel upload" => "Annulla invio",
 "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
 "Download" => "Scarica",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 85ec6b6e953fd979e8fe737ebc9780aa548eabb1..8d1a95e243e08eb5fa4495589237d77cda17ff4f 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -60,6 +60,7 @@
 "Text file" => "テキストファイル",
 "Folder" => "フォルダ",
 "From link" => "リンク",
+"Deleted files" => "削除ファイル",
 "Cancel upload" => "アップロードをキャンセル",
 "Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
 "Download" => "ダウンロード",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 9d4d2c9fb6caf70d8b062edda26316669382ffea..30b1f4eccb11cf526dd98829cd4cf98f8f36049d 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -60,6 +60,7 @@
 "Text file" => "Teksta datne",
 "Folder" => "Mape",
 "From link" => "No saites",
+"Deleted files" => "Dzēstās datnes",
 "Cancel upload" => "Atcelt augšupielādi",
 "Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!",
 "Download" => "Lejupielādēt",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index e036b3dacbb5895e63a938703810a33a736b48a7..6f51cc6deaf0385e6a4855716d3bff7a4383bf31 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -60,6 +60,7 @@
 "Text file" => "Ficheiro de texto",
 "Folder" => "Pasta",
 "From link" => "Da ligação",
+"Deleted files" => "Ficheiros eliminados",
 "Cancel upload" => "Cancelar envio",
 "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
 "Download" => "Transferir",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 803b34e99c8efbb3c0a76f33f313a1005ff51257..7bfd93c9e477ed08460075f02d0618aae57e80dc 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -60,6 +60,7 @@
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
 "From link" => "Из ссылки",
+"Deleted files" => "Удалённые файлы",
 "Cancel upload" => "Отмена загрузки",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
 "Download" => "Скачать",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 8ece8140d8a15d273915a9c86a32aa5111d47902..f3634af6f2effcfec8c8325b5689bd221201f56c 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -60,6 +60,7 @@
 "Text file" => "Textový súbor",
 "Folder" => "Priečinok",
 "From link" => "Z odkazu",
+"Deleted files" => "Zmazané súbory",
 "Cancel upload" => "Zrušiť odosielanie",
 "Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
 "Download" => "Stiahnuť",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index b069246f01767292cddc72304271e04b25d285ec..2c97033154b21d94ef51fff7c7ed25388fb9f7f0 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -60,6 +60,7 @@
 "Text file" => "Tập tin văn bản",
 "Folder" => "Thư mục",
 "From link" => "Từ liên kết",
+"Deleted files" => "File đã bị xóa",
 "Cancel upload" => "Hủy upload",
 "Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
 "Download" => "Tải xuống",
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index b942c659f9e2f01e81e4c91e1af7f5332494d720..4f08b98eb29fdb50d0866b4b8ead9a1e9a468e38 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "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:",
+"The following file types will not be encrypted:" => "Die folgenden Dateitypen werden nicht verschlüsselt:",
+"Exclude the following file types from encryption:" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen:",
 "None" => "Keine"
 );
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 36ef48462a7b01137353a00ed7741d949a57431e..d31c2f35a68f866bb95c82210b89dc6fe059f2bd 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -394,8 +394,12 @@ class OC_Mount_Config {
 	public static function checkDependencies() {
 		$l= new OC_L10N('files_external');
 		$txt='';
-		if(!OC_Mount_Config::checksmbclient()) $txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />';
-		if(!OC_Mount_Config::checkphpftp()) $txt.=$l->t('<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.').'<br />';
+		if(!OC_Mount_Config::checksmbclient()) {
+			$txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />';
+		}
+		if(!OC_Mount_Config::checkphpftp()) {
+			$txt.=$l->t('<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.').'<br />';
+		}
 
 		return($txt);
 	}
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 7396c7e3f2795dfdaabf3faa22cf6a0904c5bcc1..f9bd4075f3eb5db0c125b38d05e970bfd9f1a2bf 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -268,7 +268,7 @@ class Google extends \OC\Files\Storage\Common {
 						$name .= '.'.$extension;
 					}
 				}
-				$files[] = $name;
+				$files[] = basename($name);
 				// Cache entry for future use
 				$this->entries[$name] = $entry;
 			}
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index 551a5a64ef2f6e32347c32f28d59f54683ce9523..3527f50ec98ab05e6fc9117c7610068433b3dc5f 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -7,8 +7,9 @@
  */
 namespace OC\Files\Storage;
 
-set_include_path(get_include_path() . PATH_SEPARATOR . \OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib');
-require('Net/SFTP.php');
+set_include_path(get_include_path() . PATH_SEPARATOR .
+	\OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib');
+require 'Net/SFTP.php';
 
 class SFTP extends \OC\Files\Storage\Common {
 	private $host;
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index df8d7d6e2b5f441b0b9201d413ed0d1324311354..3709fd2e51d5034f0110d79631d22834fa07d68b 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -18,7 +18,7 @@
 			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
 				<tr <?php echo ($mountPoint != '') ? 'class="'.$mount['class'].'"' : 'id="addMountPoint"'; ?>>
 					<td class="mountPoint"><input type="text" name="mountPoint"
-												  value="<?php echo $mountPoint; ?>"
+												  value="<?php p($mountPoint); ?>"
 												  placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
 					<?php if ($mountPoint == ''): ?>
 						<td class="backend">
@@ -149,6 +149,7 @@
 			<?php endforeach; ?>
 			</tbody>
 		</table>
+		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken']; ?>">
 		<input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
 		<input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
 </fieldset>
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 13f42b130df5f48ad1211c8dbeb52b90ce5d06c9..13298f113f8f767f707374bffe612f37aa455624 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -71,4 +71,5 @@ p.info a {
 
 thead{
 	background-color: white;
+	padding-left:0 !important; /* fixes multiselect bar offset on shared page */
 }
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 7cb1834141bf28e0d862ae5196ab4e7e207e793f..6d944b3580c9b44c61ad8e032f8c0fdb80fff018 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Konnte %s nicht permanent löschen",
+"Couldn't delete %s permanently" => "Konnte %s nicht entgültig löschen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
-"perform restore operation" => "Führe die Wiederherstellung aus",
+"perform restore operation" => "Wiederherstellung ausführen",
 "delete file permanently" => "Datei entgültig löschen",
 "Name" => "Name",
 "Deleted" => "Gelöscht",
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
index f62043dade2bcf46f3471aacdf597015e8c0f8b8..d7427fbbbf25353cd4369842707efea058270366 100644
--- a/apps/files_versions/l10n/de.php
+++ b/apps/files_versions/l10n/de.php
@@ -7,7 +7,7 @@
 "No old versions available" => "Keine älteren Versionen verfügbar",
 "No path specified" => "Kein Pfad angegeben",
 "History" => "Historie",
-"Revert a file to a previous version by clicking on its revert button" => "Setzen Sie eine Datei durch klicken auf den Zurücksetzen Button zurück",
+"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch klicken auf den Zurücksetzen Button zurück",
 "Files Versioning" => "Dateiversionierung",
 "Enable" => "Aktivieren"
 );
diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php
index 1cf2a63a1de0696a15847a10cc26e9fc84458711..ba849c5ea87ae9b43bde81cd4788fb285c606bbc 100644
--- a/apps/files_versions/l10n/de_DE.php
+++ b/apps/files_versions/l10n/de_DE.php
@@ -4,10 +4,10 @@
 "File %s was reverted to version %s" => "Die Datei %s wurde zur Version %s zurückgesetzt",
 "failure" => "Fehlgeschlagen",
 "File %s could not be reverted to version %s" => "Die Datei %s konnte nicht zur Version %s zurückgesetzt werden",
-"No old versions available" => "keine älteren Versionen verfügbar",
+"No old versions available" => "Keine älteren Versionen verfügbar",
 "No path specified" => "Kein Pfad angegeben",
 "History" => "Historie",
-"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch Klicken, auf den Zurücksetzen-Button, auf einer frühere Version zurück",
+"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch Klicken auf den Zurücksetzen-Button auf eine frühere Version zurück",
 "Files Versioning" => "Dateiversionierung",
 "Enable" => "Aktivieren"
 );
diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php
index f8038e31469c545fd91682c9d975bab39c833989..7ce1258a7967e7b8cd711f021b4f0fe4346b213d 100644
--- a/apps/user_ldap/ajax/testConfiguration.php
+++ b/apps/user_ldap/ajax/testConfiguration.php
@@ -32,10 +32,13 @@ $connection = new \OCA\user_ldap\lib\Connection('', null);
 if($connection->setConfiguration($_POST)) {
 	//Configuration is okay
 	if($connection->bind()) {
-		OCP\JSON::success(array('message' => $l->t('The configuration is valid and the connection could be established!')));
+		OCP\JSON::success(array('message'
+			=> $l->t('The configuration is valid and the connection could be established!')));
 	} else {
-		OCP\JSON::error(array('message' => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
+		OCP\JSON::error(array('message'
+			=> $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
 	}
 } else {
-	OCP\JSON::error(array('message' => $l->t('The configuration is invalid. Please look in the ownCloud log for further details.')));
+	OCP\JSON::error(array('message'
+		=> $l->t('The configuration is invalid. Please look in the ownCloud log for further details.')));
 }
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index dec87684c9e52d7d4a1d31a7a2c86935370fb826..89410b5ef07e821cae7046c55197c98bda73a409 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -51,5 +51,7 @@ $entry = array(
 
 OCP\Backgroundjob::addRegularTask('OCA\user_ldap\lib\Jobs', 'updateGroups');
 if(OCP\App::isEnabled('user_webdavauth')) {
-	OCP\Util::writeLog('user_ldap', 'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour', OCP\Util::WARN);
+	OCP\Util::writeLog('user_ldap',
+		'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
+		OCP\Util::WARN);
 }
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index bc32d4ef4ccc32b3fd70fbb9ab58b7cfe5b162c9..2fcbf1902ac54b9c65479047b4457ff10c2ee0aa 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -58,7 +58,9 @@ foreach($objects as $object) {
 		try {
 			$updateQuery->execute(array($newDN, $uuid, $dn['ldap_dn']));
 		} catch(Exception $e) {
-		    \OCP\Util::writeLog('user_ldap', 'Could not update '.$object.' '.$dn['ldap_dn'].' in the mappings table. ', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'Could not update '.$object.' '.$dn['ldap_dn'].' in the mappings table. ',
+				\OCP\Util::WARN);
 		}
 
 	}
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 02ceecaea0bd3492678ce14394050f3289b49335..4fd4c636913cffa5ca04eca62d87e4d40ef88cf6 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -177,7 +177,8 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			if($isMemberUid) {
 				//we got uids, need to get their DNs to 'tranlsate' them to usernames
 				$filter = $this->combineFilterWithAnd(array(
-					\OCP\Util::mb_str_replace('%uid', $member, $this->connection>ldapLoginFilter, 'UTF-8'),
+					\OCP\Util::mb_str_replace('%uid', $member,
+						$this->connection>ldapLoginFilter, 'UTF-8'),
 					$this->getFilterPartForUserSearch($search)
 				));
 				$ldap_users = $this->fetchListOfUsers($filter, 'dn');
@@ -188,7 +189,9 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			} else {
 				//we got DNs, check if we need to filter by search or we can give back all of them
 				if(!empty($search)) {
-					if(!$this->readAttribute($member, $this->connection->ldapUserDisplayName, $this->getFilterPartForUserSearch($search))) {
+					if(!$this->readAttribute($member,
+						$this->connection->ldapUserDisplayName,
+						$this->getFilterPartForUserSearch($search))) {
 						continue;
 					}
 				}
@@ -225,7 +228,8 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			return $ldap_groups;
 		}
 
-		// if we'd pass -1 to LDAP search, we'd end up in a Protocol error. With a limit of 0, we get 0 results. So we pass null.
+		// if we'd pass -1 to LDAP search, we'd end up in a Protocol
+		// error. With a limit of 0, we get 0 results. So we pass null.
 		if($limit <= 0) {
 			$limit = null;
 		}
@@ -234,7 +238,8 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			$this->getFilterPartForGroupSearch($search)
 		));
 		\OCP\Util::writeLog('user_ldap', 'getGroups Filter '.$filter, \OCP\Util::DEBUG);
-		$ldap_groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName, 'dn'), $limit, $offset);
+		$ldap_groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName, 'dn'),
+			$limit, $offset);
 		$ldap_groups = $this->ownCloudGroupNames($ldap_groups);
 
 		$this->connection->writeToCache($cachekey, $ldap_groups);
@@ -282,7 +287,8 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
 	*/
 	public function implementsActions($actions) {
-		//always returns false, because possible actions are modifying actions. We do not write to LDAP, at least for now.
+		//always returns false, because possible actions are modifying
+		// actions. We do not write to LDAP, at least for now.
 		return false;
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index a1da7d49cbea5ef2c8768ad22f06b730c482f796..182025e8fb9ba047c2b50816e50a99fd9dd3b05d 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -12,7 +12,7 @@
 "Do you really want to delete the current Server Configuration?" => "Wollen Sie die aktuelle Serverkonfiguration wirklich löschen?",
 "Confirm Deletion" => "Löschung bestätigen",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren.",
 "Server configuration" => "Serverkonfiguration",
 "Add Server Configuration" => "Serverkonfiguration hinzufügen",
 "Host" => "Host",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 69faf5dc45d62cfa9ac99463eaddd429fb2e530d..45edda2debba0a337caa65e837bba0636b369877 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,20 +1,20 @@
 <?php $TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Das Löschen der Server-Konfiguration schlug fehl",
-"The configuration is valid and the connection could be established!" => "Die Konfiguration ist valide und eine Verbindung konnte hergestellt werden!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist valide, aber das Herstellen einer Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate.",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist nicht valide. Weitere Details können Sie im ownCloud-Log nachlesen.",
+"The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig, aber das Herstellen der Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig. Weitere Details können Sie im ownCloud-Log nachlesen.",
 "Deletion failed" => "Löschen fehlgeschlagen",
-"Take over settings from recent server configuration?" => "Sollen die Einstellungen der letzten Server-Konfiguration übernommen werden?",
+"Take over settings from recent server configuration?" => "Sollen die Einstellungen der letzten Serverkonfiguration übernommen werden?",
 "Keep settings?" => "Einstellungen behalten?",
-"Cannot add server configuration" => "Das Hinzufügen der Server-Konfiguration schlug fehl",
-"Connection test succeeded" => "Verbindungs-Test erfolgreich",
-"Connection test failed" => "Verbindungs-Test fehlgeschlagen",
-"Do you really want to delete the current Server Configuration?" => "Möchten Sie wirklich die Server-Konfiguration löschen?",
+"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"Connection test succeeded" => "Verbindungstest erfolgreich",
+"Connection test failed" => "Verbindungstest fehlgeschlagen",
+"Do you really want to delete the current Server Configuration?" => "Möchten Sie die Serverkonfiguration wirklich löschen?",
 "Confirm Deletion" => "Löschung bestätigen",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP ist nicht installiert, das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
-"Server configuration" => "Server-Konfiguration",
-"Add Server Configuration" => "Server-Konfiguration hinzufügen",
+"Server configuration" => "Serverkonfiguration",
+"Add Server Configuration" => "Serverkonfiguration hinzufügen",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
 "Base DN" => "Basis-DN",
@@ -33,7 +33,7 @@
 "Group Filter" => "Gruppen-Filter",
 "Defines the filter to apply, when retrieving groups." => "Definiert den Filter für die Anfrage der Gruppen.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
-"Connection Settings" => "Verbindungs-Einstellungen",
+"Connection Settings" => "Verbindungseinstellungen",
 "Configuration Active" => "Konfiguration aktiv",
 "When unchecked, this configuration will be skipped." => "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
 "Port" => "Port",
@@ -41,7 +41,7 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Optionaler Backup Host. Es muss ein Replikat des eigentlichen LDAP/AD Servers sein.",
 "Backup (Replica) Port" => "Back-Up (Replikation) Port",
 "Disable Main Server" => "Hauptserver deaktivieren",
-"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich ownCloud nur mit dem Replilat-Server verbinden.",
+"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich ownCloud nur mit dem Replikat-Server verbinden.",
 "Use TLS" => "Nutze TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern.",
 "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
@@ -49,7 +49,7 @@
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.",
 "Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
 "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
-"Directory Settings" => "Verzeichnis-Einstellungen",
+"Directory Settings" => "Verzeichniseinstellungen",
 "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ",
 "Base User Tree" => "Basis-Benutzerbaum",
@@ -62,7 +62,7 @@
 "One Group Base DN per line" => "Ein Gruppen Base DN pro Zeile",
 "Group Search Attributes" => "Gruppen-Suche Eigenschaften",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
-"Special Attributes" => "besondere Eigenschaften",
+"Special Attributes" => "Besondere Eigenschaften",
 "in bytes" => "in Bytes",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.",
 "Help" => "Hilfe"
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index 7c0940dc09c6466fc406a25d63eee02ac103ac06..96ec818043720609a18b29cc0732afe1422ca3fe 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -1,6 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Αποτυχία διαγραφής ρυθμίσεων διακομιστή",
+"The configuration is valid and the connection could be established!" => "Οι ρυθμίσεις είναι έγκυρες και η σύνδεση μπορεί να πραγματοποιηθεί!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Οι ρυθμίσεις είναι έγκυρες, αλλά απέτυχε η σύνδεση. Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή και τα διαπιστευτήρια.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Μη έγκυρες ρυθμίσεις. Παρακαλώ ελέγξτε τις καταγραφές του ownCloud για περισσότερες λεπτομέρειες.",
 "Deletion failed" => "Η διαγραφή απέτυχε",
+"Keep settings?" => "Διατήρηση ρυθμίσεων;",
+"Cannot add server configuration" => "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
+"Connection test succeeded" => "Επιτυχημένη δοκιμαστική σύνδεση",
+"Connection test failed" => "Αποτυχημένη δοκιμαστική σύνδεσης.",
+"Do you really want to delete the current Server Configuration?" => "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
+"Confirm Deletion" => "Επιβεβαίωση Διαγραφής",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Προσοχή:</b> Το άρθρωμα PHP LDAP δεν είναι εγκατεστημένο και το σύστημα υποστήριξης δεν θα δουλέψει. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να το εγκαταστήσει.",
+"Server configuration" => "Ρυθμίσεις Διακομιστή",
+"Add Server Configuration" => "Προσθήκη Ρυθμίσεων Διακομιστή",
 "Host" => "Διακομιστής",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
 "Base DN" => "Base DN",
@@ -18,6 +31,7 @@
 "Group Filter" => "Group Filter",
 "Defines the filter to apply, when retrieving groups." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\".",
+"Connection Settings" => "Ρυθμίσεις Σύνδεσης",
 "Port" => "Θύρα",
 "Use TLS" => "Χρήση TLS",
 "Case insensitve LDAP server (Windows)" => "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ",
@@ -25,6 +39,7 @@
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας.",
 "Not recommended, use for testing only." => "Δεν προτείνεται, χρήση μόνο για δοκιμές.",
 "in seconds. A change empties the cache." => "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.",
+"Directory Settings" => "Ρυθμίσεις Καταλόγου",
 "User Display Name Field" => "Πεδίο Ονόματος Χρήστη",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud.",
 "Base User Tree" => "Base User Tree",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 7ab4d00e7566dc0db095635d0a784dd82262a9bc..46d93dc3a44b63950c12143d5e0f0f8df87f1c1b 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -4,6 +4,7 @@
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurazioa ez dago ongi. Mesedez ikusi ownCloud-en egunerokoa informazio gehiago eskuratzeko.",
 "Deletion failed" => "Ezabaketak huts egin du",
+"Take over settings from recent server configuration?" => "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
 "Keep settings?" => "Mantendu ezarpenak?",
 "Cannot add server configuration" => "Ezin da zerbitzariaren konfigurazioa gehitu",
 "Connection test succeeded" => "Konexio froga ongi burutu da",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 36c1f7af11483e626e05e5094aa6e7767da4398c..2d07f3215efbfe7b1c88ce6d16117ec81607522f 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -1,9 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Non foi posíbel eliminar a configuración do servidor",
+"The configuration is valid and the connection could be established!" => "A configuración é correcta e pode estabelecerse a conexión.",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles",
 "Deletion failed" => "Fallou o borrado",
+"Take over settings from recent server configuration?" => "Tomar os recentes axustes de configuración do servidor?",
+"Keep settings?" => "Manter os axustes?",
+"Cannot add server configuration" => "Non é posíbel engadir a configuración do servidor",
+"Connection test succeeded" => "A proba de conexión foi satisfactoria",
+"Connection test failed" => "A proba de conexión fracasou",
+"Do you really want to delete the current Server Configuration?" => "Confirma que quere eliminar a configuración actual do servidor?",
+"Confirm Deletion" => "Confirmar a eliminación",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatíbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar un deles.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo.",
+"Server configuration" => "Configuración do servidor",
+"Add Server Configuration" => "Engadir a configuración do servidor",
 "Host" => "Servidor",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
 "Base DN" => "DN base",
+"One Base DN per line" => "Un DN base por liña",
 "You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»",
 "User DN" => "DN do usuario",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso anónimo deixe o DN e o contrasinal baleiros.",
@@ -18,20 +33,36 @@
 "Group Filter" => "Filtro de grupo",
 "Defines the filter to apply, when retrieving groups." => "Define o filtro a aplicar cando se recompilan os grupos.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix».",
+"Connection Settings" => "Axustes da conexión",
+"Configuration Active" => "Configuración activa",
+"When unchecked, this configuration will be skipped." => "Se está sen marcar, omítese esta configuración.",
 "Port" => "Porto",
+"Backup (Replica) Host" => "Servidor da copia de seguranza (Réplica)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD.",
+"Backup (Replica) Port" => "Porto da copia de seguranza (Réplica)",
+"Disable Main Server" => "Desactivar o servidor principal",
+"When switched on, ownCloud will only connect to the replica server." => "Cando está activado, ownCloud só se conectará ao servidor de réplica.",
 "Use TLS" => "Usar TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Non utilizalo ademais para conexións LDAPS xa que fallará.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)",
 "Turn off SSL certificate validation." => "Desactiva a validación do certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor ownCloud.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexión só funciona con esta opción importe o certificado SSL do servidor LDAP no seu servidor ownCloud.",
 "Not recommended, use for testing only." => "Non se recomenda. Só para probas.",
 "in seconds. A change empties the cache." => "en segundos. Calquera cambio baleira a caché.",
+"Directory Settings" => "Axustes do directorio",
 "User Display Name Field" => "Campo de mostra do nome de usuario",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud.",
 "Base User Tree" => "Base da árbore de usuarios",
+"One User Base DN per line" => "Un DN base de usuario por liña",
+"User Search Attributes" => "Atributos de busca do usuario",
+"Optional; one attribute per line" => "Opcional; un atributo por liña",
 "Group Display Name Field" => "Campo de mostra do nome de grupo",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "O atributo LDAP úsase para xerar os nomes dos grupos de ownCloud.",
 "Base Group Tree" => "Base da árbore de grupo",
+"One Group Base DN per line" => "Un DN base de grupo por liña",
+"Group Search Attributes" => "Atributos de busca do grupo",
 "Group-Member association" => "Asociación de grupos e membros",
+"Special Attributes" => "Atributos especiais",
 "in bytes" => "en bytes",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD.",
 "Help" => "Axuda"
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 4aa8ae8e8a49fd1dea84d6f81f7821a13b621bbc..901299e7c219eeccaf0b9717f12b1eafd860a62a 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -48,7 +48,9 @@ abstract class Access {
 	 */
 	public function readAttribute($dn, $attr, $filter = 'objectClass=*') {
 		if(!$this->checkConnection()) {
-			\OCP\Util::writeLog('user_ldap', 'No LDAP Connector assigned, access impossible for readAttribute.', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'No LDAP Connector assigned, access impossible for readAttribute.',
+				\OCP\Util::WARN);
 			return false;
 		}
 		$cr = $this->connection->getConnectionResource();
@@ -123,7 +125,8 @@ abstract class Access {
 			return $result;
 		}
 
-		//OID sometimes gives back DNs with whitespace after the comma a la "uid=foo, cn=bar, dn=..." We need to tackle this!
+		//OID sometimes gives back DNs with whitespace after the comma
+		// a la "uid=foo, cn=bar, dn=..." We need to tackle this!
 		$dn = preg_replace('/([^\\\]),(\s+)/u', '\1,', $dn);
 
 		//make comparisons and everything work
@@ -218,7 +221,8 @@ abstract class Access {
 	 * @param $ldapname optional, the display name of the object
 	 * @returns string with with the name to use in ownCloud, false on DN outside of search DN
 	 *
-	 * returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
+	 * returns the internal ownCloud name for the given LDAP DN of the
+	 * group, false on DN outside of search DN or failure
 	 */
 	public function dn2groupname($dn, $ldapname = null) {
 		//To avoid bypassing the base DN settings under certain circumstances
@@ -646,7 +650,9 @@ abstract class Access {
 		$sr = ldap_search($linkResources, $base, $filter, $attr);
 		$error = ldap_errno($link_resource);
 		if(!is_array($sr) || $error > 0) {
-			\OCP\Util::writeLog('user_ldap', 'Error when searching: '.ldap_error($link_resource).' code '.ldap_errno($link_resource), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('user_ldap',
+				'Error when searching: '.ldap_error($link_resource).' code '.ldap_errno($link_resource),
+				\OCP\Util::ERROR);
 			\OCP\Util::writeLog('user_ldap', 'Attempt for Paging?  '.print_r($pagedSearchOK, true), \OCP\Util::ERROR);
 			return array();
 		}
@@ -668,7 +674,9 @@ abstract class Access {
 			if($skipHandling) {
 				return;
 			}
-			//if count is bigger, then the server does not support paged search. Instead, he did a normal search. We set a flag here, so the callee knows how to deal with it.
+			// if count is bigger, then the server does not support
+			// paged search. Instead, he did a normal search. We set a
+			// flag here, so the callee knows how to deal with it.
 			if($findings['count'] <= $limit) {
 				$this->pagedSearchedSuccessful = true;
 			}
@@ -702,7 +710,9 @@ abstract class Access {
 						$key = mb_strtolower($key, 'UTF-8');
 						if(isset($item[$key])) {
 							if($key != 'dn') {
-								$selection[$i][$key] = $this->resemblesDN($key) ? $this->sanitizeDN($item[$key][0]) : $item[$key][0];
+								$selection[$i][$key] = $this->resemblesDN($key) ?
+									$this->sanitizeDN($item[$key][0])
+									: $item[$key][0];
 							} else {
 								$selection[$i][$key] = $this->sanitizeDN($item[$key]);
 							}
@@ -806,7 +816,9 @@ abstract class Access {
 	 * @return string the final filter part to use in LDAP searches
 	 */
 	public function getFilterPartForUserSearch($search) {
-		return $this->getFilterPartForSearch($search, $this->connection->ldapAttributesForUserSearch, $this->connection->ldapUserDisplayName);
+		return $this->getFilterPartForSearch($search,
+			$this->connection->ldapAttributesForUserSearch,
+			$this->connection->ldapUserDisplayName);
 	}
 
 	/**
@@ -815,7 +827,9 @@ abstract class Access {
 	 * @return string the final filter part to use in LDAP searches
 	 */
 	public function getFilterPartForGroupSearch($search) {
-		return $this->getFilterPartForSearch($search, $this->connection->ldapAttributesForGroupSearch, $this->connection->ldapGroupDisplayName);
+		return $this->getFilterPartForSearch($search,
+			$this->connection->ldapAttributesForGroupSearch,
+			$this->connection->ldapGroupDisplayName);
 	}
 
 	/**
@@ -874,13 +888,15 @@ abstract class Access {
 		foreach($testAttributes as $attribute) {
 			\OCP\Util::writeLog('user_ldap', 'Testing '.$attribute.' as UUID attr', \OCP\Util::DEBUG);
 
-		    $value = $this->readAttribute($dn, $attribute);
-		    if(is_array($value) && isset($value[0]) && !empty($value[0])) {
+			$value = $this->readAttribute($dn, $attribute);
+			if(is_array($value) && isset($value[0]) && !empty($value[0])) {
 				\OCP\Util::writeLog('user_ldap', 'Setting '.$attribute.' as UUID attr', \OCP\Util::DEBUG);
 				$this->connection->ldapUuidAttribute = $attribute;
 				return true;
-		    }
-		    \OCP\Util::writeLog('user_ldap', 'The looked for uuid attr is not '.$attribute.', result was '.print_r($value, true), \OCP\Util::DEBUG);
+			}
+			\OCP\Util::writeLog('user_ldap',
+				'The looked for uuid attr is not '.$attribute.', result was '.print_r($value, true),
+				\OCP\Util::DEBUG);
 		}
 
 		return false;
@@ -888,7 +904,9 @@ abstract class Access {
 
 	public function getUUID($dn) {
 		if($this->detectUuidAttribute($dn)) {
-			\OCP\Util::writeLog('user_ldap', 'UUID Checking \ UUID for '.$dn.' using '. $this->connection->ldapUuidAttribute, \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('user_ldap',
+				'UUID Checking \ UUID for '.$dn.' using '. $this->connection->ldapUuidAttribute,
+				\OCP\Util::DEBUG);
 			$uuid = $this->readAttribute($dn, $this->connection->ldapUuidAttribute);
 			if(!is_array($uuid) && $this->connection->ldapOverrideUuidAttribute) {
 				$this->detectUuidAttribute($dn, true);
@@ -1027,13 +1045,18 @@ abstract class Access {
 		$pagedSearchOK = false;
 		if($this->connection->hasPagedResultSupport && !is_null($limit)) {
 			$offset = intval($offset); //can be null
-			\OCP\Util::writeLog('user_ldap', 'initializing paged search for  Filter'.$filter.' base '.print_r($bases, true).' attr '.print_r($attr, true). ' limit ' .$limit.' offset '.$offset, \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'initializing paged search for  Filter'.$filter.' base '.print_r($bases, true)
+				.' attr '.print_r($attr, true). ' limit ' .$limit.' offset '.$offset,
+				\OCP\Util::INFO);
 			//get the cookie from the search for the previous search, required by LDAP
 			foreach($bases as $base) {
 
 				$cookie = $this->getPagedResultCookie($base, $filter, $limit, $offset);
 				if(empty($cookie) && ($offset > 0)) {
-					//no cookie known, although the offset is not 0. Maybe cache run out. We need to start all over *sigh* (btw, Dear Reader, did you need LDAP paged searching was designed by MSFT?)
+					// no cookie known, although the offset is not 0. Maybe cache run out. We need
+					// to start all over *sigh* (btw, Dear Reader, did you need LDAP paged
+					// searching was designed by MSFT?)
 					$reOffset = ($offset - $limit) < 0 ? 0 : $offset - $limit;
 					//a bit recursive, $offset of 0 is the exit
 					\OCP\Util::writeLog('user_ldap', 'Looking for cookie L/O '.$limit.'/'.$reOffset, \OCP\Util::INFO);
@@ -1049,13 +1072,16 @@ abstract class Access {
 					if($offset > 0) {
 						\OCP\Util::writeLog('user_ldap', 'Cookie '.$cookie, \OCP\Util::INFO);
 					}
-					$pagedSearchOK = ldap_control_paged_result($this->connection->getConnectionResource(), $limit, false, $cookie);
+					$pagedSearchOK = ldap_control_paged_result($this->connection->getConnectionResource(),
+						$limit, false, $cookie);
 					if(!$pagedSearchOK) {
 						return false;
 					}
 					\OCP\Util::writeLog('user_ldap', 'Ready for a paged search', \OCP\Util::INFO);
 				} else {
-					\OCP\Util::writeLog('user_ldap', 'No paged search for us, Cpt., Limit '.$limit.' Offset '.$offset, \OCP\Util::INFO);
+					\OCP\Util::writeLog('user_ldap',
+						'No paged search for us, Cpt., Limit '.$limit.' Offset '.$offset,
+						\OCP\Util::INFO);
 				}
 
 			}
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 0bf2efe35afc387cc6437ea872c58c3e5f9521b3..abbc133038ce2e7cf3e6c02025492e296aaa52aa 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -76,7 +76,8 @@ class Connection {
 		$this->configPrefix = $configPrefix;
 		$this->configID = $configID;
 		$this->cache = \OC_Cache::getGlobalCache();
-		$this->config['hasPagedResultSupport'] = (function_exists('ldap_control_paged_result') && function_exists('ldap_control_paged_result_response'));
+		$this->config['hasPagedResultSupport'] = (function_exists('ldap_control_paged_result')
+			&& function_exists('ldap_control_paged_result_response'));
 	}
 
 	public function __destruct() {
@@ -274,9 +275,36 @@ class Connection {
 	 * @return returns an array that maps internal variable names to database fields
 	 */
 	private function getConfigTranslationArray() {
-		static $array = array('ldap_host'=>'ldapHost', 'ldap_port'=>'ldapPort', 'ldap_backup_host'=>'ldapBackupHost', 'ldap_backup_port'=>'ldapBackupPort', 'ldap_override_main_server' => 'ldapOverrideMainServer', 'ldap_dn'=>'ldapAgentName', 'ldap_agent_password'=>'ldapAgentPassword', 'ldap_base'=>'ldapBase', 'ldap_base_users'=>'ldapBaseUsers', 'ldap_base_groups'=>'ldapBaseGroups', 'ldap_userlist_filter'=>'ldapUserFilter', 'ldap_login_filter'=>'ldapLoginFilter', 'ldap_group_filter'=>'ldapGroupFilter', 'ldap_display_name'=>'ldapUserDisplayName', 'ldap_group_display_name'=>'ldapGroupDisplayName',
-
-		'ldap_tls'=>'ldapTLS', 'ldap_nocase'=>'ldapNoCase', 'ldap_quota_def'=>'ldapQuotaDefault', 'ldap_quota_attr'=>'ldapQuotaAttribute', 'ldap_email_attr'=>'ldapEmailAttribute', 'ldap_group_member_assoc_attribute'=>'ldapGroupMemberAssocAttr', 'ldap_cache_ttl'=>'ldapCacheTTL', 'home_folder_naming_rule' => 'homeFolderNamingRule', 'ldap_turn_off_cert_check' => 'turnOffCertCheck', 'ldap_configuration_active' => 'ldapConfigurationActive', 'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch', 'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch');
+		static $array = array(
+			'ldap_host'=>'ldapHost',
+			'ldap_port'=>'ldapPort',
+			'ldap_backup_host'=>'ldapBackupHost',
+			'ldap_backup_port'=>'ldapBackupPort',
+			'ldap_override_main_server' => 'ldapOverrideMainServer',
+			'ldap_dn'=>'ldapAgentName',
+			'ldap_agent_password'=>'ldapAgentPassword',
+			'ldap_base'=>'ldapBase',
+			'ldap_base_users'=>'ldapBaseUsers',
+			'ldap_base_groups'=>'ldapBaseGroups',
+			'ldap_userlist_filter'=>'ldapUserFilter',
+			'ldap_login_filter'=>'ldapLoginFilter',
+			'ldap_group_filter'=>'ldapGroupFilter',
+			'ldap_display_name'=>'ldapUserDisplayName',
+			'ldap_group_display_name'=>'ldapGroupDisplayName',
+
+			'ldap_tls'=>'ldapTLS',
+			'ldap_nocase'=>'ldapNoCase',
+			'ldap_quota_def'=>'ldapQuotaDefault',
+			'ldap_quota_attr'=>'ldapQuotaAttribute',
+			'ldap_email_attr'=>'ldapEmailAttribute',
+			'ldap_group_member_assoc_attribute'=>'ldapGroupMemberAssocAttr',
+			'ldap_cache_ttl'=>'ldapCacheTTL',
+			'home_folder_naming_rule' => 'homeFolderNamingRule',
+			'ldap_turn_off_cert_check' => 'turnOffCertCheck',
+			'ldap_configuration_active' => 'ldapConfigurationActive',
+			'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch',
+			'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch'
+		);
 		return $array;
 	}
 
@@ -295,7 +323,8 @@ class Connection {
 
 		foreach($config as $parameter => $value) {
 			if(($parameter == 'homeFolderNamingRule'
-				|| $params[$parameter] == 'homeFolderNamingRule')
+				|| (isset($params[$parameter])
+					&& $params[$parameter] == 'homeFolderNamingRule'))
 				&& !empty($value)) {
 				$value = 'attr:'.$value;
 			}
@@ -387,7 +416,8 @@ class Connection {
 	 * @returns true if configuration seems OK, false otherwise
 	 */
 	private function validateConfiguration() {
-		//first step: "soft" checks: settings that are not really necessary, but advisable. If left empty, give an info message
+		// first step: "soft" checks: settings that are not really
+		// necessary, but advisable. If left empty, give an info message
 		if(empty($this->config['ldapBaseUsers'])) {
 			\OCP\Util::writeLog('user_ldap', 'Base tree for Users is empty, using Base DN', \OCP\Util::INFO);
 			$this->config['ldapBaseUsers'] = $this->config['ldapBase'];
@@ -397,11 +427,16 @@ class Connection {
 			$this->config['ldapBaseGroups'] = $this->config['ldapBase'];
 		}
 		if(empty($this->config['ldapGroupFilter']) && empty($this->config['ldapGroupMemberAssocAttr'])) {
-			\OCP\Util::writeLog('user_ldap', 'No group filter is specified, LDAP group feature will not be used.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'No group filter is specified, LDAP group feature will not be used.',
+				\OCP\Util::INFO);
 		}
-		if(!in_array($this->config['ldapUuidAttribute'], array('auto', 'entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) {
+		if(!in_array($this->config['ldapUuidAttribute'], array('auto', 'entryuuid', 'nsuniqueid', 'objectguid'))
+			&& (!is_null($this->configID))) {
 			\OCP\Config::setAppValue($this->configID, $this->configPrefix.'ldap_uuid_attribute', 'auto');
-			\OCP\Util::writeLog('user_ldap', 'Illegal value for the UUID Attribute, reset to autodetect.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'Illegal value for the UUID Attribute, reset to autodetect.',
+				\OCP\Util::INFO);
 		}
 		if(empty($this->config['ldapBackupPort'])) {
 			//force default
@@ -417,7 +452,9 @@ class Connection {
 		if((strpos($this->config['ldapHost'], 'ldaps') === 0)
 			&& $this->config['ldapTLS']) {
 			$this->config['ldapTLS'] = false;
-			\OCP\Util::writeLog('user_ldap', 'LDAPS (already using secure connection) and TLS do not work together. Switched off TLS.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'LDAPS (already using secure connection) and TLS do not work together. Switched off TLS.',
+				\OCP\Util::INFO);
 		}
 
 
@@ -434,20 +471,28 @@ class Connection {
 		}
 		if((empty($this->config['ldapAgentName']) && !empty($this->config['ldapAgentPassword']))
 			|| (!empty($this->config['ldapAgentName']) && empty($this->config['ldapAgentPassword']))) {
-			\OCP\Util::writeLog('user_ldap', 'Either no password given for the user agent or a password is given, but no LDAP agent; won`t connect.', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'Either no password given for the user agent or a password is given, but no LDAP agent; won`t connect.',
+				\OCP\Util::WARN);
 			$configurationOK = false;
 		}
 		//TODO: check if ldapAgentName is in DN form
-		if(empty($this->config['ldapBase']) && (empty($this->config['ldapBaseUsers']) && empty($this->config['ldapBaseGroups']))) {
+		if(empty($this->config['ldapBase'])
+			&& (empty($this->config['ldapBaseUsers'])
+			&& empty($this->config['ldapBaseGroups']))) {
 			\OCP\Util::writeLog('user_ldap', 'No Base DN given, won`t connect.', \OCP\Util::WARN);
 			$configurationOK = false;
 		}
 		if(empty($this->config['ldapUserDisplayName'])) {
-			\OCP\Util::writeLog('user_ldap', 'No user display name attribute specified, won`t connect.', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'No user display name attribute specified, won`t connect.',
+				\OCP\Util::WARN);
 			$configurationOK = false;
 		}
 		if(empty($this->config['ldapGroupDisplayName'])) {
-			\OCP\Util::writeLog('user_ldap', 'No group display name attribute specified, won`t connect.', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'No group display name attribute specified, won`t connect.',
+				\OCP\Util::WARN);
 			$configurationOK = false;
 		}
 		if(empty($this->config['ldapLoginFilter'])) {
@@ -455,7 +500,9 @@ class Connection {
 			$configurationOK = false;
 		}
 		if(mb_strpos($this->config['ldapLoginFilter'], '%uid', 0, 'UTF-8') === false) {
-			\OCP\Util::writeLog('user_ldap', 'Login filter does not contain %uid place holder, won`t connect.', \OCP\Util::WARN);
+			\OCP\Util::writeLog('user_ldap',
+				'Login filter does not contain %uid place holder, won`t connect.',
+				\OCP\Util::WARN);
 			\OCP\Util::writeLog('user_ldap', 'Login filter was ' . $this->config['ldapLoginFilter'], \OCP\Util::DEBUG);
 			$configurationOK = false;
 		}
@@ -519,13 +566,17 @@ class Connection {
 		if(!$this->ldapConnectionRes) {
 			if(!function_exists('ldap_connect')) {
 				$phpLDAPinstalled = false;
-				\OCP\Util::writeLog('user_ldap', 'function ldap_connect is not available. Make sure that the PHP ldap module is installed.', \OCP\Util::ERROR);
+				\OCP\Util::writeLog('user_ldap',
+					'function ldap_connect is not available. Make sure that the PHP ldap module is installed.',
+					\OCP\Util::ERROR);
 
 				return false;
 			}
 			if($this->config['turnOffCertCheck']) {
 				if(putenv('LDAPTLS_REQCERT=never')) {
-					\OCP\Util::writeLog('user_ldap', 'Turned off SSL certificate validation successfully.', \OCP\Util::WARN);
+					\OCP\Util::writeLog('user_ldap',
+						'Turned off SSL certificate validation successfully.',
+						\OCP\Util::WARN);
 				} else {
 					\OCP\Util::writeLog('user_ldap', 'Could not turn off SSL certificate validation.', \OCP\Util::WARN);
 				}
@@ -583,7 +634,9 @@ class Connection {
 		}
 		$ldapLogin = @ldap_bind($cr, $this->config['ldapAgentName'], $this->config['ldapAgentPassword']);
 		if(!$ldapLogin) {
-			\OCP\Util::writeLog('user_ldap', 'Bind failed: ' . ldap_errno($cr) . ': ' . ldap_error($cr), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('user_ldap',
+				'Bind failed: ' . ldap_errno($cr) . ': ' . ldap_error($cr),
+				\OCP\Util::ERROR);
 			$this->ldapConnectionRes = null;
 			return false;
 		}
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index b265a8339efa9aed93a5fd438b9462892d6587b1..094d11db3d5d55681d968f077da5573dfe78ba89 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -42,7 +42,9 @@ class Jobs {
 		$actualGroups = self::getGroupBE()->getGroups();
 
 		if(empty($actualGroups) && empty($knownGroups)) {
-			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.',
+				\OCP\Util::INFO);
 			\OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
 			return;
 		}
@@ -75,19 +77,25 @@ class Jobs {
 		    $hasChanged = false;
 		    foreach(array_diff($knownUsers, $actualUsers) as $removedUser) {
 		        \OCP\Util::emitHook('OC_User', 'post_removeFromGroup', array('uid' => $removedUser, 'gid' => $group));
-		        \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".', \OCP\Util::INFO);
+		        \OCP\Util::writeLog('user_ldap',
+				'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".',
+				\OCP\Util::INFO);
 		        $hasChanged = true;
 		    }
 		    foreach(array_diff($actualUsers, $knownUsers) as $addedUser) {
 		        \OCP\Util::emitHook('OC_User', 'post_addFromGroup', array('uid' => $addedUser, 'gid' => $group));
-		        \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".', \OCP\Util::INFO);
+		        \OCP\Util::writeLog('user_ldap',
+				'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".',
+				\OCP\Util::INFO);
 		        $hasChanged = true;
 		    }
 		    if($hasChanged) {
 				$query->execute(array(serialize($actualUsers), $group));
 		    }
 		}
-		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – FINISHED dealing with known Groups.', \OCP\Util::DEBUG);
+		\OCP\Util::writeLog('user_ldap',
+			'bgJ "updateGroups" – FINISHED dealing with known Groups.',
+			\OCP\Util::DEBUG);
 	}
 
 	static private function handleCreatedGroups($createdGroups) {
@@ -98,11 +106,15 @@ class Jobs {
 			VALUES (?, ?)
 		');
 		foreach($createdGroups as $createdGroup) {
-			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – new group "'.$createdGroup.'" found.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'bgJ "updateGroups" – new group "'.$createdGroup.'" found.',
+				\OCP\Util::INFO);
 			$users = serialize(self::getGroupBE()->usersInGroup($createdGroup));
 		    $query->execute(array($createdGroup, $users));
 		}
-		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – FINISHED dealing with created Groups.', \OCP\Util::DEBUG);
+		\OCP\Util::writeLog('user_ldap',
+			'bgJ "updateGroups" – FINISHED dealing with created Groups.',
+			\OCP\Util::DEBUG);
 	}
 
 	static private function handleRemovedGroups($removedGroups) {
@@ -113,10 +125,14 @@ class Jobs {
 			WHERE `owncloudname` = ?
 		');
 		foreach($removedGroups as $removedGroup) {
-			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – group "'.$removedGroup.'" was removed.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap',
+				'bgJ "updateGroups" – group "'.$removedGroup.'" was removed.',
+				\OCP\Util::INFO);
 		    $query->execute(array($removedGroup));
 		}
-		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – FINISHED dealing with removed groups.', \OCP\Util::DEBUG);
+		\OCP\Util::writeLog('user_ldap',
+			'bgJ "updateGroups" – FINISHED dealing with removed groups.',
+			\OCP\Util::DEBUG);
 	}
 
 	static private function getConnector() {
@@ -154,4 +170,4 @@ class Jobs {
 
 		return self::$groupsFromDB;
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index c6f1834e0131100b85203f0d5e20b2d5eb44f675..a882e5b754866a1fb9b632829b0ac835335c0d6b 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -12,19 +12,43 @@
 		}
 		?>
 	<fieldset id="ldapSettings-1">
-		<p><label for="ldap_serverconfig_chooser"><?php echo $l->t('Server configuration');?></label><select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
+		<p><label for="ldap_serverconfig_chooser"><?php echo $l->t('Server configuration');?></label>
+		<select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
 		<?php echo $_['serverConfigurationOptions']; ?>
 		<option value="NEW"><?php echo $l->t('Add Server Configuration');?></option>
 		</select>
-		<button id="ldap_action_delete_configuration" name="ldap_action_delete_configuration">Delete Configuration</button>
+		<button id="ldap_action_delete_configuration"
+			name="ldap_action_delete_configuration">Delete Configuration</button>
 		</p>
-		<p><label for="ldap_host"><?php echo $l->t('Host');?></label><input type="text" id="ldap_host" name="ldap_host" data-default="<?php echo $_['ldap_host_default']; ?>" title="<?php echo $l->t('You can omit the protocol, except you require SSL. Then start with ldaps://');?>"></p>
-		<p><label for="ldap_base"><?php echo $l->t('Base DN');?></label><textarea id="ldap_base" name="ldap_base" placeholder="<?php echo $l->t('One Base DN per line');?>" title="<?php echo $l->t('You can specify Base DN for users and groups in the Advanced tab');?>" data-default="<?php echo $_['ldap_base_default']; ?>" ></textarea></p>
-		<p><label for="ldap_dn"><?php echo $l->t('User DN');?></label><input type="text" id="ldap_dn" name="ldap_dn" data-default="<?php echo $_['ldap_dn_default']; ?>" title="<?php echo $l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.');?>" /></p>
-		<p><label for="ldap_agent_password"><?php echo $l->t('Password');?></label><input type="password" id="ldap_agent_password" name="ldap_agent_password" data-default="<?php echo $_['ldap_agent_password_default']; ?>" title="<?php echo $l->t('For anonymous access, leave DN and Password empty.');?>" /></p>
-		<p><label for="ldap_login_filter"><?php echo $l->t('User Login Filter');?></label><input type="text" id="ldap_login_filter" name="ldap_login_filter" data-default="<?php echo $_['ldap_login_filter_default']; ?>" title="<?php echo $l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action.');?>" /><br /><small><?php echo $l->t('use %%uid placeholder, e.g. "uid=%%uid"');?></small></p>
-		<p><label for="ldap_userlist_filter"><?php echo $l->t('User List Filter');?></label><input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter" data-default="<?php echo $_['ldap_userlist_filter_default']; ?>" title="<?php echo $l->t('Defines the filter to apply, when retrieving users.');?>" /><br /><small><?php echo $l->t('without any placeholder, e.g. "objectClass=person".');?></small></p>
-		<p><label for="ldap_group_filter"><?php echo $l->t('Group Filter');?></label><input type="text" id="ldap_group_filter" name="ldap_group_filter" data-default="<?php echo $_['ldap_group_filter_default']; ?>" title="<?php echo $l->t('Defines the filter to apply, when retrieving groups.');?>" /><br /><small><?php echo $l->t('without any placeholder, e.g. "objectClass=posixGroup".');?></small></p>
+		<p><label for="ldap_host"><?php echo $l->t('Host');?></label>
+		<input type="text" id="ldap_host" name="ldap_host" data-default="<?php echo $_['ldap_host_default']; ?>"
+			title="<?php echo $l->t('You can omit the protocol, except you require SSL. Then start with ldaps://');?>"></p>
+		<p><label for="ldap_base"><?php echo $l->t('Base DN');?></label>
+		<textarea id="ldap_base" name="ldap_base" placeholder="<?php echo $l->t('One Base DN per line');?>"
+			title="<?php echo $l->t('You can specify Base DN for users and groups in the Advanced tab');?>"
+			data-default="<?php echo $_['ldap_base_default']; ?>" ></textarea></p>
+		<p><label for="ldap_dn"><?php echo $l->t('User DN');?></label>
+		<input type="text" id="ldap_dn" name="ldap_dn" data-default="<?php echo $_['ldap_dn_default']; ?>"
+			title="<?php echo $l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.');?>" /></p>
+		<p><label for="ldap_agent_password"><?php echo $l->t('Password');?></label>
+		<input type="password" id="ldap_agent_password" name="ldap_agent_password"
+			data-default="<?php echo $_['ldap_agent_password_default']; ?>"
+			title="<?php echo $l->t('For anonymous access, leave DN and Password empty.');?>" /></p>
+		<p><label for="ldap_login_filter"><?php echo $l->t('User Login Filter');?></label>
+		<input type="text" id="ldap_login_filter" name="ldap_login_filter"
+			data-default="<?php echo $_['ldap_login_filter_default']; ?>"
+			title="<?php echo $l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action.');?>" />
+				<br /><small><?php echo $l->t('use %%uid placeholder, e.g. "uid=%%uid"');?></small></p>
+		<p><label for="ldap_userlist_filter"><?php echo $l->t('User List Filter');?></label>
+		<input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
+			data-default="<?php echo $_['ldap_userlist_filter_default']; ?>"
+			title="<?php echo $l->t('Defines the filter to apply, when retrieving users.');?>" />
+			<br /><small><?php echo $l->t('without any placeholder, e.g. "objectClass=person".');?></small></p>
+		<p><label for="ldap_group_filter"><?php echo $l->t('Group Filter');?></label>
+		<input type="text" id="ldap_group_filter" name="ldap_group_filter"
+			data-default="<?php echo $_['ldap_group_filter_default']; ?>"
+			title="<?php echo $l->t('Defines the filter to apply, when retrieving groups.');?>" />
+			<br /><small><?php echo $l->t('without any placeholder, e.g. "objectClass=posixGroup".');?></small></p>
 	</fieldset>
 	<fieldset id="ldapSettings-2">
 		<div id="ldapAdvancedAccordion">
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 7778c37c7949506d1402fc582c9554a778907e25..44a1947859805c5935b06e68d6cb53aa8ac8ccff 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -112,7 +112,8 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 			return $ldap_users;
 		}
 
-		// if we'd pass -1 to LDAP search, we'd end up in a Protocol error. With a limit of 0, we get 0 results. So we pass null.
+		// if we'd pass -1 to LDAP search, we'd end up in a Protocol
+		// error. With a limit of 0, we get 0 results. So we pass null.
 		if($limit <= 0) {
 			$limit = null;
 		}
@@ -121,9 +122,12 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 			$this->getFilterPartForUserSearch($search)
 		));
 
-		\OCP\Util::writeLog('user_ldap', 'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter, \OCP\Util::DEBUG);
+		\OCP\Util::writeLog('user_ldap',
+			'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter,
+			\OCP\Util::DEBUG);
 		//do the search and translate results to owncloud names
-		$ldap_users = $this->fetchListOfUsers($filter, array($this->connection->ldapUserDisplayName, 'dn'), $limit, $offset);
+		$ldap_users = $this->fetchListOfUsers($filter, array($this->connection->ldapUserDisplayName, 'dn'),
+			$limit, $offset);
 		$ldap_users = $this->ownCloudUserNames($ldap_users);
 		\OCP\Util::writeLog('user_ldap', 'getUsers: '.count($ldap_users). ' Users found', \OCP\Util::DEBUG);
 
@@ -189,11 +193,13 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 				//check for / at the beginning or pattern c:\ resp. c:/
 				if(
 					'/' == $path[0]
-					|| (3 < strlen($path) && ctype_alpha($path[0]) && $path[1] == ':' && ('\\' == $path[2] || '/' == $path[2]))
+					|| (3 < strlen($path) && ctype_alpha($path[0])
+						&& $path[1] == ':' && ('\\' == $path[2] || '/' == $path[2]))
 				) {
 					$homedir = $path;
 				} else {
-					$homedir = \OCP\Config::getSystemValue('datadirectory', \OC::$SERVERROOT.'/data' ) . '/' . $homedir[0];
+					$homedir = \OCP\Config::getSystemValue('datadirectory',
+						\OC::$SERVERROOT.'/data' ) . '/' . $homedir[0];
 				}
 				$this->connection->writeToCache($cacheKey, $homedir);
 				return $homedir;
@@ -221,7 +227,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 			$this->connection->ldapUserDisplayName);
 
 		if($displayName && (count($displayName) > 0)) {
-			$this->connection->writeToCache($cacheKey, $displayName);
+			$this->connection->writeToCache($cacheKey, $displayName[0]);
 			return $displayName[0];
 		}
 
@@ -258,7 +264,10 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
 	*/
 	public function implementsActions($actions) {
-		return (bool)((OC_USER_BACKEND_CHECK_PASSWORD | OC_USER_BACKEND_GET_HOME) & $actions);
+		return (bool)((OC_USER_BACKEND_CHECK_PASSWORD
+			| OC_USER_BACKEND_GET_HOME
+			| OC_USER_BACKEND_GET_DISPLAYNAME)
+			& $actions);
 	}
 
 	/**
@@ -267,4 +276,4 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	public function hasUserListings() {
 		return true;
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php
index f893bddc71ce599a7d16c97609c703427e57a150..c86ff44e55cb398bb682fc943b011f42bcb82fee 100644
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Authentifikation",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud wird die Benutzer-Anmeldedaten an diese URL schicken. Dieses Plugin prüft die Anmeldedaten auf ihre Gültigkeit und interpretiert die HTTP Statusfehler 401 und 403 als ungültige, sowie alle Anderen als gültige Anmeldedaten."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren."
 );
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 8f67575fc0fd6ae8665f1f4800823fff606a5b3f..bd5d328e477cacf71815a0bd0ccddbc6691ec9c3 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Authentifizierung",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren."
 );
diff --git a/core/l10n/be.php b/core/l10n/be.php
new file mode 100644
index 0000000000000000000000000000000000000000..ecf16e5d6a7efc9404a6c8cf94ed9e85f4ce5dda
--- /dev/null
+++ b/core/l10n/be.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Advanced" => "Дасведчаны",
+"Finish setup" => "Завяршыць ўстаноўку.",
+"prev" => "Папярэдняя",
+"next" => "Далей"
+);
diff --git a/core/l10n/de.php b/core/l10n/de.php
index c18cf7259c5c2c51d128fe4eee186340d31eb238..f1e892fee47807750c715726741ded9d9e50a4b2 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Der Nutzer %s hat eine Datei für Dich freigegeben",
-"User %s shared a folder with you" => "%s hat ein Verzeichnis für Dich freigegeben",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Dich freigegeben. Sie ist zum Download hier ferfügbar: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Dich freigegeben. Es ist zum Download hier ferfügbar: %s",
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit dir geteilt",
+"User %s shared a folder with you" => "%s hat ein Verzeichnis mit dir geteilt",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit dir geteilt. Sie ist hier zum Download verfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit dir geteilt. Er ist hier zum Download verfügbar: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.",
@@ -53,32 +53,32 @@
 "Error" => "Fehler",
 "The app name is not specified." => "Der App-Name ist nicht angegeben.",
 "The required file {file} is not installed!" => "Die benötigte Datei {file} ist nicht installiert.",
-"Shared" => "Freigegeben",
-"Share" => "Freigeben",
-"Error while sharing" => "Fehler beim Freigeben",
-"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
+"Shared" => "Geteilt",
+"Share" => "Teilen",
+"Error while sharing" => "Fehler beim Teilen",
+"Error while unsharing" => "Fehler beim Aufheben der Teilung",
 "Error while changing permissions" => "Fehler beim Ändern der Rechte",
-"Shared with you and the group {group} by {owner}" => "{owner} hat dies für Dich und die Gruppe {group} freigegeben",
-"Shared with you by {owner}" => "{owner} hat dies für Dich freigegeben",
-"Share with" => "Freigeben für",
-"Share with link" => "Ãœber einen Link freigeben",
+"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit dir und der Gruppe {group} geteilt",
+"Shared with you by {owner}" => "{owner} hat dies mit dir geteilt",
+"Share with" => "Teilen mit",
+"Share with link" => "Ãœber einen Link teilen",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
 "Set expiration date" => "Setze ein Ablaufdatum",
 "Expiration date" => "Ablaufdatum",
-"Share via email:" => "Ãœber eine E-Mail freigeben:",
+"Share via email:" => "Ãœber eine E-Mail teilen:",
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
 "Shared in {item} with {user}" => "Für {user} in {item} freigegeben",
-"Unshare" => "Freigabe aufheben",
+"Unshare" => "Teilung aufheben",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
 "create" => "erstellen",
 "update" => "aktualisieren",
 "delete" => "löschen",
-"share" => "freigeben",
+"share" => "teilen",
 "Password protected" => "Durch ein Passwort geschützt",
 "Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index b099510d0d9eed511ae9ba5adf0c52e9a827e791..3430525894448f354933d5a1e38ea11b8dba528b 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Der Nutzer %s hat eine Datei für Sie freigegeben",
-"User %s shared a folder with you" => "%s hat ein Verzeichnis für Sie freigegeben",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat eine Datei \"%s\" für Sie freigegeben. Sie ist zum Download hier ferfügbar: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat eine Verzeichnis \"%s\" für Sie freigegeben. Es ist zum Download hier ferfügbar: %s",
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit Ihnen geteilt",
+"User %s shared a folder with you" => "%s hat einen Ordner mit Ihnen geteilt",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit Ihnen geteilt. Sie ist hier zum Download verfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit Ihnen geteilt. Er ist hier zum Download verfügbar: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.",
@@ -53,32 +53,32 @@
 "Error" => "Fehler",
 "The app name is not specified." => "Der App-Name ist nicht angegeben.",
 "The required file {file} is not installed!" => "Die benötigte Datei {file} ist nicht installiert.",
-"Shared" => "Freigegeben",
-"Share" => "Freigeben",
-"Error while sharing" => "Fehler bei der Freigabe",
-"Error while unsharing" => "Fehler bei der Aufhebung der Freigabe",
+"Shared" => "Geteilt",
+"Share" => "Teilen",
+"Error while sharing" => "Fehler beim Teilen",
+"Error while unsharing" => "Fehler bei der Aufhebung der Teilung",
 "Error while changing permissions" => "Fehler bei der Änderung der Rechte",
-"Shared with you and the group {group} by {owner}" => "Durch {owner} für Sie und die Gruppe {group} freigegeben.",
-"Shared with you by {owner}" => "Durch {owner} für Sie freigegeben.",
-"Share with" => "Freigeben für",
-"Share with link" => "Ãœber einen Link freigeben",
+"Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
+"Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
+"Share with" => "Teilen mit",
+"Share with link" => "Ãœber einen Link teilen",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
 "Set expiration date" => "Setze ein Ablaufdatum",
 "Expiration date" => "Ablaufdatum",
-"Share via email:" => "Mittels einer E-Mail freigeben:",
+"Share via email:" => "Mittels einer E-Mail teilen:",
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt",
 "Shared in {item} with {user}" => "Freigegeben in {item} von {user}",
-"Unshare" => "Freigabe aufheben",
+"Unshare" => "Teilung aufheben",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
 "create" => "erstellen",
 "update" => "aktualisieren",
 "delete" => "löschen",
-"share" => "freigeben",
+"share" => "teilen",
 "Password protected" => "Durch ein Passwort geschützt",
 "Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
@@ -110,7 +110,7 @@
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "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.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server wahrscheinlich konfigurieren.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server konfigurieren.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 54720f5ecb38ca5d28ce537e4c0fe97718008c63..62d12569337314cd7cc6b2920c387fd59423b91b 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -53,6 +53,7 @@
 "Error" => "Σφάλμα",
 "The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.",
 "The required file {file} is not installed!" => "Το απαιτούμενο αρχείο {file} δεν εγκαταστάθηκε!",
+"Shared" => "Κοινόχρηστα",
 "Share" => "Διαμοιρασμός",
 "Error while sharing" => "Σφάλμα κατά τον διαμοιρασμό",
 "Error while unsharing" => "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
@@ -83,6 +84,8 @@
 "Error setting expiration date" => "Σφάλμα κατά τον ορισμό ημ. λήξης",
 "Sending ..." => "Αποστολή...",
 "Email sent" => "Το Email απεστάλη ",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ στείλτε αναφορά στην <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">κοινότητα ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
 "ownCloud password reset" => "Επαναφορά συνθηματικού ownCloud",
 "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
@@ -106,6 +109,8 @@
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Δεν είναι διαθέσιμο το πρόσθετο δημιουργίας τυχαίων αριθμών ασφαλείας, παρακαλώ ενεργοποιήστε το πρόσθετο της PHP, OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Χωρίς το πρόσθετο δημιουργίας τυχαίων αριθμών ασφαλείας, μπορεί να διαρρεύσει ο λογαριασμός σας από επιθέσεις στο διαδίκτυο.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Για πληροφορίες σχετικά με την σωστή ρύθμιση του διακομιστή σας, δείτε στην <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">τεκμηρίωση</a>.",
 "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
 "Advanced" => "Για προχωρημένους",
 "Data folder" => "Φάκελος δεδομένων",
@@ -125,6 +130,7 @@
 "Lost your password?" => "Ξεχάσατε το συνθηματικό σας;",
 "remember" => "απομνημόνευση",
 "Log in" => "Είσοδος",
+"Alternative Logins" => "Εναλλακτικές Συνδέσεις",
 "prev" => "προηγούμενο",
 "next" => "επόμενο",
 "Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο."
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 8fd9292ce610a7f5507921ca3c0774ca24f59dd7..194c28e7cfbea90996336cd57b12682df0c58076 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -5,6 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O usuario %s compartiu o cartafol «%s» con vostede. Teno dispoñíbel en: %s",
 "Category type not provided." => "Non se indicou o tipo de categoría",
 "No category to add?" => "Sen categoría que engadir?",
+"This category already exists: %s" => "Esta categoría xa existe: %s",
 "Object type not provided." => "Non se forneceu o tipo de obxecto.",
 "%s ID not provided." => "Non se forneceu o ID %s.",
 "Error adding %s to favorites." => "Produciuse un erro ao engadir %s aos favoritos.",
@@ -52,6 +53,7 @@
 "Error" => "Erro",
 "The app name is not specified." => "Non se especificou o nome do aplicativo.",
 "The required file {file} is not installed!" => "Non está instalado o ficheiro {file} que se precisa",
+"Shared" => "Compartir",
 "Share" => "Compartir",
 "Error while sharing" => "Produciuse un erro ao compartir",
 "Error while unsharing" => "Produciuse un erro ao deixar de compartir",
@@ -82,6 +84,8 @@
 "Error setting expiration date" => "Produciuse un erro ao definir a data de caducidade",
 "Sending ..." => "Enviando...",
 "Email sent" => "Correo enviado",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualización non foi satisfactoria, informe deste problema á  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
 "ownCloud password reset" => "Restabelecer o contrasinal de ownCloud",
 "Use the following link to reset your password: {link}" => "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
 "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo para restabelecer o contrasinal",
@@ -105,6 +109,8 @@
 "Security Warning" => "Aviso de seguranza",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non hai un xerador de números ao chou dispoñíbel. Active o engadido de OpenSSL para PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "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.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Cartafol de datos",
@@ -124,6 +130,7 @@
 "Lost your password?" => "Perdeu o contrasinal?",
 "remember" => "lembrar",
 "Log in" => "Conectar",
+"Alternative Logins" => "Accesos alternativos",
 "prev" => "anterior",
 "next" => "seguinte",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s,  esto pode levar un anaco."
diff --git a/l10n/be/core.po b/l10n/be/core.po
index e5b4699d86e2b2dd94e7de328fbc1b24603979a1..dcb31520cd14ed450359645c8828c93ea38e980d 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Семён Гариленко <2507496@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-17 00:25+0100\n"
+"PO-Revision-Date: 2013-02-16 19:10+0000\n"
+"Last-Translator: Сёмка Гавриленко <2507496@gmail.com>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -502,7 +503,7 @@ msgstr ""
 
 #: templates/installation.php:52
 msgid "Advanced"
-msgstr ""
+msgstr "Дасведчаны"
 
 #: templates/installation.php:54
 msgid "Data folder"
@@ -539,7 +540,7 @@ msgstr ""
 
 #: templates/installation.php:136
 msgid "Finish setup"
-msgstr ""
+msgstr "Завяршыць ўстаноўку."
 
 #: templates/layout.guest.php:33
 msgid "web services under your control"
@@ -581,11 +582,11 @@ msgstr ""
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr ""
+msgstr "Папярэдняя"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
-msgstr ""
+msgstr "Далей"
 
 #: templates/update.php:3
 #, php-format
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 722be0b3c8fb351216063dd679e80686ae515d5c..e1b0cc93f871fa691a46301578f1adfaf6023d20 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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-17 00:24+0100\n"
+"PO-Revision-Date: 2013-02-16 11:00+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\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"
@@ -281,7 +281,7 @@ msgstr "Des d'enllaç"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Fitxers esborrats"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 3a948f28f9e2323aa6e7f5c33eb897a9eb1a9e34..6ce25474a981a98f5cc0a419269039454eeff281 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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-15 06:50+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -277,7 +277,7 @@ msgstr "Z odkazu"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Odstraněné soubory"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 7c7862c863a9c1c276da4c06bf02ceeb8096b553..bb7deec1e67cb4bfc31e242e381e03c3d77cfe05 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -23,10 +23,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 21:40+0000\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 14:10+0000\n"
 "Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,26 +36,26 @@ msgstr ""
 #: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
-msgstr "Der Nutzer %s hat eine Datei für Dich freigegeben"
+msgstr "Der Nutzer %s hat eine Datei mit dir geteilt"
 
 #: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr "%s hat ein Verzeichnis für Dich freigegeben"
+msgstr "%s hat ein Verzeichnis mit dir geteilt"
 
 #: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr "%s hat eine Datei \"%s\" für Dich freigegeben. Sie ist zum Download hier ferfügbar: %s"
+msgstr "%s hat die Datei \"%s\" mit dir geteilt. Sie ist hier zum Download verfügbar: %s"
 
 #: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr "%s hat eine Verzeichnis \"%s\" für Dich freigegeben. Es ist zum Download hier ferfügbar: %s"
+msgstr "%s hat den Ordner \"%s\" mit dir geteilt. Er ist hier zum Download verfügbar: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -269,19 +269,19 @@ msgstr "Die benötigte Datei {file} ist nicht installiert."
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr "Freigegeben"
+msgstr "Geteilt"
 
 #: js/share.js:93
 msgid "Share"
-msgstr "Freigeben"
+msgstr "Teilen"
 
 #: js/share.js:141 js/share.js:622
 msgid "Error while sharing"
-msgstr "Fehler beim Freigeben"
+msgstr "Fehler beim Teilen"
 
 #: js/share.js:152
 msgid "Error while unsharing"
-msgstr "Fehler beim Aufheben der Freigabe"
+msgstr "Fehler beim Aufheben der Teilung"
 
 #: js/share.js:159
 msgid "Error while changing permissions"
@@ -289,19 +289,19 @@ msgstr "Fehler beim Ändern der Rechte"
 
 #: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
-msgstr "{owner} hat dies für Dich und die Gruppe {group} freigegeben"
+msgstr "{owner} hat dies mit dir und der Gruppe {group} geteilt"
 
 #: js/share.js:170
 msgid "Shared with you by {owner}"
-msgstr "{owner} hat dies für Dich freigegeben"
+msgstr "{owner} hat dies mit dir geteilt"
 
 #: js/share.js:175
 msgid "Share with"
-msgstr "Freigeben für"
+msgstr "Teilen mit"
 
 #: js/share.js:180
 msgid "Share with link"
-msgstr "Ãœber einen Link freigeben"
+msgstr "Ãœber einen Link teilen"
 
 #: js/share.js:183
 msgid "Password protect"
@@ -329,7 +329,7 @@ msgstr "Ablaufdatum"
 
 #: js/share.js:227
 msgid "Share via email:"
-msgstr "Ãœber eine E-Mail freigeben:"
+msgstr "Ãœber eine E-Mail teilen:"
 
 #: js/share.js:229
 msgid "No people found"
@@ -345,7 +345,7 @@ msgstr "Für {user} in {item} freigegeben"
 
 #: js/share.js:313
 msgid "Unshare"
-msgstr "Freigabe aufheben"
+msgstr "Teilung aufheben"
 
 #: js/share.js:325
 msgid "can edit"
@@ -369,7 +369,7 @@ msgstr "löschen"
 
 #: js/share.js:339
 msgid "share"
-msgstr "freigeben"
+msgstr "teilen"
 
 #: js/share.js:373 js/share.js:569
 msgid "Password protected"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 0d7576ef626b96daea2cfa2af42da690eda60a94..2acad72935fe797ffaa9bf867503f351e4bdf070 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -28,10 +28,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 13:50+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,16 +41,16 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Konnte %s nicht verschieben - Datei mit diesem Namen existiert bereits."
+msgstr "%s konnte nicht verschoben werden - eine Datei mit diesem Namen existiert bereits."
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr "Konnte %s nicht verschieben"
+msgstr "%s konnte nicht verschoben werden"
 
 #: ajax/rename.php:22 ajax/rename.php:25
 msgid "Unable to rename file"
-msgstr "Konnte Datei nicht umbenennen"
+msgstr "Die Datei konnte nicht umbenannt werden"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
@@ -295,7 +295,7 @@ msgstr "Von einem Link"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Gelöschte Dateien"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 7c707e5f8987bad8f372be5854fe519048750c17..3cfd6711a27e2bee724937260e9138e094dcfb28 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 22:10+0000\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 14:12+0000\n"
 "Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 177c56d3b8fb6d3f392536d3bbc4fbd4ec95fe3c..1aa1fd8154bbf19d2f0c28a4ab42980d14164b43 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 21:50+0000\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 14:23+0000\n"
 "Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index 5926d03cb4e62deb0918660369b6e025aedd96a4..51c809db1bd30dade6b87d4810925901c1360375 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -13,10 +13,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 22:10+0000\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 14:20+0000\n"
 "Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,7 +60,7 @@ msgstr "Historie"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Setzen Sie eine Datei durch klicken auf den Zurücksetzen Button zurück"
+msgstr "Setze eine Datei durch klicken auf den Zurücksetzen Button zurück"
 
 #: templates/settings.php:3
 msgid "Files Versioning"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index c13aaaa349879c8b07d4b3714a3fc337a342b8c3..ba89f5ea5fe3b36a6934282bea62040a23ab01b9 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -14,37 +14,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 20:50+0000\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 14:10+0000\n"
 "Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Hilfe"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Persönlich"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Benutzer"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administrator"
 
@@ -56,15 +56,15 @@ msgstr "Der ZIP-Download ist deaktiviert."
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "Konnte nicht festgestellt werden"
 
@@ -124,15 +124,15 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
 msgid "%s set the database host."
 msgstr "%s setze den Datenbank-Host"
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:126 setup.php:294 setup.php:339
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
 
 #: setup.php:127 setup.php:150 setup.php:204
 msgid "You need to enter either an existing account or the administrator."
-msgstr "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
+msgstr "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:149 setup.php:427 setup.php:494
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle Benutzername und/oder Passwort ungültig"
 
@@ -140,54 +140,54 @@ msgstr "Oracle Benutzername und/oder Passwort ungültig"
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
+#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
+#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
+#: setup.php:584
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fehler: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
+#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
+#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fehlerhafter Befehl war: \"%s\""
 
-#: setup.php:270
+#: setup.php:273
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
 
-#: setup.php:271
+#: setup.php:274
 msgid "Drop this user from MySQL"
 msgstr "Lösche diesen Benutzer von MySQL"
 
-#: setup.php:276
+#: setup.php:279
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
 
-#: setup.php:277
+#: setup.php:280
 msgid "Drop this user from MySQL."
 msgstr "Lösche diesen Benutzer von MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:553 setup.php:585
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 
-#: setup.php:644
+#: setup.php:649
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: setup.php:645
+#: setup.php:651
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>."
+msgstr "Bitte prüfe die <a href='%s'>Instalationsanleitungen</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -241,16 +241,16 @@ msgstr "Letztes Jahr"
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s ist verfügbar. <a href=\"%s\">Weitere Informationen</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "aktuell"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "Die Update-Überprüfung ist ausgeschaltet"
 
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 927cfec9c7319d6f9a46fd14d107caf609dd02da..736ddb0719bc0dddbbdcde583ccfa9f6b37f9dc1 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -26,10 +26,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 14:31+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -164,23 +164,23 @@ msgstr "Gruppenadministrator"
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "Gruppe hinzufügen"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "Beim anlegen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Deutsch (Persönlich)"
 
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index b4bd8a2d9ba78db9847df6588b834006c965cf85..431c6be2aee99fe7b44802d9fd72947ae8a7283d 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -16,10 +16,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 22:01+0000\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 14:20+0000\n"
 "Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,17 +30,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "Die Konfiguration war erfolgreich, die Verbindung konnte hergestellt werden!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -89,230 +89,230 @@ msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkom
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
-msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
+msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren."
 
 #: templates/settings.php:15
 msgid "Server configuration"
 msgstr "Serverkonfiguration"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Serverkonfiguration hinzufügen"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "Ein Base DN pro Zeile"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Benutzer-DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
 msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer."
 
-#: templates/settings.php:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Lasse die Felder von DN und Passwort für anonymen Zugang leer."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Benutzer-Login-Filter"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiert den Filter für die Anfrage der Benutzer."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiert den Filter für die Anfrage der Gruppen."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Konfiguration wird übersprungen wenn deaktiviert"
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Backup Host (Kopie)"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine kopie des Haupt LDAP/AD Servers handeln."
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Backup Port"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Wenn aktiviert  wird ownCloud ausschließlich den Backupserver verwenden"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Schalte die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Nicht empfohlen, nur zu Testzwecken."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Ordnereinstellungen"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Ein Benutzer Base DN pro Zeile"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Benutzersucheigenschaften"
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Optional, eine Eigenschaft pro Zeile"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Ein Gruppen Base DN pro Zeile"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Gruppensucheigenschaften"
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:56
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:62
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index 3bc6180a309a29f1d25279403adaaa6fa5ea83fa..139f573438ecc0ae4a9672455b8d2ae36d59d2de 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -4,16 +4,17 @@
 # 
 # Translators:
 #   <blobbyjj@ymail.com>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
 #   <mibunrui@gmx.de>, 2013.
 #   <seeed@freenet.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-16 00:19+0100\n"
-"PO-Revision-Date: 2013-01-15 00:30+0000\n"
-"Last-Translator: AndryXY <mibunrui@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 13:50+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,9 +29,9 @@ msgstr "WebDAV Authentifikation"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: templates/settings.php:7
 msgid ""
 "ownCloud will send the user credentials to this URL. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud wird die Benutzer-Anmeldedaten an diese URL schicken. Dieses Plugin prüft die Anmeldedaten auf ihre Gültigkeit und interpretiert die HTTP Statusfehler 401 und 403 als ungültige, sowie alle Anderen als gültige Anmeldedaten."
+msgstr "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren."
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index a8ffe8861e3e36d32ea9e19ba7b35285d5859346..b471458f11dfc48778e105920cad20aa371d52ca 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -26,10 +26,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"POT-Creation-Date: 2013-02-17 00:25+0100\n"
+"PO-Revision-Date: 2013-02-16 23:00+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,26 +39,26 @@ msgstr ""
 #: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
-msgstr "Der Nutzer %s hat eine Datei für Sie freigegeben"
+msgstr "Der Nutzer %s hat eine Datei mit Ihnen geteilt"
 
 #: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr "%s hat ein Verzeichnis für Sie freigegeben"
+msgstr "%s hat einen Ordner mit Ihnen geteilt"
 
 #: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr "%s hat eine Datei \"%s\" für Sie freigegeben. Sie ist zum Download hier ferfügbar: %s"
+msgstr "%s hat die Datei \"%s\" mit Ihnen geteilt. Sie ist hier zum Download verfügbar: %s"
 
 #: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr "%s hat eine Verzeichnis \"%s\" für Sie freigegeben. Es ist zum Download hier ferfügbar: %s"
+msgstr "%s hat den Ordner \"%s\" mit Ihnen geteilt. Er ist hier zum Download verfügbar: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -272,19 +272,19 @@ msgstr "Die benötigte Datei {file} ist nicht installiert."
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr "Freigegeben"
+msgstr "Geteilt"
 
 #: js/share.js:93
 msgid "Share"
-msgstr "Freigeben"
+msgstr "Teilen"
 
 #: js/share.js:141 js/share.js:622
 msgid "Error while sharing"
-msgstr "Fehler bei der Freigabe"
+msgstr "Fehler beim Teilen"
 
 #: js/share.js:152
 msgid "Error while unsharing"
-msgstr "Fehler bei der Aufhebung der Freigabe"
+msgstr "Fehler bei der Aufhebung der Teilung"
 
 #: js/share.js:159
 msgid "Error while changing permissions"
@@ -292,19 +292,19 @@ msgstr "Fehler bei der Änderung der Rechte"
 
 #: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
-msgstr "Durch {owner} für Sie und die Gruppe {group} freigegeben."
+msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
 
 #: js/share.js:170
 msgid "Shared with you by {owner}"
-msgstr "Durch {owner} für Sie freigegeben."
+msgstr "Von {owner} mit Ihnen geteilt."
 
 #: js/share.js:175
 msgid "Share with"
-msgstr "Freigeben für"
+msgstr "Teilen mit"
 
 #: js/share.js:180
 msgid "Share with link"
-msgstr "Ãœber einen Link freigeben"
+msgstr "Ãœber einen Link teilen"
 
 #: js/share.js:183
 msgid "Password protect"
@@ -332,7 +332,7 @@ msgstr "Ablaufdatum"
 
 #: js/share.js:227
 msgid "Share via email:"
-msgstr "Mittels einer E-Mail freigeben:"
+msgstr "Mittels einer E-Mail teilen:"
 
 #: js/share.js:229
 msgid "No people found"
@@ -348,7 +348,7 @@ msgstr "Freigegeben in {item} von {user}"
 
 #: js/share.js:313
 msgid "Unshare"
-msgstr "Freigabe aufheben"
+msgstr "Teilung aufheben"
 
 #: js/share.js:325
 msgid "can edit"
@@ -372,7 +372,7 @@ msgstr "löschen"
 
 #: js/share.js:339
 msgid "share"
-msgstr "freigeben"
+msgstr "teilen"
 
 #: js/share.js:373 js/share.js:569
 msgid "Password protected"
@@ -513,7 +513,7 @@ msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
 "target=\"_blank\">documentation</a>."
-msgstr "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server wahrscheinlich konfigurieren."
+msgstr "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server konfigurieren."
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index c62ccc02470ec012ca980ddf90e6156c1ac2321a..192ed3dbb854b866ea3f4acdb2ae258aec18e824 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -21,6 +21,7 @@
 #   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
 # Phillip Schichtel <quick_wango@code-infection.de>, 2013.
+#  <robert.neumann01@gmail.com>, 2013.
 #  <stefan.niedermann@googlemail.com>, 2013.
 #   <Steve_Reichert@gmx.de>, 2013.
 # Susi <>, 2013.
@@ -31,10 +32,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"POT-Creation-Date: 2013-02-17 00:24+0100\n"
+"PO-Revision-Date: 2013-02-16 16:30+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -298,7 +299,7 @@ msgstr "Von einem Link"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Gelöschte Dateien"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index a4b8388e6031d6ac1ab7b93f3c11d71221c425c0..f69dc4f485301ac1d8e8e3a3634055d9fd324212 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -13,10 +13,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"POT-Creation-Date: 2013-02-17 00:24+0100\n"
+"PO-Revision-Date: 2013-02-16 23:00+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,11 +33,11 @@ msgstr "Datei-Verschlüsselung ist aktiviert"
 
 #: templates/settings-personal.php:11
 msgid "The following file types will not be encrypted:"
-msgstr "Die folgenden Datei-Typen werden nicht verschlüsselt:"
+msgstr "Die folgenden Dateitypen werden nicht verschlüsselt:"
 
 #: templates/settings.php:7
 msgid "Exclude the following file types from encryption:"
-msgstr "Die folgenden Datei-Typen von der Verschlüsselung ausnehmen:"
+msgstr "Die folgenden Dateitypen 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 d9e42dce660f751ca28a921ad3d0e1d8a62cd49a..0a68526442bedf084eb4ecec0cca9bcd6ffe12f5 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # I Robot <owncloud-bot@tmit.eu>, 2013.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
 # Phillip Schichtel <quick_wango@code-infection.de>, 2013.
 #  <stefan.niedermann@googlemail.com>, 2013.
 # Susi <>, 2013.
@@ -11,10 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:43+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"POT-Creation-Date: 2013-02-17 00:24+0100\n"
+"PO-Revision-Date: 2013-02-16 13:51+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,7 @@ msgstr ""
 #: ajax/delete.php:22
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "Konnte %s nicht permanent löschen"
+msgstr "Konnte %s nicht entgültig löschen"
 
 #: ajax/undelete.php:41
 #, php-format
@@ -33,7 +34,7 @@ msgstr "Konnte %s nicht wiederherstellen"
 
 #: js/trash.js:7 js/trash.js:94
 msgid "perform restore operation"
-msgstr "Führe die Wiederherstellung aus"
+msgstr "Wiederherstellung ausführen"
 
 #: js/trash.js:33
 msgid "delete file permanently"
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index 8ea9b51ed6ea06f29b5261f036ac4fa0b4861424..a9ddf034b6713d37a211ede4ff2560c53f5ee3c8 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -16,10 +16,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 10:50+0000\n"
-"Last-Translator: robN <robert.neumann01@gmail.com>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"POT-Creation-Date: 2013-02-17 00:24+0100\n"
+"PO-Revision-Date: 2013-02-16 23:10+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,7 +51,7 @@ msgstr "Die Datei %s konnte nicht zur Version %s zurückgesetzt werden"
 
 #: history.php:68
 msgid "No old versions available"
-msgstr "keine älteren Versionen verfügbar"
+msgstr "Keine älteren Versionen verfügbar"
 
 #: history.php:73
 msgid "No path specified"
@@ -63,7 +63,7 @@ msgstr "Historie"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Setze eine Datei durch Klicken, auf den Zurücksetzen-Button, auf einer frühere Version zurück"
+msgstr "Setze eine Datei durch Klicken auf den Zurücksetzen-Button auf eine frühere Version zurück"
 
 #: templates/settings.php:3
 msgid "Files Versioning"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 630cd9fa410d8fe191c8c927e81cf7c0955fb5e1..1d9413b7ea7a93011d4a26da18daf92620568db0 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -17,10 +17,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 13:00+0000\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-16 23:30+0000\n"
 "Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 77ae2f776f246df8f273356b6c6dc3b6945f899a..9fe6f6813a944bf51b27210331dbd4552a493f3b 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -13,7 +13,7 @@
 # Lukas Reschke <lukas@statuscode.ch>, 2013.
 #   <lukas@statuscode.ch>, 2012.
 #   <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
 #   <nelsonfritsch@gmail.com>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
@@ -30,10 +30,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 13:00+0000\n"
-"Last-Translator: robN <robert.neumann01@gmail.com>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-16 23:40+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -170,11 +170,11 @@ msgstr "Löschen"
 
 #: js/users.js:191
 msgid "add group"
-msgstr "Gruppe konnte nicht hinzugefügt werden"
+msgstr "Gruppe hinzufügen"
 
 #: js/users.js:352
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
 #: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
@@ -182,9 +182,9 @@ msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
 
 #: js/users.js:358
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Deutsch (Förmlich: Sie)"
 
@@ -203,13 +203,13 @@ msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Inte
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Einrichtungswarnung"
 
 #: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr "Ihr Web-Server ist wahrscheinlich noch nicht konfiguriert, Datei-Synchronisation zu erlauben, weil die WebDAV-Schnittstelle vermutlich defekt ist."
+msgstr "Ihr Web-Server ist noch nicht konfiguriert noch nicht für Datei-Synchronisation bereit weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
 #: templates/admin.php:33
 #, php-format
@@ -218,17 +218,17 @@ msgstr "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Das Modul 'fileinfo' fehlt"
 
 #: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr ""
+msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Lokalisierung funktioniert nicht"
 
 #: templates/admin.php:61
 msgid ""
@@ -236,11 +236,11 @@ msgid ""
 "\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with"
 " certain characters in file names. We strongly suggest to install the "
 "required packages on your system to support en_US.UTF-8/en_US.UTF8."
-msgstr ""
+msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren."
 
 #: templates/admin.php:72
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Keine Netzwerkverbindung"
 
 #: templates/admin.php:75
 msgid ""
@@ -250,11 +250,11 @@ msgid ""
 "remote and sending of notification emails might also not work. We suggest to"
 " enable internet connection for this server if you want to have all features"
 " of ownCloud."
-msgstr ""
+msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen."
 
 #: templates/admin.php:89
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:98
 msgid "Execute one task with each page loaded"
@@ -264,13 +264,13 @@ msgstr "Führe eine Aufgabe bei jedem Laden der Seite aus"
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss wird einmal pro Minute über http abgerufen."
 
 #: templates/admin.php:118
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "Nutze den Cron Systemdienst. Rufe die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf."
 
 #: templates/admin.php:125
 msgid "Sharing"
@@ -294,19 +294,19 @@ msgstr "Erlaube es Benutzern, Items per öffentlichem Link zu teilen"
 
 #: templates/admin.php:147
 msgid "Allow resharing"
-msgstr "Erlaube weiterteilen"
+msgstr "Erlaube weiterverteilen"
 
 #: templates/admin.php:148
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Erlaubt Nutzern mit ihnen geteilte Inhalte erneut zu teilen"
 
 #: templates/admin.php:155
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Erlaube Nutzern mit jedem zu teilen"
 
 #: templates/admin.php:158
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Erlaube Nutzern nur mit Nutzern in ihrer Gruppe zu teilen"
 
 #: templates/admin.php:165
 msgid "Security"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 18580dda23a717df93a1c3daa7bfd832f6388bff..a2eb0d878ec1aa4a8ea51c91ce0db8c0f2a708d3 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -18,10 +18,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:43+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"POT-Creation-Date: 2013-02-17 00:24+0100\n"
+"PO-Revision-Date: 2013-02-16 23:20+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,19 +34,19 @@ msgstr "Das Löschen der Server-Konfiguration schlug fehl"
 
 #: ajax/testConfiguration.php:35
 msgid "The configuration is valid and the connection could be established!"
-msgstr "Die Konfiguration ist valide und eine Verbindung konnte hergestellt werden!"
+msgstr "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!"
 
 #: ajax/testConfiguration.php:37
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr "Die Konfiguration ist valide, aber das Herstellen einer Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate."
+msgstr "Die Konfiguration ist gültig, aber das Herstellen der Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate."
 
 #: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr "Die Konfiguration ist nicht valide. Weitere Details können Sie im ownCloud-Log nachlesen."
+msgstr "Die Konfiguration ist ungültig. Weitere Details können Sie im ownCloud-Log nachlesen."
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -54,7 +54,7 @@ msgstr "Löschen fehlgeschlagen"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr "Sollen die Einstellungen der letzten Server-Konfiguration übernommen werden?"
+msgstr "Sollen die Einstellungen der letzten Serverkonfiguration übernommen werden?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -62,19 +62,19 @@ msgstr "Einstellungen behalten?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr "Das Hinzufügen der Server-Konfiguration schlug fehl"
+msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr "Verbindungs-Test erfolgreich"
+msgstr "Verbindungstest erfolgreich"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr "Verbindungs-Test fehlgeschlagen"
+msgstr "Verbindungstest fehlgeschlagen"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr "Möchten Sie wirklich die Server-Konfiguration löschen?"
+msgstr "Möchten Sie die Serverkonfiguration wirklich löschen?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
@@ -95,11 +95,11 @@ msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP ist nicht installiert, das Ba
 
 #: templates/settings.php:15
 msgid "Server configuration"
-msgstr "Server-Konfiguration"
+msgstr "Serverkonfiguration"
 
 #: templates/settings.php:17
 msgid "Add Server Configuration"
-msgstr "Server-Konfiguration hinzufügen"
+msgstr "Serverkonfiguration hinzufügen"
 
 #: templates/settings.php:21
 msgid "Host"
@@ -183,7 +183,7 @@ msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
 #: templates/settings.php:31
 msgid "Connection Settings"
-msgstr "Verbindungs-Einstellungen"
+msgstr "Verbindungseinstellungen"
 
 #: templates/settings.php:33
 msgid "Configuration Active"
@@ -217,7 +217,7 @@ msgstr "Hauptserver deaktivieren"
 
 #: templates/settings.php:37
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Wenn eingeschaltet wird sich ownCloud nur mit dem Replilat-Server verbinden."
+msgstr "Wenn eingeschaltet wird sich ownCloud nur mit dem Replikat-Server verbinden."
 
 #: templates/settings.php:38
 msgid "Use TLS"
@@ -251,7 +251,7 @@ msgstr "in Sekunden. Eine Änderung leert den Cache."
 
 #: templates/settings.php:43
 msgid "Directory Settings"
-msgstr "Verzeichnis-Einstellungen"
+msgstr "Verzeichniseinstellungen"
 
 #: templates/settings.php:45
 msgid "User Display Name Field"
@@ -303,7 +303,7 @@ msgstr "Assoziation zwischen Gruppe und Benutzer"
 
 #: templates/settings.php:53
 msgid "Special Attributes"
-msgstr "besondere Eigenschaften"
+msgstr "Besondere Eigenschaften"
 
 #: templates/settings.php:56
 msgid "in bytes"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index 2d01d1e91e15c6ebeb00418eb1bbdc399297f748..3592cedb142839eb9d816dd29ed441c404583a85 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -4,16 +4,17 @@
 # 
 # Translators:
 #   <a.tangemann@web.de>, 2012-2013.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
 #   <multimill@gmail.com>, 2012.
 #   <transifex-2.7.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-16 00:19+0100\n"
-"PO-Revision-Date: 2013-01-15 22:23+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"POT-Creation-Date: 2013-02-17 00:24+0100\n"
+"PO-Revision-Date: 2013-02-16 14:00+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,9 +29,9 @@ msgstr "WebDAV Authentifizierung"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: templates/settings.php:7
 msgid ""
 "ownCloud will send the user credentials to this URL. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
+msgstr "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren."
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 7752a3076e03ce82669ba8a9770c577a9d8dc123..acf7f9910bb45527fe5fad765b4a9624f156e4a1 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -6,6 +6,7 @@
 # axil Pι <axilleas@archlinux.gr>, 2012.
 # Dimitris M. <monopatis@gmail.com>, 2012-2013.
 # Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 # Marios Bekatoros <>, 2012.
 #   <petros.kyladitis@gmail.com>, 2011.
@@ -15,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 12:50+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -261,7 +262,7 @@ msgstr "Το απαιτούμενο αρχείο {file} δεν εγκαταστ
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr ""
+msgstr "Κοινόχρηστα"
 
 #: js/share.js:93
 msgid "Share"
@@ -388,11 +389,11 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr ""
+msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ στείλτε αναφορά στην <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">κοινότητα ownCloud</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud."
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -495,14 +496,14 @@ msgstr "Χωρίς το πρόσθετο δημιουργίας τυχαίων 
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess."
 
 #: templates/installation.php:32
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
 "target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Για πληροφορίες σχετικά με την σωστή ρύθμιση του διακομιστή σας, δείτε στην <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">τεκμηρίωση</a>."
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
@@ -585,7 +586,7 @@ msgstr "Είσοδος"
 
 #: templates/login.php:49
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Εναλλακτικές Συνδέσεις"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 3f60220fd589e7b1e1b5d74c3efd79760a15d783..0a760250dd72da295a2a86f97a0ba8645093bf86 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 12:10+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -282,7 +282,7 @@ msgstr "Από σύνδεσμο"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Διαγραμμένα αρχεία"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 9d54c6a083be65a4d7227fe24d3b32a44aa4f374..40c97ff66314b3f184f3fb2bbf6e71642096611c 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 #  <vagelis@cyberdest.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 12:50+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,27 +20,27 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Προσωπικά"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Χρήστες"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Εφαρμογές"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Διαχειριστής"
 
@@ -51,15 +52,15 @@ msgstr "Η λήψη ZIP απενεργοποιήθηκε."
 msgid "Files need to be downloaded one by one."
 msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Πίσω στα Αρχεία"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "δεν μπορούσε να προσδιορισθεί"
 
@@ -89,15 +90,15 @@ msgstr "Εικόνες"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Εισάγετε όνομα χρήστη διαχειριστή."
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
+msgstr "Εισάγετε συνθηματικό διαχειριστή."
 
 #: setup.php:40
 msgid "Specify a data folder."
-msgstr ""
+msgstr "Καθορίστε τον φάκελο δεδομένων."
 
 #: setup.php:53
 #, php-format
@@ -119,70 +120,70 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:126 setup.php:294 setup.php:339
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL"
 
 #: setup.php:127 setup.php:150 setup.php:204
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:149 setup.php:427 setup.php:494
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle"
 
 #: setup.php:203
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
+#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
+#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
+#: setup.php:584
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Σφάλμα Βάσης Δεδομένων: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
+#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
+#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:270
+#: setup.php:273
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL."
 
-#: setup.php:271
+#: setup.php:274
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
 
-#: setup.php:276
+#: setup.php:279
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη"
 
-#: setup.php:277
+#: setup.php:280
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
 
-#: setup.php:548 setup.php:580
+#: setup.php:553 setup.php:585
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:649
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη."
 
-#: setup.php:645
+#: setup.php:651
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -236,16 +237,16 @@ msgstr "τον προηγούμενο χρόνο"
 msgid "years ago"
 msgstr "χρόνια πριν"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s είναι διαθέσιμα. Δείτε <a href=\"%s\">περισσότερες πληροφορίες</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "ενημερωμένο"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "ο έλεγχος ενημερώσεων είναι απενεργοποιημένος"
 
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 525b3614e7a2edfaa94df42f64d9109056ed1085..6c417dcbf349a6a24d52f76a11f0fd8c8fa3cd0b 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -5,6 +5,7 @@
 # Translators:
 # Dimitris M. <monopatis@gmail.com>, 2012.
 # Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 # <icewind1991@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2012.
@@ -19,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 12:30+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,7 +95,7 @@ msgstr "Αδυναμία αφαίρεσης χρήστη από την ομάδ
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Αδυναμία ενημέρωσης εφαρμογής"
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
@@ -110,15 +111,15 @@ msgstr "Ενεργοποίηση"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "Παρακαλώ περιμένετε..."
 
 #: js/apps.js:84
 msgid "Updating...."
-msgstr ""
+msgstr "Ενημέρωση..."
 
 #: js/apps.js:87
 msgid "Error while updating app"
-msgstr ""
+msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογής"
 
 #: js/apps.js:87
 msgid "Error"
@@ -126,7 +127,7 @@ msgstr "Σφάλμα"
 
 #: js/apps.js:90
 msgid "Updated"
-msgstr ""
+msgstr "Ενημερώθηκε"
 
 #: js/personal.js:96
 msgid "Saving..."
@@ -142,7 +143,7 @@ msgstr "αναίρεση"
 
 #: js/users.js:62
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Αδυναμία αφαίρεση χρήστη"
 
 #: js/users.js:75 templates/users.php:26 templates/users.php:80
 #: templates/users.php:105
@@ -157,23 +158,23 @@ msgstr "Ομάδα Διαχειριστών"
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "προσθήκη ομάδας"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
-msgstr ""
+msgstr "Σφάλμα δημιουργίας χρήστη"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__όνομα_γλώσσας__"
 
@@ -192,18 +193,18 @@ msgstr "Ο κατάλογος data και τα αρχεία σας πιθανό
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Ρύθμιση Προειδοποίησης"
 
 #: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -243,7 +244,7 @@ msgstr ""
 
 #: templates/admin.php:89
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:98
 msgid "Execute one task with each page loaded"
@@ -299,7 +300,7 @@ msgstr ""
 
 #: templates/admin.php:165
 msgid "Security"
-msgstr ""
+msgstr "Ασφάλεια"
 
 #: templates/admin.php:178
 msgid "Enforce HTTPS"
@@ -318,7 +319,7 @@ msgstr ""
 
 #: templates/admin.php:192
 msgid "Log"
-msgstr ""
+msgstr "Καταγραφές"
 
 #: templates/admin.php:193
 msgid "Log level"
@@ -397,7 +398,7 @@ msgstr "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσι
 
 #: templates/personal.php:14
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας"
 
 #: templates/personal.php:25
 msgid "Show First Run Wizard again"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 972b0601dfa0167c8a6fd0fb77e9bfe48218472b..2f51712882eeb530b7e8691f63ff3794aa79a7bc 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -6,15 +6,16 @@
 #   <anastasia2501@hotmail.com>, 2012.
 # Dimitris M. <monopatis@gmail.com>, 2012.
 # Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
 # Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
 # Marios Bekatoros <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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 <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 13:00+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,23 +25,23 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Αποτυχία διαγραφής ρυθμίσεων διακομιστή"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Οι ρυθμίσεις είναι έγκυρες και η σύνδεση μπορεί να πραγματοποιηθεί!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Οι ρυθμίσεις είναι έγκυρες, αλλά απέτυχε η σύνδεση. Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή και τα διαπιστευτήρια."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Μη έγκυρες ρυθμίσεις. Παρακαλώ ελέγξτε τις καταγραφές του ownCloud για περισσότερες λεπτομέρειες."
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -52,27 +53,27 @@ msgstr ""
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Διατήρηση ρυθμίσεων;"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Αδυναμία προσθήκης ρυθμίσεων διακομιστή"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Επιτυχημένη δοκιμαστική σύνδεση"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "Αποτυχημένη δοκιμαστική σύνδεσης."
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Επιβεβαίωση Διαγραφής"
 
 #: templates/settings.php:8
 msgid ""
@@ -85,230 +86,230 @@ msgstr "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_web
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Προσοχή:</b> Το άρθρωμα PHP LDAP δεν είναι εγκατεστημένο και το σύστημα υποστήριξης δεν θα δουλέψει. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να το εγκαταστήσει."
 
 #: templates/settings.php:15
 msgid "Server configuration"
-msgstr ""
+msgstr "Ρυθμίσεις Διακομιστή"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Προσθήκη Ρυθμίσεων Διακομιστή"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Διακομιστής"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
 msgstr "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά."
 
-#: templates/settings.php:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "User Login Filter"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. "
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "User List Filter"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Group Filter"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
-msgstr ""
+msgstr "Ρυθμίσεις Σύνδεσης"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Θύρα"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Χρήση TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
-msgstr ""
+msgstr "Ρυθμίσεις Καταλόγου"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Πεδίο Ονόματος Χρήστη"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud."
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Base User Tree"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Group Display Name Field"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud."
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "σε bytes"
 
-#: templates/settings.php:58
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD."
 
-#: templates/settings.php:62
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Βοήθεια"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 116e75e86cbe6ec78bf02d9ac3b4a73778588c41..6421f04d5fbb572c7661e76de2e054c2fd0bacea 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -6,13 +6,14 @@
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012-2013.
 # CJTess <claudio.tessone@gmail.com>, 2013.
 #   <claudio.tessone@gmail.com>, 2012-2013.
+# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-14 23:10+0000\n"
+"Last-Translator: Javier Victor Mariano Bruno <koryyyy@gmail.com>\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"
@@ -277,7 +278,7 @@ msgstr "Desde enlace"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Archivos Borrados"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 63f5ab1289e5ac818e2d500213cb4d8dd667f58d..87ad26cb9c453d9ffae7019eb01b816fcf2ce839 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: deftoner <koryyyy@gmail.com>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-14 23:10+0000\n"
+"Last-Translator: Javier Victor Mariano Bruno <koryyyy@gmail.com>\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"
@@ -165,7 +165,7 @@ msgstr "Error creando usuario"
 msgid "A valid password must be provided"
 msgstr "Debe ingresar una contraseña válida"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Castellano (Argentina)"
 
@@ -251,7 +251,7 @@ msgstr ""
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "Usa el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un minuto."
 
 #: templates/admin.php:125
 msgid "Sharing"
@@ -306,7 +306,7 @@ msgstr "Forzar a los clientes conectar a ownCloud vía conexión encriptada"
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Por favor conectese a este ownCloud vía HTTPS para habilitar o des-habilitar el forzado de SSL"
 
 #: templates/admin.php:192
 msgid "Log"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 27a31c2ac492ac0155e3b42cac5fad0ffbf703a3..0e4427c982b0d7fc117673c1589db7222316e069 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 12:30+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -278,7 +278,7 @@ msgstr "Estekatik"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Ezabatutako fitxategiak"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 7e26109a3fd7eba1cb3a18d9068bc68b336f4ac9..7a56399da99cdf76a636a8bb695b4c54d8262094 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 12:30+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -149,23 +149,23 @@ msgstr "Talde administradorea"
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "gehitu taldea"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "Baliozko erabiltzaile izena eman behar da"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "Errore bat egon da erabiltzailea sortzean"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "Baliozko pasahitza eman behar da"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Euskera"
 
@@ -217,7 +217,7 @@ msgid ""
 "\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with"
 " certain characters in file names. We strongly suggest to install the "
 "required packages on your system to support en_US.UTF-8/en_US.UTF8."
-msgstr ""
+msgstr "OwnClud zerbitzari honek ezin du sistemaren lokala \"en_US.UTF-8\"/\"en.US.UTF-8\" ezarri. Honek esan nahi du fitxategi izen batzuekin arazoak egon daitezkeela. Aholkatzen dugu zure sistemak en_US.UTF-8/en_US.UTF8 lokala onartzeko behar diren paketeak instala ditzazun."
 
 #: templates/admin.php:72
 msgid "Internet connection not working"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 23c282efa1a8a4b2889f1460346b618fe3637061..9f66eee4ecb6e131a4863a73b6bd9927f12e3fbd 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 22:33+0000\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 12:30+0000\n"
 "Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -23,17 +23,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr "Zerbitzariaren konfigurazioa ezabatzeak huts egin du"
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr "Konfigurazioa egokia da eta konexioa ezarri daiteke!"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak."
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -45,7 +45,7 @@ msgstr "Ezabaketak huts egin du"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -88,224 +88,224 @@ msgstr "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorr
 msgid "Server configuration"
 msgstr "Zerbitzariaren konfigurazioa"
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr "Gehitu Zerbitzariaren Konfigurazioa"
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr "Hostalaria"
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://"
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr "Oinarrizko DN"
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr "DN Oinarri bat lerroko"
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr "Erabiltzaile DN"
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
 msgstr "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
-#: templates/settings.php:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr "Erabiltzaileen saioa hasteko iragazkia"
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr "Erabiltzaile zerrendaren Iragazkia"
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr "Taldeen iragazkia"
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr "Konexio Ezarpenak"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr "Konfigurazio Aktiboa"
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko."
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr "Portua"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr "Babeskopia (Replica) Ostalaria"
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da."
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr "Babeskopia (Replica) Ataka"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr "Desgaitu Zerbitzari Nagusia"
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Markatuta dagoenean, ownCloud bakarrik replica zerbitzarira konektatuko da."
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr "Erabili TLS"
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Ez erabili LDAPS konexioetarako, huts egingo du."
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian."
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
 
-#: templates/settings.php:41
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr "segundutan. Aldaketak katxea husten du."
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr "Karpetaren Ezarpenak"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr "Oinarrizko Erabiltzaile Zuhaitza"
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr "Erabiltzaile DN Oinarri bat lerroko"
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr "Erabili Bilaketa Atributuak "
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr "Aukerakoa; atributu bat lerro bakoitzeko"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr "Taldeen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr "Oinarrizko Talde Zuhaitza"
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr "Talde DN Oinarri bat lerroko"
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr "Taldekatu Bilaketa Atributuak "
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr "Talde-Kide elkarketak"
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr "Atributu Bereziak"
 
-#: templates/settings.php:56
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr "bytetan"
 
-#: templates/settings.php:58
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
 
-#: templates/settings.php:62
+#: templates/settings.php:86
 msgid "Help"
 msgstr "Laguntza"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index e42625a78a7c8d0efef54af9fcb4a000727deb55..60fc1271eb0a88acf621a60583d9a554babadcc7 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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-17 00:24+0100\n"
+"PO-Revision-Date: 2013-02-16 10:40+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -279,7 +279,7 @@ msgstr "Linkistä"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Poistetut tiedostot"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index b165922be018ae5c1e4a384c43e99be1fcb7b913..3681ab7e4034da3786972cae5d3d08f2ada5b133 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -14,7 +14,7 @@
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 #   <life_0n_mars@live.fr>, 2012.
 #   <mishka.lazzlo@gmail.com>, 2012.
-# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
+# Nahir Mohamed <nahirmoha@gmail.com>, 2012-2013.
 #   <pierreamiel.giraud@gmail.com>, 2012.
 # Robert Di Rosa <>, 2012.
 #   <rom1dep@gmail.com>, 2011, 2012.
@@ -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-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-17 00:25+0100\n"
+"PO-Revision-Date: 2013-02-16 19:10+0000\n"
+"Last-Translator: Nahir Mohamed <nahirmoha@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -162,23 +162,23 @@ msgstr "Groupe Admin"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr "ajouter un groupe"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr "Un nom d'utilisateur valide doit être saisi"
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr "Erreur lors de la création de l'utilisateur"
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr "Un mot de passe valide doit être saisi"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Français"
 
@@ -276,19 +276,19 @@ msgstr "Activer l'API de partage"
 
 #: templates/admin.php:132
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Autoriser les applications à utiliser l'API de partage"
 
 #: templates/admin.php:139
 msgid "Allow links"
-msgstr ""
+msgstr "Autoriser les liens"
 
 #: templates/admin.php:140
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens"
 
 #: templates/admin.php:147
 msgid "Allow resharing"
-msgstr ""
+msgstr "Autoriser le repartage"
 
 #: templates/admin.php:148
 msgid "Allow users to share items shared with them again"
@@ -304,30 +304,30 @@ msgstr ""
 
 #: templates/admin.php:165
 msgid "Security"
-msgstr ""
+msgstr "Sécurité"
 
 #: templates/admin.php:178
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Forcer HTTPS"
 
 #: templates/admin.php:179
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Forcer les clients à se connecter à Owncloud via une connexion chiffrée."
 
 #: templates/admin.php:182
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Merci de vous connecter à cette instance Owncloud en HTTPS pour activer ou désactiver SSL."
 
 #: templates/admin.php:192
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:193
 msgid "Log level"
-msgstr ""
+msgstr "Niveau de log"
 
 #: templates/admin.php:220
 msgid "More"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 15c7556ce015281390f4cc48403b7771abeb68cb..f67798a78e648fb752bac8fc6265cb6920aabc4f 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # antiparvos  <marcoslansgarza@gmail.com>, 2012.
+#  <mbouzada@gmail.com>, 2013.
 #   <mbouzada@gmail.com>, 2012.
 # Xosé M. Lamas <correo.xmgz@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-15 15:00+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgstr "Sen categoría que engadir?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Esta categoría xa existe: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -256,7 +257,7 @@ msgstr "Non está instalado o ficheiro {file} que se precisa"
 
 #: js/share.js:29 js/share.js:43 js/share.js:90
 msgid "Shared"
-msgstr ""
+msgstr "Compartir"
 
 #: js/share.js:93
 msgid "Share"
@@ -383,11 +384,11 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr ""
+msgstr "A actualización non foi satisfactoria, informe deste problema á  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud."
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -490,14 +491,14 @@ msgstr "Sen un xerador seguro de números ao chou podería acontecer que predici
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar."
 
 #: templates/installation.php:32
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
 "target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentación</a>."
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
@@ -580,7 +581,7 @@ msgstr "Conectar"
 
 #: templates/login.php:49
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Accesos alternativos"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index e00e1c1134e2df8b19354d6487980d56d1e41b43..5fb9fb14dfdcbc12e0e1d661405636a7ee05beb6 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-15 14:31+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -100,7 +100,7 @@ msgstr "Pendentes"
 
 #: js/filelist.js:253 js/filelist.js:255
 msgid "{new_name} already exists"
-msgstr "xa existe un {new_name}"
+msgstr "Xa existe un {new_name}"
 
 #: js/filelist.js:253 js/filelist.js:255
 msgid "replace"
@@ -277,7 +277,7 @@ msgstr "Desde a ligazón"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Ficheiros eliminados"
 
 #: templates/index.php:46
 msgid "Cancel upload"
@@ -285,7 +285,7 @@ msgstr "Cancelar o envío"
 
 #: templates/index.php:59
 msgid "Nothing in here. Upload something!"
-msgstr "Aquí non hai nada por aquí. Envíe algo."
+msgstr "Aquí non hai nada. Envíe algo."
 
 #: templates/index.php:73
 msgid "Download"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index e41f414f4e89ff5214e17b56a0595ab795ef4e24..aa47bb803297c0cae7c80e260867f211993fab6d 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.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-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-15 15:40+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,27 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Axuda"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Persoal"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Configuracións"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Aplicativos"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Administración"
 
@@ -51,17 +51,17 @@ msgstr "As descargas ZIP están desactivadas."
 
 #: files.php:203
 msgid "Files need to be downloaded one by one."
-msgstr "Os ficheiros necesitan seren descargados de un en un."
+msgstr "Os ficheiros necesitan seren descargados dun en un."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Volver aos ficheiros"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "non foi posíbel determinalo"
 
@@ -91,97 +91,97 @@ msgstr "Imaxes"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Estabeleza un nome de usuario administrador"
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
+msgstr "Estabeleza un contrasinal de administrador"
 
 #: setup.php:40
 msgid "Specify a data folder."
-msgstr ""
+msgstr "Especifique un cartafol de datos."
 
 #: setup.php:53
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s introduza o nome de usuario da base de datos"
 
 #: setup.php:56
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s introduza o nome da base de datos"
 
 #: setup.php:59
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s non se poden empregar puntos na base de datos"
 
 #: setup.php:62
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s estabeleza o servidor da base de datos"
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:126 setup.php:294 setup.php:339
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "Nome de usuario e/ou contrasinal PostgreSQL incorrecto"
 
 #: setup.php:127 setup.php:150 setup.php:204
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Deberá introducir unha conta existente ou o administrador."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:149 setup.php:427 setup.php:494
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Nome de usuario e/ou contrasinal Oracle incorrecto"
 
 #: setup.php:203
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Nome de usuario e/ou contrasinal MySQL incorrecto"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
+#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
+#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
+#: setup.php:584
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Produciuse un erro na base de datos: «%s»"
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
+#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
+#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "A orde ofensiva foi: «%s»"
 
-#: setup.php:270
+#: setup.php:273
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "O usuario MySQL  '%s'@'localhost' xa existe."
 
-#: setup.php:271
+#: setup.php:274
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Omitir este usuario de MySQL"
 
-#: setup.php:276
+#: setup.php:279
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "O usuario MySQL «%s»@«%%» xa existe."
 
-#: setup.php:277
+#: setup.php:280
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Omitir este usuario de MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:553 setup.php:585
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s"
 
-#: setup.php:644
+#: setup.php:649
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar."
 
-#: setup.php:645
+#: setup.php:651
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Volva comprobar as <a href='%s'>guías de instalación</a>"
@@ -238,16 +238,16 @@ msgstr "último ano"
 msgid "years ago"
 msgstr "anos atrás"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "%s está dispoñíbel. Obtéña <a href=\"%s\">máis información</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
-msgstr "ao día"
+msgstr "actualizado"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "a comprobación de actualizacións está desactivada"
 
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 0cfda9825141f01e07247e214c8575589f041402..a05c2158b55e267ee715841465baf8cbd6ded1f2 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -4,15 +4,17 @@
 # 
 # Translators:
 # antiparvos  <marcoslansgarza@gmail.com>, 2012.
+# <mbouzada@gmail.com>, 2012-2013.
 #  <mbouzada@gmail.com>, 2013.
 #   <mbouzada@gmail.com>, 2012.
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013.
 # Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 09:10+0000\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 19:20+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +34,7 @@ msgstr "Produciuse un erro de autenticación"
 
 #: ajax/changedisplayname.php:32
 msgid "Unable to change display name"
-msgstr ""
+msgstr "Non é posíbel cambiar o nome visíbel"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -165,7 +167,7 @@ msgstr "Produciuse un erro ao crear o usuario"
 msgid "A valid password must be provided"
 msgstr "Debe fornecer un contrasinal"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Galego"
 
@@ -209,7 +211,7 @@ msgstr "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar es
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "A configuración rexional non funciona"
 
 #: templates/admin.php:61
 msgid ""
@@ -217,11 +219,11 @@ msgid ""
 "\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with"
 " certain characters in file names. We strongly suggest to install the "
 "required packages on your system to support en_US.UTF-8/en_US.UTF8."
-msgstr ""
+msgstr "Este servidor ownCloud non pode estabelecer a configuración rexional do sistema a «en_US.UTF-8\"/\"en_US.UTF8». Isto significa que poden xurdir problemas con certos caracteres nos nomes de ficheiro. Recomendámoslle que instale os paquetes necesarios no sistema para admitir en_US.UTF-8/en_US.UTF8."
 
 #: templates/admin.php:72
 msgid "Internet connection not working"
-msgstr ""
+msgstr "A conexión á Internet non funciona"
 
 #: templates/admin.php:75
 msgid ""
@@ -231,11 +233,11 @@ msgid ""
 "remote and sending of notification emails might also not work. We suggest to"
 " enable internet connection for this server if you want to have all features"
 " of ownCloud."
-msgstr ""
+msgstr "Este servidor ownCloud non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades de ownCloud."
 
 #: templates/admin.php:89
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:98
 msgid "Execute one task with each page loaded"
@@ -245,13 +247,13 @@ msgstr "Executar unha tarefa con cada páxina cargada"
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php está rexistrado nun servizo de WebCron. Chame á página cron.php na raíz ownCloud unha vez por minuto a través de HTTP."
 
 #: templates/admin.php:118
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "Use o servizo de sistema cron. Chame ao ficheiro cron.php no catfaol owncloud a través dun sistema de cronjob unna vez por minuto."
 
 #: templates/admin.php:125
 msgid "Sharing"
@@ -425,15 +427,15 @@ msgstr "Amosar o nome"
 
 #: templates/personal.php:55
 msgid "Your display name was changed"
-msgstr ""
+msgstr "O seu nome visíbel foi cambiado"
 
 #: templates/personal.php:56
 msgid "Unable to change your display name"
-msgstr ""
+msgstr "Non é posíbel cambiar o seu nome visíbel"
 
 #: templates/personal.php:59
 msgid "Change display name"
-msgstr ""
+msgstr "Cambiar o nome visíbel"
 
 #: templates/personal.php:68
 msgid "Email"
@@ -489,7 +491,7 @@ msgstr "Almacenamento"
 
 #: templates/users.php:95
 msgid "change display name"
-msgstr ""
+msgstr "cambiar o nome visíbel"
 
 #: templates/users.php:99
 msgid "set new password"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 62e23bcad3c185c5429bf6cb218a274b8a40c472..af16ecd286b0090f45a92ac3f18ebc9e54c250d3 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <mbouzada@gmail.com>, 2013.
 #   <mbouzada@gmail.com>, 2012.
 # Miguel Branco, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 12:47+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-15 20:40+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,23 +22,23 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Non foi posíbel eliminar a configuración do servidor"
 
 #: ajax/testConfiguration.php:35
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "A configuración é correcta e pode estabelecerse a conexión."
 
 #: ajax/testConfiguration.php:37
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais."
 
 #: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles"
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -45,31 +46,31 @@ msgstr "Fallou o borrado"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Tomar os recentes axustes de configuración do servidor?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Manter os axustes?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Non é posíbel engadir a configuración do servidor"
 
 #: js/settings.js:121
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "A proba de conexión foi satisfactoria"
 
 #: js/settings.js:126
 msgid "Connection test failed"
-msgstr ""
+msgstr "A proba de conexión fracasou"
 
 #: js/settings.js:136
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Confirma que quere eliminar a configuración actual do servidor?"
 
 #: js/settings.js:137
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "Confirmar a eliminación"
 
 #: templates/settings.php:8
 msgid ""
@@ -82,15 +83,15 @@ msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatíb
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo."
 
 #: templates/settings.php:15
 msgid "Server configuration"
-msgstr ""
+msgstr "Configuración do servidor"
 
 #: templates/settings.php:17
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Engadir a configuración do servidor"
 
 #: templates/settings.php:21
 msgid "Host"
@@ -107,7 +108,7 @@ msgstr "DN base"
 
 #: templates/settings.php:22
 msgid "One Base DN per line"
-msgstr ""
+msgstr "Un DN base por liña"
 
 #: templates/settings.php:22
 msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -174,15 +175,15 @@ msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»."
 
 #: templates/settings.php:31
 msgid "Connection Settings"
-msgstr ""
+msgstr "Axustes da conexió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."
-msgstr ""
+msgstr "Se está sen marcar, omítese esta configuración."
 
 #: templates/settings.php:34
 msgid "Port"
@@ -190,25 +191,25 @@ msgstr "Porto"
 
 #: templates/settings.php:35
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Servidor da copia de seguranza (Réplica)"
 
 #: templates/settings.php:35
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD."
 
 #: templates/settings.php:36
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Porto da copia de seguranza (Réplica)"
 
 #: templates/settings.php:37
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Desactivar o servidor principal"
 
 #: templates/settings.php:37
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Cando está activado, ownCloud só se conectará ao servidor de réplica."
 
 #: templates/settings.php:38
 msgid "Use TLS"
@@ -216,7 +217,7 @@ msgstr "Usar TLS"
 
 #: templates/settings.php:38
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Non utilizalo ademais para conexións LDAPS xa que fallará."
 
 #: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
@@ -230,7 +231,7 @@ msgstr "Desactiva a validación do certificado SSL."
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor ownCloud."
+msgstr "Se a conexión só funciona con esta opción importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
 
 #: templates/settings.php:40
 msgid "Not recommended, use for testing only."
@@ -242,7 +243,7 @@ msgstr "en segundos. Calquera cambio baleira a caché."
 
 #: templates/settings.php:43
 msgid "Directory Settings"
-msgstr ""
+msgstr "Axustes do directorio"
 
 #: templates/settings.php:45
 msgid "User Display Name Field"
@@ -258,15 +259,15 @@ msgstr "Base da árbore de usuarios"
 
 #: templates/settings.php:46
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Un DN base de usuario por liña"
 
 #: templates/settings.php:47
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Atributos de busca do usuario"
 
 #: templates/settings.php:47 templates/settings.php:50
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Opcional; un atributo por liña"
 
 #: templates/settings.php:48
 msgid "Group Display Name Field"
@@ -282,11 +283,11 @@ msgstr "Base da árbore de grupo"
 
 #: templates/settings.php:49
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Un DN base de grupo por liña"
 
 #: templates/settings.php:50
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Atributos de busca do grupo"
 
 #: templates/settings.php:51
 msgid "Group-Member association"
@@ -294,7 +295,7 @@ msgstr "Asociación de grupos e membros"
 
 #: templates/settings.php:53
 msgid "Special Attributes"
-msgstr ""
+msgstr "Atributos especiais"
 
 #: templates/settings.php:56
 msgid "in bytes"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index ea2e55fc372c68ec3959bf44e196dde6be69ba09..e9dbc61712c72f875acdb1dcfcd76ac201f8bebe 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 08:50+0000\n"
+"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -281,7 +281,7 @@ msgstr "Feltöltés linkről"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Törölt fájlok"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 1a3e8db783bbbc57c45f84149b0babdab3c77cd1..001d45a4beaea750467dd948840883786cb2d1ea 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-14 23:30+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -278,7 +278,7 @@ msgstr "Da collegamento"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "File eliminati"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 21ebd3c48b294bf000b761dabf0001d49b615d31..17180fdddcb9472cc71c42ca270bacc1a1ea4629 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-15 01:50+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -279,7 +279,7 @@ msgstr "リンク"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "削除ファイル"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index e17afcc1853adb5efed2349b7b5a7edf8e76ca6e..e51491eec5d21121a9164d264a0d6fcece93caa9 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-15 13:00+0000\n"
+"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -277,7 +277,7 @@ msgstr "No saites"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Dzēstās datnes"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 1e85d6184d7069fbdd16958887aa199356c78881..97c80512770fac1318fe9e4971e671d6e885fb40 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-14 23:10+0000\n"
+"Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -282,7 +282,7 @@ msgstr "Da ligação"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Ficheiros eliminados"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 5aad6742ac06fa3a40c5e5f84a8d733692b96b83..9d3cdd6e61e8bd777acdf65175aff435f7b0a9b8 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 23:06+0000\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-14 23:10+0000\n"
 "Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -122,7 +122,7 @@ msgstr "%s defina o servidor da base de dados (geralmente localhost)"
 
 #: setup.php:126 setup.php:294 setup.php:339
 msgid "PostgreSQL username and/or password not valid"
-msgstr "Nome de utilizador/passwor do PostgreSQL inválido"
+msgstr "Nome de utilizador/password do PostgreSQL inválido"
 
 #: setup.php:127 setup.php:150 setup.php:204
 msgid "You need to enter either an existing account or the administrator."
@@ -130,11 +130,11 @@ msgstr "Precisa de introduzir uma conta existente ou de administrador"
 
 #: setup.php:149 setup.php:427 setup.php:494
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Nome de utilizador/password do Oracle inválida"
 
 #: setup.php:203
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "Nome de utilizador/password do MySQL inválida"
 
 #: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
 #: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
@@ -142,37 +142,37 @@ msgstr ""
 #: setup.php:584
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Erro na BD: \"%s\""
 
 #: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
 #: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
 #: setup.php:546 setup.php:562 setup.php:570 setup.php:579
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "O comando gerador de erro foi: \"%s\""
 
 #: setup.php:273
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "O utilizador '%s'@'localhost' do MySQL já existe."
 
 #: setup.php:274
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Eliminar este utilizador do MySQL"
 
 #: setup.php:279
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "O utilizador '%s'@'%%' do MySQL já existe"
 
 #: setup.php:280
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Eliminar este utilizador do MySQL"
 
 #: setup.php:553 setup.php:585
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "O comando gerador de erro foi: \"%s\", nome: %s, password: %s"
 
 #: setup.php:649
 msgid ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index e1dc13b05bda14bf1345aa09ac8702b3bb3fda97..03a761e64fbecc6bb33af0cb13f695ddb4b038a9 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.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-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 23:03+0000\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-14 23:10+0000\n"
 "Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -169,7 +169,7 @@ msgstr "Erro a criar utilizador"
 msgid "A valid password must be provided"
 msgstr "Uma password válida deve ser fornecida"
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__language_name__"
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index fcc6d86ae4b2dc0d5dc5d3d00972453e931f7df9..6214f7451682bdff1010d3ea3c51266176afd4d1 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-17 00:24+0100\n"
+"PO-Revision-Date: 2013-02-16 18:50+0000\n"
+"Last-Translator: Langaru <langaru@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -288,7 +288,7 @@ msgstr "Из ссылки"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Удалённые файлы"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 48b7c3887202bbea734cf3841e767e409e08bf22..2ea6cd0776f2bb7842a24b5cb2b9135ed486f017 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -10,13 +10,14 @@
 #   <mpolr21@gmail.com>, 2012.
 # Sergey <sergey@markevich.ru>, 2013.
 #   <victor.dubiniuk@gmail.com>, 2012.
+# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:36+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 20:30+0000\n"
+"Last-Translator: Langaru <langaru@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,27 +25,27 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:339
+#: app.php:349
 msgid "Help"
 msgstr "Помощь"
 
-#: app.php:346
+#: app.php:362
 msgid "Personal"
 msgstr "Личное"
 
-#: app.php:351
+#: app.php:373
 msgid "Settings"
 msgstr "Настройки"
 
-#: app.php:356
+#: app.php:385
 msgid "Users"
 msgstr "Пользователи"
 
-#: app.php:363
+#: app.php:398
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:365
+#: app.php:406
 msgid "Admin"
 msgstr "Admin"
 
@@ -56,15 +57,15 @@ msgstr "ZIP-скачивание отключено."
 msgid "Files need to be downloaded one by one."
 msgstr "Файлы должны быть загружены по одному."
 
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
 msgid "Back to Files"
 msgstr "Назад к файлам"
 
-#: files.php:227
+#: files.php:228
 msgid "Selected files too large to generate zip file."
 msgstr "Выбранные файлы слишком велики, чтобы создать zip файл."
 
-#: helper.php:226
+#: helper.php:228
 msgid "couldn't be determined"
 msgstr "Невозможно установить"
 
@@ -107,24 +108,24 @@ msgstr "Указать папку данных."
 #: setup.php:53
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s введите имя пользователя базы данных."
 
 #: setup.php:56
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s введите имя базы данных."
 
 #: setup.php:59
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s Вы не можете использовать точки в имени базы данных"
 
 #: setup.php:62
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s задайте хост базы данных."
 
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:126 setup.php:294 setup.php:339
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль PostgreSQL"
 
@@ -132,7 +133,7 @@ msgstr "Неверное имя пользователя и/или пароль
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Вы должны войти или в существующий аккаунт или под администратором."
 
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:149 setup.php:427 setup.php:494
 msgid "Oracle username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль Oracle"
 
@@ -140,54 +141,54 @@ msgstr "Неверное имя пользователя и/или пароль
 msgid "MySQL username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль MySQL"
 
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
+#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
+#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
+#: setup.php:584
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Ошибка БД: \"%s\""
 
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
+#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
+#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Вызываемая команда была: \"%s\""
 
-#: setup.php:270
+#: setup.php:273
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Пользователь MySQL '%s'@'localhost' уже существует."
 
-#: setup.php:271
+#: setup.php:274
 msgid "Drop this user from MySQL"
 msgstr "Удалить этого пользователя из MySQL"
 
-#: setup.php:276
+#: setup.php:279
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Пользователь MySQL '%s'@'%%' уже существует"
 
-#: setup.php:277
+#: setup.php:280
 msgid "Drop this user from MySQL."
 msgstr "Удалить этого пользователя из MySQL."
 
-#: setup.php:548 setup.php:580
+#: setup.php:553 setup.php:585
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Вызываемая команда была: \"%s\", имя: %s, пароль: %s"
 
-#: setup.php:644
+#: setup.php:649
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV."
 
-#: setup.php:645
+#: setup.php:651
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -241,16 +242,16 @@ msgstr "в прошлом году"
 msgid "years ago"
 msgstr "годы назад"
 
-#: updater.php:75
+#: updater.php:78
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
 msgstr "Возможно обновление до %s. <a href=\"%s\">Подробнее</a>"
 
-#: updater.php:77
+#: updater.php:81
 msgid "up to date"
 msgstr "актуальная версия"
 
-#: updater.php:80
+#: updater.php:84
 msgid "updates check is disabled"
 msgstr "проверка обновлений отключена"
 
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 4374f73dfa0438e95f7fbeeb489b56053ef5ede7..5686b6c7660b17b7fe2e30cb73a73d453774e6af 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 20:30+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -160,23 +160,23 @@ msgstr "Группа Администраторы"
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
 msgstr ""
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "Русский "
 
@@ -201,12 +201,12 @@ msgstr ""
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 8893c32c4374fe9d757a398eee29efa5c7bf42d2..a290cd58f674e097cf7f661d674bca5587479974 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-15 06:10+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -280,7 +280,7 @@ msgstr "Z odkazu"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Zmazané súbory"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 0cc8a3019e8fedde9455ac16f248cff1e08c962b..50af374e0d3935db38de8e01a9cf968174c75fb5 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 078e0e4058517159546bff0aa2e3de4762ef3755..68faae5f7a2d3ed3ea8d4f2cad938d3e47f8c771 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 6d0396470cb799142f4d314c02222467557a0ce8..0e87a9cadfec5b75d1e222e1888c9ba1e6b61fc7 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index db27055908338f1c1c5ebc7050101aa1c6cd86b5..1c08282555c1b1dd1d929a46c0398f51ecb38758 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,13 +41,13 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:413
+#: lib/config.php:418
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:414
+#: lib/config.php:421
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting "
 "of FTP shares is not possible. Please ask your system administrator to "
@@ -115,6 +115,6 @@ msgstr ""
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:153
+#: templates/settings.php:154
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 27454624e29d530b83ea2b7869bf1ab9392a5bf9..035f07db378badf9df13b51265c7fb50d09a0050 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index dfb764945880d6da71e98afa15a21c837e168452..9ae14c07fbfdaf3cd464ab1896ddb54b10e7f144 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index bbfa7fc167b647ef6b6f4004f08df6c606c2a263..956fa27aa6a93200ae255b06e336a5921c2f3d3d 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 40dc2bee040cdbef4b21578e2f546c2623f4afb4..b7a4e24525b25a490ab2f82c9e9b9a2262cb6228 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index afd2407497c28492fccef6bcd9707501c44fe353..f2ed4a30fd5b8e37970e3110eccaf53fdee10dc4 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -161,7 +161,7 @@ msgstr ""
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 0a173656b5e3fb21f8c6df95a294624aaf3e9e81..defbacb6a4dfcec718a7a4e6abf1040d56f8a98a 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
@@ -86,222 +86,222 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:23
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:25
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:26
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:27
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:28
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:32
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,"
 "dc=example,dc=com. For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:33
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:36
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:37
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:40
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:41
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:42
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:45
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:46
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:47
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:50
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:51
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:55
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:57
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:58
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:59
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:60
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:61
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:62
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:63
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:64
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:67
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:69
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:70
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:71
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:48
+#: templates/settings.php:72
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:73
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:74
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:75
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:77
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:80
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:82
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:86
 msgid "Help"
 msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 0b84d4999f6fd0b66c42be410fd70518489597eb..cd7a57253efbc13ddcd06ad36c488b93f9b07c40 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index d7eaa300bd9f575688be45bab74b5a396938f168..ec785055c6bd466112e6ecf5231a8da135fcac55 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/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-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-16 00:04+0100\n"
+"PO-Revision-Date: 2013-02-15 20:30+0000\n"
+"Last-Translator: saosangm <saosangmo@yahoo.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -279,7 +279,7 @@ msgstr "Từ liên kết"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "File đã bị xóa"
 
 #: templates/index.php:46
 msgid "Cancel upload"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 2962f45fcb86bacf0bf8c00b509c1a0a679ad453..6f13ba5136c8c32c926430f26257db52b587a701 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,6 +8,7 @@
 #   <nfsmwlin@gmail.com>, 2013.
 # Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
 #   <sy6614@yahoo.com.hk>, 2012.
+#  <tseronnie@ymail.com>, 2013.
 #   <weiyu871@ms14.url.com.tw>, 2012.
 #   <wu0809@msn.com>, 2012.
 # ywang  <ywang1007@gmail.com>, 2012.
@@ -15,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-18 00:05+0100\n"
+"PO-Revision-Date: 2013-02-17 14:00+0000\n"
+"Last-Translator: ronnietse <tseronnie@ymail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -130,7 +131,7 @@ msgstr "儲存中..."
 
 #: js/users.js:30
 msgid "deleted"
-msgstr ""
+msgstr "已刪除"
 
 #: js/users.js:30
 msgid "undo"
@@ -138,7 +139,7 @@ msgstr "復原"
 
 #: js/users.js:62
 msgid "Unable to remove user"
-msgstr ""
+msgstr "無法刪除用戶"
 
 #: js/users.js:75 templates/users.php:26 templates/users.php:80
 #: templates/users.php:105
@@ -153,23 +154,23 @@ msgstr "群組 管理員"
 msgid "Delete"
 msgstr "刪除"
 
-#: js/users.js:190
+#: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "新增群組"
 
-#: js/users.js:351
+#: js/users.js:352
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:357
+#: js/users.js:358
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
 msgid "__language_name__"
 msgstr "__語言_名稱__"
 
diff --git a/lib/files/mapper.php b/lib/files/mapper.php
index cd163dcbfcd90732d6f1c3e4e13489d229cf6bd4..520fadbd8c634389d45e122e6a1aeba1f18c787b 100644
--- a/lib/files/mapper.php
+++ b/lib/files/mapper.php
@@ -7,6 +7,12 @@ namespace OC\Files;
  */
 class Mapper
 {
+	private $unchangedPhysicalRoot;
+
+	public function __construct($rootDir) {
+		$this->unchangedPhysicalRoot = $rootDir;
+	}
+
 	/**
 	 * @param string $logicPath
 	 * @param bool $create indicates if the generated physical name shall be stored in the database or not
@@ -23,7 +29,7 @@ class Mapper
 
 	/**
 	 * @param string $physicalPath
-	 * @return string|null
+	 * @return string
 	 */
 	public function physicalToLogic($physicalPath) {
 		$logicPath = $this->resolvePhysicalPath($physicalPath);
@@ -39,6 +45,7 @@ class Mapper
 	 * @param string $path
 	 * @param bool $isLogicPath indicates if $path is logical or physical
 	 * @param $recursive
+	 * @return void
 	 */
 	public function removePath($path, $isLogicPath, $recursive) {
 		if ($recursive) {
@@ -159,14 +166,11 @@ class Mapper
 	}
 
 	private function slugifyPath($path, $index=null) {
+		$path = $this->stripRootFolder($path, $this->unchangedPhysicalRoot);
+
 		$pathElements = explode('/', $path);
 		$sluggedElements = array();
 
-		// skip slugging the drive letter on windows - TODO: test if local path
-		if (\OC_Util::runningOnWindows()) {
-			$sluggedElements[]= $pathElements[0];
-			array_shift($pathElements);
-		}
 		foreach ($pathElements as $pathElement) {
 			// remove empty elements
 			if (empty($pathElement)) {
@@ -186,12 +190,8 @@ class Mapper
 			array_push($sluggedElements, $last.'-'.$index);
 		}
 
-		// on non-windows systems add the leading / if necessary
-		if (!\OC_Util::runningOnWindows() and $path[0] === '/') {
-			return DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $sluggedElements);
-		}
-
-		return implode(DIRECTORY_SEPARATOR, $sluggedElements);
+		$sluggedPath = $this->unchangedPhysicalRoot.implode(DIRECTORY_SEPARATOR, $sluggedElements);
+		return $this->stripLast($sluggedPath);
 	}
 
 	/**
diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php
index e707f71d71ce0610a03646fb900340b54b1a84a2..434c10bcbf7ae192cf8f631c100a9b74cf344aca 100644
--- a/lib/files/storage/mappedlocal.php
+++ b/lib/files/storage/mappedlocal.php
@@ -20,7 +20,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 			$this->datadir.='/';
 		}
 
-		$this->mapper= new \OC\Files\Mapper();
+		$this->mapper= new \OC\Files\Mapper($this->datadir);
 	}
 	public function __destruct() {
 		if (defined('PHPUNIT_RUN')) {
@@ -274,7 +274,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 		return $this->buildPath($path);
 	}
 
-	protected function searchInDir($query, $dir='', $isLogicPath=true) {
+	protected function searchInDir($query, $dir='') {
 		$files=array();
 		$physicalDir = $this->buildPath($dir);
 		foreach (scandir($physicalDir) as $item) {
@@ -287,7 +287,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 				$files[]=$dir.'/'.$item;
 			}
 			if(is_dir($physicalItem)) {
-				$files=array_merge($files, $this->searchInDir($query, $physicalItem, false));
+				$files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
 			}
 		}
 		return $files;
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index f65ee5cfa3b871455aee5061ab60103b20b3e434..0ad254ad8441237f91dab3b173f5350b59640e78 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -24,7 +24,7 @@
 "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
 "%s set the database host." => "%s setze den Datenbank-Host",
 "PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig",
-"You need to enter either an existing account or the administrator." => "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
+"You need to enter either an existing account or the administrator." => "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
 "Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
 "MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig",
 "DB Error: \"%s\"" => "DB Fehler: \"%s\"",
@@ -35,7 +35,7 @@
 "Drop this user from MySQL." => "Lösche diesen Benutzer von MySQL.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Instalationsanleitungen</a>.",
 "seconds ago" => "Gerade eben",
 "1 minute ago" => "Vor einer Minute",
 "%d minutes ago" => "Vor %d Minuten",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index cf0be24b432415cd14a582ded61882725204df81..e2e86edc4da436afb821dc3f110a97a0359eebc7 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -16,6 +16,19 @@
 "Files" => "Αρχεία",
 "Text" => "Κείμενο",
 "Images" => "Εικόνες",
+"Set an admin username." => "Εισάγετε όνομα χρήστη διαχειριστή.",
+"Set an admin password." => "Εισάγετε συνθηματικό διαχειριστή.",
+"Specify a data folder." => "Καθορίστε τον φάκελο δεδομένων.",
+"PostgreSQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
+"Oracle username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
+"MySQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL",
+"DB Error: \"%s\"" => "Σφάλμα Βάσης Δεδομένων: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL.",
+"Drop this user from MySQL" => "Απόρριψη αυτού του χρήστη από την MySQL",
+"MySQL user '%s'@'%%' already exists" => "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη",
+"Drop this user from MySQL." => "Απόρριψη αυτού του χρήστη από την MySQL",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.",
+"Please double check the <a href='%s'>installation guides</a>." => "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
 "seconds ago" => "δευτερόλεπτα πριν",
 "1 minute ago" => "1 λεπτό πριν",
 "%d minutes ago" => "%d λεπτά πριν",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index c49e8134af10ec0355d9370516a836eb22257a01..9673bb65fc1cb6cbbee15760817f19c06eff2915 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -6,7 +6,7 @@
 "Apps" => "Aplicativos",
 "Admin" => "Administración",
 "ZIP download is turned off." => "As descargas ZIP están desactivadas.",
-"Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados de un en un.",
+"Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados dun en un.",
 "Back to Files" => "Volver aos ficheiros",
 "Selected files too large to generate zip file." => "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip.",
 "couldn't be determined" => "non foi posíbel determinalo",
@@ -16,6 +16,24 @@
 "Files" => "Ficheiros",
 "Text" => "Texto",
 "Images" => "Imaxes",
+"Set an admin username." => "Estabeleza un nome de usuario administrador",
+"Set an admin password." => "Estabeleza un contrasinal de administrador",
+"Specify a data folder." => "Especifique un cartafol de datos.",
+"%s enter the database username." => "%s introduza o nome de usuario da base de datos",
+"%s enter the database name." => "%s introduza o nome da base de datos",
+"%s you may not use dots in the database name" => "%s non se poden empregar puntos na base de datos",
+"%s set the database host." => "%s estabeleza o servidor da base de datos",
+"PostgreSQL username and/or password not valid" => "Nome de usuario e/ou contrasinal PostgreSQL incorrecto",
+"You need to enter either an existing account or the administrator." => "Deberá introducir unha conta existente ou o administrador.",
+"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal Oracle incorrecto",
+"MySQL username and/or password not valid" => "Nome de usuario e/ou contrasinal MySQL incorrecto",
+"DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»",
+"Offending command was: \"%s\"" => "A orde ofensiva foi: «%s»",
+"MySQL user '%s'@'localhost' exists already." => "O usuario MySQL  '%s'@'localhost' xa existe.",
+"Drop this user from MySQL" => "Omitir este usuario de MySQL",
+"MySQL user '%s'@'%%' already exists" => "O usuario MySQL «%s»@«%%» xa existe.",
+"Drop this user from MySQL." => "Omitir este usuario de MySQL.",
+"Offending command was: \"%s\", name: %s, password: %s" => "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
 "seconds ago" => "segundos atrás",
@@ -31,7 +49,7 @@
 "last year" => "último ano",
 "years ago" => "anos atrás",
 "%s is available. Get <a href=\"%s\">more information</a>" => "%s está dispoñíbel. Obtéña <a href=\"%s\">máis información</a>",
-"up to date" => "ao día",
+"up to date" => "actualizado",
 "updates check is disabled" => "a comprobación de actualizacións está desactivada",
 "Could not find category \"%s\"" => "Non foi posíbel atopar a categoría «%s»"
 );
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index a3585f914daa5bb967b04ef66671a606bc35ad07..9bdcfcc9ceda1cd9e20bac07555613b8bbe11efe 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -23,8 +23,17 @@
 "%s enter the database name." => "%s introduza o nome da base de dados",
 "%s you may not use dots in the database name" => "%s não é permitido utilizar pontos (.) no nome da base de dados",
 "%s set the database host." => "%s defina o servidor da base de dados (geralmente localhost)",
-"PostgreSQL username and/or password not valid" => "Nome de utilizador/passwor do PostgreSQL inválido",
+"PostgreSQL username and/or password not valid" => "Nome de utilizador/password do PostgreSQL inválido",
 "You need to enter either an existing account or the administrator." => "Precisa de introduzir uma conta existente ou de administrador",
+"Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
+"MySQL username and/or password not valid" => "Nome de utilizador/password do MySQL inválida",
+"DB Error: \"%s\"" => "Erro na BD: \"%s\"",
+"Offending command was: \"%s\"" => "O comando gerador de erro foi: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "O utilizador '%s'@'localhost' do MySQL já existe.",
+"Drop this user from MySQL" => "Eliminar este utilizador do MySQL",
+"MySQL user '%s'@'%%' already exists" => "O utilizador '%s'@'%%' do MySQL já existe",
+"Drop this user from MySQL." => "Eliminar este utilizador do MySQL",
+"Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
 "seconds ago" => "há alguns segundos",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index c0ffcd68064f64b225a6dabc5a2756f52ba6ed57..7f1111376ef5da2445c8e896a6971083bb96608e 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -19,15 +19,23 @@
 "Set an admin username." => "Установить имя пользователя для admin.",
 "Set an admin password." => "становит пароль для admin.",
 "Specify a data folder." => "Указать папку данных.",
+"%s enter the database username." => "%s введите имя пользователя базы данных.",
+"%s enter the database name." => "%s введите имя базы данных.",
+"%s you may not use dots in the database name" => "%s Вы не можете использовать точки в имени базы данных",
+"%s set the database host." => "%s задайте хост базы данных.",
 "PostgreSQL username and/or password not valid" => "Неверное имя пользователя и/или пароль PostgreSQL",
 "You need to enter either an existing account or the administrator." => "Вы должны войти или в существующий аккаунт или под администратором.",
 "Oracle username and/or password not valid" => "Неверное имя пользователя и/или пароль Oracle",
 "MySQL username and/or password not valid" => "Неверное имя пользователя и/или пароль MySQL",
 "DB Error: \"%s\"" => "Ошибка БД: \"%s\"",
+"Offending command was: \"%s\"" => "Вызываемая команда была: \"%s\"",
 "MySQL user '%s'@'localhost' exists already." => "Пользователь MySQL '%s'@'localhost' уже существует.",
 "Drop this user from MySQL" => "Удалить этого пользователя из MySQL",
 "MySQL user '%s'@'%%' already exists" => "Пользователь MySQL '%s'@'%%' уже существует",
 "Drop this user from MySQL." => "Удалить этого пользователя из MySQL.",
+"Offending command was: \"%s\", name: %s, password: %s" => "Вызываемая команда была: \"%s\", имя: %s, пароль: %s",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
+"Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
 "seconds ago" => "менее минуты",
 "1 minute ago" => "1 минуту назад",
 "%d minutes ago" => "%d минут назад",
diff --git a/settings/js/users.js b/settings/js/users.js
index 086b0884a3b402a33fa3a2de2de2848ebcd825a0..63a6204983931af387f192105d4edf858882d680 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -182,7 +182,7 @@ var UserList = {
 			var addGroup = function (select, group) {
 				$('select[multiple]').each(function (index, element) {
 					if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
-						$(element).append('<option value="' + group + '">' + group + '</option>');
+						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
 					}
 				})
 			};
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index cf947019585a76efe029a24766e2f86353dd5a91..8ceb90dd76380a544a962169abfb82e55dc46702 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -30,20 +30,35 @@
 "Groups" => "Gruppen",
 "Group Admin" => "Gruppenadministrator",
 "Delete" => "Löschen",
-"add group" => "Gruppe konnte nicht hinzugefügt werden",
+"add group" => "Gruppe hinzufügen",
+"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
 "Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
+"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
 "__language_name__" => "Deutsch (Förmlich: Sie)",
 "Security Warning" => "Sicherheitshinweis",
 "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." => "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.",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist wahrscheinlich noch nicht konfiguriert, Datei-Synchronisation zu erlauben, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+"Setup Warning" => "Einrichtungswarnung",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht konfiguriert noch nicht für Datei-Synchronisation bereit weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>.",
+"Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
+"Locale not working" => "Lokalisierung funktioniert nicht",
+"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren.",
+"Internet connection not working" => "Keine Netzwerkverbindung",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.",
+"Cron" => "Cron",
 "Execute one task with each page loaded" => "Führe eine Aufgabe bei jedem Laden der Seite aus",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss wird einmal pro Minute über http abgerufen.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutze den Cron Systemdienst. Rufe die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf.",
 "Sharing" => "Teilen",
 "Enable Share API" => "Teilen-API aktivieren",
 "Allow apps to use the Share API" => "Erlaube es Anwendungen, die Teilen-API zu benutzen",
 "Allow links" => "Links erlauben",
 "Allow users to share items to the public with links" => "Erlaube es Benutzern, Items per öffentlichem Link zu teilen",
-"Allow resharing" => "Erlaube weiterteilen",
+"Allow resharing" => "Erlaube weiterverteilen",
+"Allow users to share items shared with them again" => "Erlaubt Nutzern mit ihnen geteilte Inhalte erneut zu teilen",
+"Allow users to share with anyone" => "Erlaube Nutzern mit jedem zu teilen",
+"Allow users to only share with users in their groups" => "Erlaube Nutzern nur mit Nutzern in ihrer Gruppe zu teilen",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "HTTPS erzwingen",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung mit ownCloud zu verbinden.",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 66d9d92ca30e14ca205f68ecd3505874627ce8af..18417935285ebdf31a0e8d3da0eec564d8eb9f38 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -13,18 +13,32 @@
 "Admins can't remove themself from the admin group" => "Οι διαχειριστές δεν μπορούν να αφαιρέσουν τους εαυτούς τους από την ομάδα των διαχειριστών",
 "Unable to add user to group %s" => "Αδυναμία προσθήκη χρήστη στην ομάδα %s",
 "Unable to remove user from group %s" => "Αδυναμία αφαίρεσης χρήστη από την ομάδα %s",
+"Couldn't update app." => "Αδυναμία ενημέρωσης εφαρμογής",
 "Disable" => "Απενεργοποίηση",
 "Enable" => "Ενεργοποίηση",
+"Please wait...." => "Παρακαλώ περιμένετε...",
+"Updating...." => "Ενημέρωση...",
+"Error while updating app" => "Σφάλμα κατά την ενημέρωση της εφαρμογής",
 "Error" => "Σφάλμα",
+"Updated" => "Ενημερώθηκε",
 "Saving..." => "Αποθήκευση...",
 "deleted" => "διαγράφηκε",
 "undo" => "αναίρεση",
+"Unable to remove user" => "Αδυναμία αφαίρεση χρήστη",
 "Groups" => "Ομάδες",
 "Group Admin" => "Ομάδα Διαχειριστών",
 "Delete" => "Διαγραφή",
+"add group" => "προσθήκη ομάδας",
+"Error creating user" => "Σφάλμα δημιουργίας χρήστη",
 "__language_name__" => "__όνομα_γλώσσας__",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή.",
+"Setup Warning" => "Ρύθμιση Προειδοποίησης",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.",
+"Please double check the <a href='%s'>installation guides</a>." => "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
+"Cron" => "Cron",
+"Security" => "Ασφάλεια",
+"Log" => "Καταγραφές",
 "More" => "Περισσότερα",
 "Version" => "Έκδοση",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
@@ -41,6 +55,7 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Εμπορική Υποστήριξη",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>",
+"Get the apps to sync your files" => "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
 "Show First Run Wizard again" => "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι",
 "Password" => "Συνθηματικό",
 "Your password was changed" => "Το συνθηματικό σας έχει αλλάξει",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index d5e054a14dc08507161757c53dc302cac9f76411..1e122bdd45a87bf7a1b88b450e2e5eb34306fa4a 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -47,6 +47,7 @@
 "Internet connection not working" => "La conexión a Internet no esta funcionando. ",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Ejecute una tarea con cada pagina cargada.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a través del sistema cronjob cada un minuto.",
 "Sharing" => "Compartiendo",
 "Enable Share API" => "Habilitar Share API",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
@@ -59,6 +60,7 @@
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "Forzar a los clientes conectar a ownCloud vía conexión encriptada",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor conectese a este ownCloud vía HTTPS para habilitar o des-habilitar el forzado de SSL",
 "Log" => "Log",
 "Log level" => "Nivel de Log",
 "More" => "Más",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 94c9fe55e27eb4bc3b2d40a4c5fc345594a5a8a2..105e2aa92acd5097497cd85d5e22961c415c7b02 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -43,6 +43,7 @@
 "Module 'fileinfo' missing" => "'fileinfo' Modulua falta da",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
 "Locale not working" => "Lokala ez dabil",
+"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "OwnClud zerbitzari honek ezin du sistemaren lokala \"en_US.UTF-8\"/\"en.US.UTF-8\" ezarri. Honek esan nahi du fitxategi izen batzuekin arazoak egon daitezkeela. Aholkatzen dugu zure sistemak en_US.UTF-8/en_US.UTF8 lokala onartzeko behar diren paketeak instala ditzazun.",
 "Internet connection not working" => "Interneteko konexioak ez du funtzionatzen",
 "This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "ownCloud zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
 "Cron" => "Cron",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 7276f56f2b4357385dbba896a03ca69c782cf9d0..19d3a243c9d23817e51ae3fc4654b71c2ebaef50 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -51,6 +51,16 @@
 "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilise le service cron du système. Appelle le fichier cron.php du répertoire owncloud toutes les minutes grâce à une tâche cron du système.",
 "Sharing" => "Partage",
 "Enable Share API" => "Activer l'API de partage",
+"Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
+"Allow links" => "Autoriser les liens",
+"Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens",
+"Allow resharing" => "Autoriser le repartage",
+"Security" => "Sécurité",
+"Enforce HTTPS" => "Forcer HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forcer les clients à se connecter à Owncloud via une connexion chiffrée.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Merci de vous connecter à cette instance Owncloud en HTTPS pour activer ou désactiver SSL.",
+"Log" => "Log",
+"Log level" => "Niveau de log",
 "More" => "Plus",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 6452a75f6cbc4d85de39522d3cd22f485c030284..f6b0943c53f3ab3173265fccc1ddfd6ef8403a55 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Non foi posíbel cargar a lista desde a App Store",
 "Authentication error" => "Produciuse un erro de autenticación",
+"Unable to change display name" => "Non é posíbel cambiar o nome visíbel",
 "Group already exists" => "O grupo xa existe",
 "Unable to add group" => "Non é posíbel engadir o grupo",
 "Could not enable app. " => "Non é posíbel activar o aplicativo.",
@@ -41,7 +42,14 @@
 "Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
 "Module 'fileinfo' missing" => "Non se atopou o módulo «fileinfo»",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
+"Locale not working" => "A configuración rexional non funciona",
+"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Este servidor ownCloud non pode estabelecer a configuración rexional do sistema a «en_US.UTF-8\"/\"en_US.UTF8». Isto significa que poden xurdir problemas con certos caracteres nos nomes de ficheiro. Recomendámoslle que instale os paquetes necesarios no sistema para admitir en_US.UTF-8/en_US.UTF8.",
+"Internet connection not working" => "A conexión á Internet non funciona",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades de ownCloud.",
+"Cron" => "Cron",
 "Execute one task with each page loaded" => "Executar unha tarefa con cada páxina cargada",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está rexistrado nun servizo de WebCron. Chame á página cron.php na raíz ownCloud unha vez por minuto a través de HTTP.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Use o servizo de sistema cron. Chame ao ficheiro cron.php no catfaol owncloud a través dun sistema de cronjob unna vez por minuto.",
 "Sharing" => "Compartindo",
 "Enable Share API" => "Activar o API para compartir",
 "Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir",
@@ -82,6 +90,9 @@
 "New password" => "Novo contrasinal",
 "Change password" => "Cambiar o contrasinal",
 "Display Name" => "Amosar o nome",
+"Your display name was changed" => "O seu nome visíbel foi cambiado",
+"Unable to change your display name" => "Non é posíbel cambiar o seu nome visíbel",
+"Change display name" => "Cambiar o nome visíbel",
 "Email" => "Correo",
 "Your email address" => "O seu enderezo de correo",
 "Fill in an email address to enable password recovery" => "Escriba un enderezo de correo para activar a recuperación do contrasinal",
@@ -95,6 +106,7 @@
 "Unlimited" => "Sen límites",
 "Other" => "Outro",
 "Storage" => "Almacenamento",
+"change display name" => "cambiar o nome visíbel",
 "set new password" => "estabelecer un novo contrasinal",
 "Default" => "Predeterminado"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 393993fa6117a418c679edf33f494f602341e6e8..e597809e98c501db79def1ad71c3d853798becdd 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -32,6 +32,8 @@
 "__language_name__" => "Русский ",
 "Security Warning" => "Предупреждение безопасности",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
+"Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
 "More" => "Больше",
 "Version" => "Версия",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 88eb956fe8e6ab3b9cf4f36ef56b28a6fa738815..0b9d2d3d023bde651e6f3dc5f60ef108bdf8c873 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -24,10 +24,13 @@
 "Error" => "錯誤",
 "Updated" => "已更新",
 "Saving..." => "儲存中...",
+"deleted" => "已刪除",
 "undo" => "復原",
+"Unable to remove user" => "無法刪除用戶",
 "Groups" => "群組",
 "Group Admin" => "群組 管理員",
 "Delete" => "刪除",
+"add group" => "新增群組",
 "__language_name__" => "__語言_名稱__",
 "Security Warning" => "安全性警告",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。",
diff --git a/tests/lib/files/storage/mappedlocalwithdotteddatadir.php b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php
new file mode 100644
index 0000000000000000000000000000000000000000..d2e5e2e97aff8a84bd046410f1d5091036eb6373
--- /dev/null
+++ b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php
@@ -0,0 +1,42 @@
+<?php
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+namespace Test\Files\Storage;
+
+class MappedLocalWithDottedDataDir extends Storage {
+	/**
+	 * @var string tmpDir
+	 */
+	private $tmpDir;
+
+	public function setUp() {
+		$this->tmpDir = \OC_Helper::tmpFolder().'dir.123'.DIRECTORY_SEPARATOR;
+		mkdir($this->tmpDir);
+		$this->instance=new \OC\Files\Storage\MappedLocal(array('datadir'=>$this->tmpDir));
+	}
+
+	public function tearDown() {
+		\OC_Helper::rmdirr($this->tmpDir);
+		unset($this->instance);
+	}
+}
+
diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index c74a16f509f5ae73fe85a7a77aa41b299c8ec47e..f78f66d8b8ad1345fa0a62141a8fadee0466bb16 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -223,6 +223,22 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$this->assertContains('/logo-wide.png', $result);
 	}
 
+	public function testSearchInSubFolder() {
+		$this->instance->mkdir('sub')
+		;
+		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+		$this->instance->file_put_contents('/sub/lorem.txt', file_get_contents($textFile, 'r'));
+		$pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png';
+		$this->instance->file_put_contents('/sub/logo-wide.png', file_get_contents($pngFile, 'r'));
+		$svgFile = \OC::$SERVERROOT . '/tests/data/logo-wide.svg';
+		$this->instance->file_put_contents('/sub/logo-wide.svg', file_get_contents($svgFile, 'r'));
+
+		$result = $this->instance->search('logo');
+		$this->assertEquals(2, count($result));
+		$this->assertContains('/sub/logo-wide.svg', $result);
+		$this->assertContains('/sub/logo-wide.png', $result);
+	}
+
 	public function testFOpen() {
 		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';