summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/l10n/ca.php1
-rw-r--r--apps/files/l10n/cs_CZ.php1
-rw-r--r--apps/files/l10n/de_DE.php1
-rw-r--r--apps/files/l10n/es_AR.php1
-rw-r--r--apps/files/l10n/fi_FI.php1
-rw-r--r--apps/files/l10n/gl.php5
-rw-r--r--apps/files/l10n/it.php1
-rw-r--r--apps/files/l10n/ja_JP.php1
-rw-r--r--apps/files/l10n/lv.php1
-rw-r--r--apps/files/l10n/pt_PT.php1
-rw-r--r--apps/files/l10n/ru.php1
-rw-r--r--apps/files/l10n/sk_SK.php1
-rw-r--r--apps/files/l10n/vi.php1
-rw-r--r--apps/files_encryption/l10n/de_DE.php4
-rw-r--r--apps/files_external/lib/google.php2
-rw-r--r--apps/files_external/templates/settings.php1
-rw-r--r--apps/files_sharing/css/public.css1
-rw-r--r--apps/files_trashbin/l10n/de_DE.php4
-rw-r--r--apps/files_versions/l10n/de_DE.php4
-rw-r--r--apps/user_ldap/ajax/testConfiguration.php9
-rw-r--r--apps/user_ldap/appinfo/app.php4
-rw-r--r--apps/user_ldap/appinfo/update.php4
-rw-r--r--apps/user_ldap/group_ldap.php18
-rw-r--r--apps/user_ldap/l10n/de_DE.php28
-rw-r--r--apps/user_ldap/l10n/gl.php33
-rw-r--r--apps/user_ldap/lib/access.php60
-rw-r--r--apps/user_ldap/lib/connection.php89
-rw-r--r--apps/user_ldap/lib/jobs.php34
-rw-r--r--apps/user_ldap/templates/settings.php42
-rw-r--r--apps/user_ldap/user_ldap.php25
-rw-r--r--apps/user_webdavauth/l10n/de_DE.php2
-rw-r--r--core/l10n/be.php6
-rw-r--r--core/l10n/de_DE.php32
-rw-r--r--core/l10n/gl.php7
-rw-r--r--core/templates/layout.user.php2
-rw-r--r--l10n/be/core.po15
-rw-r--r--l10n/ca/files.po8
-rw-r--r--l10n/cs_CZ/files.po8
-rw-r--r--l10n/de_DE/core.po40
-rw-r--r--l10n/de_DE/files.po11
-rw-r--r--l10n/de_DE/files_encryption.po12
-rw-r--r--l10n/de_DE/files_trashbin.po13
-rw-r--r--l10n/de_DE/files_versions.po12
-rw-r--r--l10n/de_DE/lib.po6
-rw-r--r--l10n/de_DE/settings.po28
-rw-r--r--l10n/de_DE/user_ldap.po36
-rw-r--r--l10n/de_DE/user_webdavauth.po13
-rw-r--r--l10n/es_AR/files.po9
-rw-r--r--l10n/es_AR/settings.po12
-rw-r--r--l10n/fi_FI/files.po8
-rw-r--r--l10n/fr/settings.po38
-rw-r--r--l10n/gl/core.po21
-rw-r--r--l10n/gl/files.po12
-rw-r--r--l10n/gl/lib.po102
-rw-r--r--l10n/gl/user_ldap.po71
-rw-r--r--l10n/it/files.po8
-rw-r--r--l10n/ja_JP/files.po8
-rw-r--r--l10n/lv/files.po8
-rw-r--r--l10n/pt_PT/files.po8
-rw-r--r--l10n/pt_PT/lib.po24
-rw-r--r--l10n/pt_PT/settings.po6
-rw-r--r--l10n/ru/files.po8
-rw-r--r--l10n/sk_SK/files.po8
-rw-r--r--l10n/templates/core.pot2
-rw-r--r--l10n/templates/files.pot2
-rw-r--r--l10n/templates/files_encryption.pot2
-rw-r--r--l10n/templates/files_external.pot4
-rw-r--r--l10n/templates/files_sharing.pot2
-rw-r--r--l10n/templates/files_trashbin.pot2
-rw-r--r--l10n/templates/files_versions.pot2
-rw-r--r--l10n/templates/lib.pot2
-rw-r--r--l10n/templates/settings.pot4
-rw-r--r--l10n/templates/user_ldap.pot2
-rw-r--r--l10n/templates/user_webdavauth.pot2
-rw-r--r--l10n/vi/files.po8
-rw-r--r--lib/files/mapper.php24
-rw-r--r--lib/files/storage/mappedlocal.php6
-rw-r--r--lib/l10n/gl.php22
-rw-r--r--lib/l10n/pt_PT.php11
-rw-r--r--lib/template.php2
-rw-r--r--settings/l10n/de_DE.php10
-rw-r--r--settings/l10n/es_AR.php2
-rw-r--r--settings/l10n/fr.php10
-rw-r--r--tests/lib/files/storage/mappedlocalwithdotteddatadir.php42
-rw-r--r--tests/lib/files/storage/storage.php16
85 files changed, 736 insertions, 424 deletions
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index ecfc6abc8d5..5869b7df8ce 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 7376056e4c3..7eebd649cde 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_DE.php b/apps/files/l10n/de_DE.php
index 0dfc19ff01b..8d119afada4 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/es_AR.php b/apps/files/l10n/es_AR.php
index 0dc423f96f5..1e87eff9ba4 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/fi_FI.php b/apps/files/l10n/fi_FI.php
index 81ac32c09f3..ba6e3ecb4a4 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 91896b8e39b..202f2becd36 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/it.php b/apps/files/l10n/it.php
index 583a0ca7f7d..33a2fbda713 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 85ec6b6e953..8d1a95e243e 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 9d4d2c9fb6c..30b1f4eccb1 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 e036b3dacbb..6f51cc6deaf 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 803b34e99c8..7bfd93c9e47 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 8ece8140d8a..f3634af6f2e 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 b069246f017..2c97033154b 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 b942c659f9e..4f08b98eb29 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/google.php b/apps/files_external/lib/google.php
index 7396c7e3f27..f9bd4075f3e 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/templates/settings.php b/apps/files_external/templates/settings.php
index df8d7d6e2b5..d7a4dd5150d 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -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 13f42b130df..13298f113f8 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 7cb1834141b..6d944b3580c 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_DE.php b/apps/files_versions/l10n/de_DE.php
index 1cf2a63a1de..ba849c5ea87 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 f8038e31469..7ce1258a796 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 dec87684c9e..89410b5ef07 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 bc32d4ef4cc..2fcbf1902ac 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 02ceecaea0b..4fd4c636913 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_DE.php b/apps/user_ldap/l10n/de_DE.php
index 69faf5dc45d..45edda2debb 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/gl.php b/apps/user_ldap/l10n/gl.php
index 36c1f7af114..2d07f3215ef 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 4aa8ae8e8a4..901299e7c21 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 0bf2efe35af..abbc133038c 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 b265a8339ef..094d11db3d5 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 c6f1834e013..a882e5b7548 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 7778c37c794..44a19478598 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_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 8f67575fc0f..bd5d328e477 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 00000000000..ecf16e5d6a7
--- /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_DE.php b/core/l10n/de_DE.php
index b099510d0d9..34305258944 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/gl.php b/core/l10n/gl.php
index 8fd9292ce61..194c28e7cfb 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/core/templates/layout.user.php b/core/templates/layout.user.php
index 0d2a9f5d34a..2d00bdb5c8e 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -31,7 +31,7 @@
<ul id="settings" class="svg">
<span id="expand">
- <?php echo OCP\User::getDisplayName($user=null)?OC_Util::sanitizeHTML(OCP\User::getDisplayName($user=null)):(OC_User::getUser()?OC_User::getUser():'') ?>
+ <?php echo $_['displayname'] ?>
<img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
</span>
<div id="expanddiv">
diff --git a/l10n/be/core.po b/l10n/be/core.po
index e5b4699d86e..dcb31520cd1 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 722be0b3c8f..e1b0cc93f87 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 3a948f28f9e..6ce25474a98 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_DE/core.po b/l10n/de_DE/core.po
index a8ffe8861e3..b471458f11d 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 c62ccc02470..192ed3dbb85 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 a4b8388e603..f69dc4f4853 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 d9e42dce660..0a68526442b 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 8ea9b51ed6e..a9ddf034b67 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 630cd9fa410..564fc444d52 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-17 00:25+0100\n"
+"PO-Revision-Date: 2013-02-16 22:56+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 77ae2f776f2..5482f3ee32a 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-17 00:25+0100\n"
+"PO-Revision-Date: 2013-02-16 23:25+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)"
@@ -209,7 +209,7 @@ msgstr ""
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 ""
@@ -254,7 +254,7 @@ msgstr ""
#: templates/admin.php:89
msgid "Cron"
-msgstr ""
+msgstr "Cron"
#: templates/admin.php:98
msgid "Execute one task with each page loaded"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 18580dda23a..a2eb0d878ec 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 2d01d1e91e1..3592cedb142 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/es_AR/files.po b/l10n/es_AR/files.po
index 116e75e86cb..6421f04d5fb 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 63f5ab1289e..87ad26cb9c4 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/fi_FI/files.po b/l10n/fi_FI/files.po
index e42625a78a7..60fc1271eb0 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 b165922be01..3681ab7e403 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 15c7556ce01..f67798a78e6 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 e00e1c1134e..5fb9fb14dfd 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 e41f414f4e8..aa47bb80329 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/user_ldap.po b/l10n/gl/user_ldap.po
index 62e23bcad3c..af16ecd286b 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/it/files.po b/l10n/it/files.po
index 1a3e8db783b..001d45a4bea 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 21ebd3c48b2..17180fdddcb 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 e17afcc1853..e51491eec5d 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 1e85d6184d7..97c80512770 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 5aad6742ac0..9d3cdd6e61e 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 e1dc13b05bd..03a761e64fb 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 fcc6d86ae4b..6214f745168 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/sk_SK/files.po b/l10n/sk_SK/files.po
index 8893c32c437..a290cd58f67 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 0cc8a3019e8..50f1af05b63 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-17 00:25+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 078e0e40585..71954fdbcda 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-17 00:24+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 6d0396470cb..0c073a307c4 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-17 00:24+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 db270559083..18b776ea2cf 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-17 00:24+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"
@@ -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 27454624e29..1d3b14bb15a 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-17 00:24+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 dfb76494588..04f88ffe328 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-17 00:24+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 bbfa7fc167b..2c0f327e1da 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-17 00:24+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 40dc2bee040..56633541bc8 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-17 00:25+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 afd2407497c..ccb82adc96f 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-17 00:25+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 0a173656b5e..139967bb8bb 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-17 00:24+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/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 0b84d4999f6..419f2f574c3 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-17 00:24+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 d7eaa300bd9..ec785055c6b 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/lib/files/mapper.php b/lib/files/mapper.php
index cd163dcbfcd..520fadbd8c6 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 e707f71d71c..434c10bcbf7 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/gl.php b/lib/l10n/gl.php
index c49e8134af1..9673bb65fc1 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 a3585f914da..9bdcfcc9ced 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/template.php b/lib/template.php
index 0230d2f9343..3df5a24f946 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -415,6 +415,8 @@ class OC_Template{
$page = new OC_TemplateLayout($this->renderas);
if($this->renderas == 'user') {
$page->assign('requesttoken', $this->vars['requesttoken']);
+ $user = OC_User::getUser();
+ $page->assign('displayname', OCP\User::getDisplayName($user));
}
// Add custom headers
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index cf947019585..b97dfdc38bb 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -30,13 +30,19 @@
"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.",
+"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",
+"Cron" => "Cron",
"Execute one task with each page loaded" => "Führe eine Aufgabe bei jedem Laden der Seite aus",
"Sharing" => "Teilen",
"Enable Share API" => "Teilen-API aktivieren",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index d5e054a14dc..1e122bdd45a 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/fr.php b/settings/l10n/fr.php
index 7276f56f2b4..19d3a243c9d 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/tests/lib/files/storage/mappedlocalwithdotteddatadir.php b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php
new file mode 100644
index 00000000000..d2e5e2e97af
--- /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 c74a16f509f..f78f66d8b8a 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';