Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins for ownCloud <thomas.mueller@tmit.eu>2014-04-08 09:57:51 +0400
committerJenkins for ownCloud <thomas.mueller@tmit.eu>2014-04-08 09:57:51 +0400
commit4ad4b9768cd8b7e1107de0f9a15c039486c9c793 (patch)
tree40a290b38217ce7bd43c364524c9f8b1892a315c
parent9360dbf8a4c903be861f6c6b9d68635091362895 (diff)
[tx-robot] updated from transifex
-rw-r--r--apps/files/l10n/ast.php10
-rw-r--r--apps/files/l10n/jv.php8
-rw-r--r--apps/files/l10n/sk_SK.php5
-rw-r--r--apps/files_external/l10n/ast.php5
-rw-r--r--apps/files_external/l10n/et_EE.php2
-rw-r--r--apps/files_trashbin/l10n/ast.php5
-rw-r--r--apps/user_ldap/l10n/ast.php7
-rw-r--r--apps/user_ldap/l10n/az.php6
-rw-r--r--apps/user_ldap/l10n/jv.php6
-rw-r--r--core/l10n/ast.php34
-rw-r--r--core/l10n/jv.php9
-rw-r--r--core/l10n/sk_SK.php13
-rw-r--r--l10n/ach/core.po64
-rw-r--r--l10n/ach/user_ldap.po51
-rw-r--r--l10n/ady/core.po64
-rw-r--r--l10n/ady/user_ldap.po51
-rw-r--r--l10n/af/core.po64
-rw-r--r--l10n/af/user_ldap.po51
-rw-r--r--l10n/af_ZA/core.po64
-rw-r--r--l10n/af_ZA/user_ldap.po51
-rw-r--r--l10n/ak/core.po64
-rw-r--r--l10n/ak/user_ldap.po51
-rw-r--r--l10n/am_ET/core.po64
-rw-r--r--l10n/am_ET/user_ldap.po51
-rw-r--r--l10n/ar/core.po66
-rw-r--r--l10n/ar/user_ldap.po53
-rw-r--r--l10n/ast/core.po809
-rw-r--r--l10n/ast/files.po408
-rw-r--r--l10n/ast/files_encryption.po201
-rw-r--r--l10n/ast/files_external.po127
-rw-r--r--l10n/ast/files_sharing.po72
-rw-r--r--l10n/ast/files_trashbin.po64
-rw-r--r--l10n/ast/files_versions.po43
-rw-r--r--l10n/ast/lib.po338
-rw-r--r--l10n/ast/settings.po824
-rw-r--r--l10n/ast/user_ldap.po534
-rw-r--r--l10n/ast/user_webdavauth.po33
-rw-r--r--l10n/az/core.po64
-rw-r--r--l10n/az/user_ldap.po55
-rw-r--r--l10n/be/core.po64
-rw-r--r--l10n/be/user_ldap.po51
-rw-r--r--l10n/bg_BG/core.po64
-rw-r--r--l10n/bg_BG/user_ldap.po51
-rw-r--r--l10n/bn_BD/core.po64
-rw-r--r--l10n/bn_BD/user_ldap.po51
-rw-r--r--l10n/bs/core.po64
-rw-r--r--l10n/bs/user_ldap.po51
-rw-r--r--l10n/ca/core.po66
-rw-r--r--l10n/ca/user_ldap.po53
-rw-r--r--l10n/cs_CZ/core.po66
-rw-r--r--l10n/cs_CZ/user_ldap.po53
-rw-r--r--l10n/cy_GB/core.po64
-rw-r--r--l10n/cy_GB/user_ldap.po51
-rw-r--r--l10n/da/core.po66
-rw-r--r--l10n/da/user_ldap.po51
-rw-r--r--l10n/de/core.po66
-rw-r--r--l10n/de/user_ldap.po53
-rw-r--r--l10n/de_AT/core.po64
-rw-r--r--l10n/de_AT/user_ldap.po51
-rw-r--r--l10n/de_CH/core.po64
-rw-r--r--l10n/de_CH/user_ldap.po51
-rw-r--r--l10n/de_DE/core.po66
-rw-r--r--l10n/de_DE/user_ldap.po53
-rw-r--r--l10n/el/core.po52
-rw-r--r--l10n/el/user_ldap.po53
-rw-r--r--l10n/en@pirate/core.po64
-rw-r--r--l10n/en@pirate/user_ldap.po51
-rw-r--r--l10n/en_GB/core.po66
-rw-r--r--l10n/en_GB/user_ldap.po53
-rw-r--r--l10n/eo/core.po64
-rw-r--r--l10n/eo/user_ldap.po51
-rw-r--r--l10n/es/core.po52
-rw-r--r--l10n/es/user_ldap.po53
-rw-r--r--l10n/es_AR/core.po64
-rw-r--r--l10n/es_AR/user_ldap.po51
-rw-r--r--l10n/es_CL/core.po64
-rw-r--r--l10n/es_CL/user_ldap.po51
-rw-r--r--l10n/es_MX/core.po64
-rw-r--r--l10n/es_MX/user_ldap.po51
-rw-r--r--l10n/et_EE/core.po52
-rw-r--r--l10n/et_EE/files_external.po10
-rw-r--r--l10n/et_EE/user_ldap.po53
-rw-r--r--l10n/eu/core.po64
-rw-r--r--l10n/eu/user_ldap.po51
-rw-r--r--l10n/eu_ES/core.po64
-rw-r--r--l10n/eu_ES/user_ldap.po51
-rw-r--r--l10n/fa/core.po64
-rw-r--r--l10n/fa/user_ldap.po51
-rw-r--r--l10n/fi_FI/core.po64
-rw-r--r--l10n/fi_FI/user_ldap.po51
-rw-r--r--l10n/fr/core.po26
-rw-r--r--l10n/fr/user_ldap.po53
-rw-r--r--l10n/fr_CA/core.po64
-rw-r--r--l10n/fr_CA/user_ldap.po51
-rw-r--r--l10n/gl/core.po66
-rw-r--r--l10n/gl/user_ldap.po53
-rw-r--r--l10n/he/core.po64
-rw-r--r--l10n/he/user_ldap.po51
-rw-r--r--l10n/hi/core.po64
-rw-r--r--l10n/hi/user_ldap.po51
-rw-r--r--l10n/hr/core.po64
-rw-r--r--l10n/hr/user_ldap.po51
-rw-r--r--l10n/hu_HU/core.po64
-rw-r--r--l10n/hu_HU/user_ldap.po51
-rw-r--r--l10n/hy/core.po64
-rw-r--r--l10n/hy/user_ldap.po51
-rw-r--r--l10n/ia/core.po64
-rw-r--r--l10n/ia/user_ldap.po51
-rw-r--r--l10n/id/core.po64
-rw-r--r--l10n/id/user_ldap.po51
-rw-r--r--l10n/is/core.po64
-rw-r--r--l10n/is/user_ldap.po51
-rw-r--r--l10n/it/core.po66
-rw-r--r--l10n/it/user_ldap.po53
-rw-r--r--l10n/ja/core.po26
-rw-r--r--l10n/ja/user_ldap.po53
-rw-r--r--l10n/jv/core.po809
-rw-r--r--l10n/jv/files.po408
-rw-r--r--l10n/jv/files_encryption.po201
-rw-r--r--l10n/jv/files_external.po127
-rw-r--r--l10n/jv/files_sharing.po72
-rw-r--r--l10n/jv/files_trashbin.po64
-rw-r--r--l10n/jv/files_versions.po43
-rw-r--r--l10n/jv/lib.po338
-rw-r--r--l10n/jv/settings.po824
-rw-r--r--l10n/jv/user_ldap.po534
-rw-r--r--l10n/jv/user_webdavauth.po33
-rw-r--r--l10n/ka_GE/core.po64
-rw-r--r--l10n/ka_GE/user_ldap.po51
-rw-r--r--l10n/km/core.po64
-rw-r--r--l10n/km/user_ldap.po51
-rw-r--r--l10n/kn/core.po64
-rw-r--r--l10n/kn/user_ldap.po51
-rw-r--r--l10n/ko/core.po64
-rw-r--r--l10n/ko/user_ldap.po51
-rw-r--r--l10n/ku_IQ/core.po64
-rw-r--r--l10n/ku_IQ/user_ldap.po51
-rw-r--r--l10n/lb/core.po64
-rw-r--r--l10n/lb/user_ldap.po51
-rw-r--r--l10n/lt_LT/core.po64
-rw-r--r--l10n/lt_LT/user_ldap.po51
-rw-r--r--l10n/lv/core.po64
-rw-r--r--l10n/lv/user_ldap.po51
-rw-r--r--l10n/mk/core.po64
-rw-r--r--l10n/mk/user_ldap.po51
-rw-r--r--l10n/ml/core.po64
-rw-r--r--l10n/ml/user_ldap.po51
-rw-r--r--l10n/ml_IN/core.po64
-rw-r--r--l10n/ml_IN/user_ldap.po51
-rw-r--r--l10n/mn/core.po64
-rw-r--r--l10n/mn/user_ldap.po51
-rw-r--r--l10n/ms_MY/core.po64
-rw-r--r--l10n/ms_MY/user_ldap.po51
-rw-r--r--l10n/my_MM/core.po64
-rw-r--r--l10n/my_MM/user_ldap.po51
-rw-r--r--l10n/nb_NO/core.po26
-rw-r--r--l10n/nb_NO/user_ldap.po51
-rw-r--r--l10n/nds/core.po64
-rw-r--r--l10n/nds/user_ldap.po51
-rw-r--r--l10n/ne/core.po64
-rw-r--r--l10n/ne/user_ldap.po51
-rw-r--r--l10n/nl/core.po66
-rw-r--r--l10n/nl/user_ldap.po53
-rw-r--r--l10n/nn_NO/core.po64
-rw-r--r--l10n/nn_NO/user_ldap.po51
-rw-r--r--l10n/nqo/core.po64
-rw-r--r--l10n/nqo/user_ldap.po51
-rw-r--r--l10n/oc/core.po64
-rw-r--r--l10n/oc/user_ldap.po51
-rw-r--r--l10n/pa/core.po64
-rw-r--r--l10n/pa/user_ldap.po51
-rw-r--r--l10n/pl/core.po66
-rw-r--r--l10n/pl/user_ldap.po53
-rw-r--r--l10n/pt_BR/core.po66
-rw-r--r--l10n/pt_BR/user_ldap.po53
-rw-r--r--l10n/pt_PT/core.po64
-rw-r--r--l10n/pt_PT/user_ldap.po51
-rw-r--r--l10n/ro/core.po64
-rw-r--r--l10n/ro/user_ldap.po51
-rw-r--r--l10n/ru/core.po66
-rw-r--r--l10n/ru/user_ldap.po51
-rw-r--r--l10n/si_LK/core.po64
-rw-r--r--l10n/si_LK/user_ldap.po51
-rw-r--r--l10n/sk/core.po64
-rw-r--r--l10n/sk/user_ldap.po51
-rw-r--r--l10n/sk_SK/core.po76
-rw-r--r--l10n/sk_SK/files.po16
-rw-r--r--l10n/sk_SK/settings.po96
-rw-r--r--l10n/sk_SK/user_ldap.po51
-rw-r--r--l10n/sl/core.po52
-rw-r--r--l10n/sl/user_ldap.po53
-rw-r--r--l10n/sq/core.po64
-rw-r--r--l10n/sq/user_ldap.po51
-rw-r--r--l10n/sr/core.po64
-rw-r--r--l10n/sr/user_ldap.po51
-rw-r--r--l10n/sr@latin/core.po64
-rw-r--r--l10n/sr@latin/user_ldap.po51
-rw-r--r--l10n/su/core.po64
-rw-r--r--l10n/su/user_ldap.po51
-rw-r--r--l10n/sv/core.po26
-rw-r--r--l10n/sv/user_ldap.po53
-rw-r--r--l10n/sw_KE/core.po64
-rw-r--r--l10n/sw_KE/user_ldap.po51
-rw-r--r--l10n/ta_LK/core.po64
-rw-r--r--l10n/ta_LK/user_ldap.po51
-rw-r--r--l10n/te/core.po64
-rw-r--r--l10n/te/user_ldap.po51
-rw-r--r--l10n/templates/core.pot22
-rw-r--r--l10n/templates/files.pot2
-rw-r--r--l10n/templates/files_encryption.pot2
-rw-r--r--l10n/templates/files_external.pot2
-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/private.pot2
-rw-r--r--l10n/templates/settings.pot16
-rw-r--r--l10n/templates/user_ldap.pot49
-rw-r--r--l10n/templates/user_webdavauth.pot2
-rw-r--r--l10n/th_TH/core.po64
-rw-r--r--l10n/th_TH/user_ldap.po51
-rw-r--r--l10n/tr/core.po26
-rw-r--r--l10n/tr/user_ldap.po53
-rw-r--r--l10n/tzm/core.po64
-rw-r--r--l10n/tzm/user_ldap.po51
-rw-r--r--l10n/ug/core.po64
-rw-r--r--l10n/ug/user_ldap.po51
-rw-r--r--l10n/uk/core.po64
-rw-r--r--l10n/uk/user_ldap.po51
-rw-r--r--l10n/ur/core.po64
-rw-r--r--l10n/ur/user_ldap.po51
-rw-r--r--l10n/ur_PK/core.po64
-rw-r--r--l10n/ur_PK/user_ldap.po51
-rw-r--r--l10n/uz/core.po64
-rw-r--r--l10n/uz/user_ldap.po51
-rw-r--r--l10n/vi/core.po64
-rw-r--r--l10n/vi/user_ldap.po51
-rw-r--r--l10n/zh_CN/core.po64
-rw-r--r--l10n/zh_CN/user_ldap.po51
-rw-r--r--l10n/zh_HK/core.po64
-rw-r--r--l10n/zh_HK/user_ldap.po51
-rw-r--r--l10n/zh_TW/core.po64
-rw-r--r--l10n/zh_TW/user_ldap.po51
-rw-r--r--lib/l10n/ast.php9
-rw-r--r--lib/l10n/jv.php8
-rw-r--r--settings/l10n/ast.php7
-rw-r--r--settings/l10n/jv.php5
-rw-r--r--settings/l10n/sk_SK.php5
248 files changed, 13590 insertions, 4684 deletions
diff --git a/apps/files/l10n/ast.php b/apps/files/l10n/ast.php
new file mode 100644
index 00000000000..ba7ccfad2db
--- /dev/null
+++ b/apps/files/l10n/ast.php
@@ -0,0 +1,10 @@
+<?php
+$TRANSLATIONS = array(
+"Share" => "Compartir",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Download" => "Descargar",
+"Delete" => "Desaniciar"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/jv.php b/apps/files/l10n/jv.php
new file mode 100644
index 00000000000..cfab5af7d1c
--- /dev/null
+++ b/apps/files/l10n/jv.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Download" => "Njipuk"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 95c07afba57..cffb89c294d 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -3,7 +3,9 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Nie je možné presunúť %s - súbor s týmto menom už existuje",
"Could not move %s" => "Nie je možné presunúť %s",
"File name cannot be empty." => "Meno súboru nemôže byť prázdne",
+"\"%s\" is an invalid file name." => "\"%s\" je neplatné meno súboru.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
+"The target folder has been moved or deleted." => "Cieľový priečinok bol premiestnený alebo odstránený.",
"The name %s is already used in the folder %s. Please choose a different name." => "Názov %s už používa priečinok s%. Prosím zvoľte iný názov.",
"Not a valid source" => "Neplatný zdroj",
"Server is not allowed to open URLs, please check the server configuration" => "Server nie je oprávnený otvárať adresy URL. Overte nastavenia servera.",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
"Invalid directory." => "Neplatný priečinok.",
"Files" => "Súbory",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov",
+"Total file size {size1} exceeds upload limit {size2}" => "Celková veľkosť súboru {size1} prekračuje upload limit {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}",
"Upload cancelled." => "Odosielanie zrušené.",
"Could not get result from server." => "Nepodarilo sa dostať výsledky zo servera.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
@@ -48,6 +52,7 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
"{dirs} and {files}" => "{dirs} a {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"),
+"\"{name}\" is an invalid file name." => "\"{name}\" je neplatné meno súboru.",
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
diff --git a/apps/files_external/l10n/ast.php b/apps/files_external/l10n/ast.php
new file mode 100644
index 00000000000..e304b890f99
--- /dev/null
+++ b/apps/files_external/l10n/ast.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Delete" => "Desaniciar"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index d3aa683673e..0ed0baa44f9 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -14,7 +14,9 @@ $TRANSLATIONS = array(
"External storage" => "Väline andmehoidla",
"Configuration" => "Seadistamine",
"Options" => "Valikud",
+"Available for" => "Saadaval",
"Add storage" => "Lisa andmehoidla",
+"No user or group" => "Ühtki kasutajat või gruppi",
"All Users" => "Kõik kasutajad",
"Groups" => "Grupid",
"Users" => "Kasutajad",
diff --git a/apps/files_trashbin/l10n/ast.php b/apps/files_trashbin/l10n/ast.php
new file mode 100644
index 00000000000..e304b890f99
--- /dev/null
+++ b/apps/files_trashbin/l10n/ast.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Delete" => "Desaniciar"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php
new file mode 100644
index 00000000000..9cd0d7e7c6d
--- /dev/null
+++ b/apps/user_ldap/l10n/ast.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"Deletion failed" => "Falló'l borráu",
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/az.php b/apps/user_ldap/l10n/az.php
index bba52d53a1a..3a1e002311c 100644
--- a/apps/user_ldap/l10n/az.php
+++ b/apps/user_ldap/l10n/az.php
@@ -1,6 +1,6 @@
<?php
$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array("")
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/jv.php b/apps/user_ldap/l10n/jv.php
new file mode 100644
index 00000000000..3a1e002311c
--- /dev/null
+++ b/apps/user_ldap/l10n/jv.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ast.php b/core/l10n/ast.php
new file mode 100644
index 00000000000..57f7cdde791
--- /dev/null
+++ b/core/l10n/ast.php
@@ -0,0 +1,34 @@
+<?php
+$TRANSLATIONS = array(
+"Sunday" => "Domingu",
+"Monday" => "Llunes",
+"Tuesday" => "Martes",
+"Wednesday" => "Miércoles",
+"Thursday" => "Xueves",
+"Friday" => "Vienres",
+"Saturday" => "Sábadu",
+"January" => "Xineru",
+"February" => "Febreru",
+"March" => "Marzu",
+"April" => "Abril",
+"May" => "Mayu",
+"June" => "Xunu",
+"July" => "Xunetu",
+"August" => "Agostu",
+"September" => "Setiembre",
+"October" => "Ochobre",
+"November" => "Payares",
+"December" => "Avientu",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Share" => "Compartir",
+"group" => "grupu",
+"Unshare" => "Dexar de compartir",
+"can edit" => "pue editar",
+"Delete" => "Desaniciar",
+"Personal" => "Personal"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/jv.php b/core/l10n/jv.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/jv.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index bb3c9863ce2..853118e7a62 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Expiration date is in the past." => " \t\nDátum expirácie spadá do minulosti.",
"Couldn't send mail to following users: %s " => "Nebolo možné odoslať email týmto používateľom: %s ",
"Turned on maintenance mode" => "Mód údržby je zapnutý",
"Turned off maintenance mode" => "Mód údržby e vypnutý",
@@ -56,6 +57,11 @@ $TRANSLATIONS = array(
"(all selected)" => "(všetko vybrané)",
"({count} selected)" => "({count} vybraných)",
"Error loading file exists template" => "Chyba pri nahrávaní šablóny existencie súboru",
+"Very weak password" => "Veľmi slabé heslo",
+"Weak password" => "Slabé heslo",
+"So-so password" => "Priemerné heslo",
+"Good password" => "Dobré heslo",
+"Strong password" => "Silné heslo",
"Shared" => "Zdieľané",
"Share" => "Zdieľať",
"Error" => "Chyba",
@@ -103,6 +109,7 @@ $TRANSLATIONS = array(
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud comunite</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
"%s password reset" => "reset hesla %s",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Vyskytol sa problém pri odosielaní emailu, prosím obráťte sa na správcu.",
"Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovenie hesla bol odoslaný na vašu emailovú adresu.<br>Ak ho v krátkej dobe neobdržíte, skontrolujte si váš kôš a priečinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora.",
"Request failed!<br>Did you make sure your email/username was right?" => "Požiadavka zlyhala.<br>Uistili ste sa, že vaše používateľské meno a email sú správne?",
@@ -115,6 +122,8 @@ $TRANSLATIONS = array(
"To login page" => "Na prihlasovaciu stránku",
"New password" => "Nové heslo",
"Reset password" => "Obnovenie hesla",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
+"For the best results, please consider using a GNU/Linux server instead." => "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
"Personal" => "Osobné",
"Users" => "Používatelia",
"Apps" => "Aplikácie",
@@ -129,7 +138,7 @@ $TRANSLATIONS = array(
"Error unfavoriting" => "Chyba pri odobratí z obľúbených",
"Access forbidden" => "Prístup odmietnutý",
"Cloud not found" => "Nenájdené",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ahoj,\n\nchcem ti dať navedomie, že %s s tebou zdieľa %s.\nTu je odkaz: %s\n\n",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
"The share will expire on %s." => "Zdieľanie expiruje %s.",
"Cheers!" => "Pekný deň!",
"Security Warning" => "Bezpečnostné varovanie",
@@ -140,6 +149,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
"Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
+"Storage & database" => "Úložislo & databáza",
"Data folder" => "Priečinok dát",
"Configure the database" => "Nastaviť databázu",
"will be used" => "bude použité",
@@ -162,6 +172,7 @@ $TRANSLATIONS = array(
"remember" => "zapamätať",
"Log in" => "Prihlásiť sa",
"Alternative Logins" => "Alternatívne prihlásenie",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
"This ownCloud instance is currently in single user mode." => "Táto inštancia ownCloudu je teraz v jednopoužívateľskom móde.",
"This means only administrators can use the instance." => "Len správca systému môže používať túto inštanciu.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
index 3640708d6e3..ca25a26988f 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ach\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ach/user_ldap.po b/l10n/ach/user_ldap.po
index 8516b5a6fea..8ca354d2020 100644
--- a/l10n/ach/user_ldap.po
+++ b/l10n/ach/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ady/core.po b/l10n/ady/core.po
index a686756ba93..3c1f515e05a 100644
--- a/l10n/ady/core.po
+++ b/l10n/ady/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ady\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ady/user_ldap.po b/l10n/ady/user_ldap.po
index 705677146f4..04cdd0397c4 100644
--- a/l10n/ady/user_ldap.po
+++ b/l10n/ady/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/af/core.po b/l10n/af/core.po
index 94d53b73573..2dd7b1f1a45 100644
--- a/l10n/af/core.po
+++ b/l10n/af/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: af\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/af/user_ldap.po b/l10n/af/user_ldap.po
index 32c77bec4a9..b0e9bc1b3ab 100644
--- a/l10n/af/user_ldap.po
+++ b/l10n/af/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 1edc5b40a1d..38344accb9b 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Instellings"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr "Nuwe wagwoord"
msgid "Reset password"
msgstr "Herstel wagwoord"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 4f4ab643287..581eb34d236 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ak/core.po b/l10n/ak/core.po
index f498dda78d8..1fd891dc6ef 100644
--- a/l10n/ak/core.po
+++ b/l10n/ak/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ak\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ak/user_ldap.po b/l10n/ak/user_ldap.po
index 537c7c79d09..2dae2aaf95c 100644
--- a/l10n/ak/user_ldap.po
+++ b/l10n/ak/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/am_ET/core.po b/l10n/am_ET/core.po
index 7101e46cec9..e66052cc04c 100644
--- a/l10n/am_ET/core.po
+++ b/l10n/am_ET/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-26 01:55-0400\n"
-"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: am_ET\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/am_ET/user_ldap.po b/l10n/am_ET/user_ldap.po
index df272f69784..0dc3459fe7e 100644
--- a/l10n/am_ET/user_ldap.po
+++ b/l10n/am_ET/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-26 01:55-0400\n"
-"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index b31f6772137..a92aaeb919f 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-25 01:55-0400\n"
-"PO-Revision-Date: 2014-03-24 14:00+0000\n"
-"Last-Translator: Abderraouf Mehdi Bouhali <armbouhali@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -136,19 +136,19 @@ msgstr "تشرين الثاني"
msgid "December"
msgstr "كانون الاول"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "إعدادات"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "جاري الحفظ..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "منذ ثواني"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -158,7 +158,7 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -168,15 +168,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "اليوم"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "يوم أمس"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -186,11 +186,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "الشهر الماضي"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -200,15 +200,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "شهر مضى"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "السنةالماضية"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "سنة مضت"
@@ -251,32 +251,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "الغاء"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -555,14 +563,14 @@ msgstr "كلمات سر جديدة"
msgid "Reset password"
msgstr "تعديل كلمة السر"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index a4e3832904c..3b92bebccea 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: m.shehab <shehab.mahmood@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -428,41 +428,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "خانة البريد الإلكتروني"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -478,15 +489,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -497,19 +508,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -523,10 +534,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ast/core.po b/l10n/ast/core.po
new file mode 100644
index 00000000000..eacc22af16a
--- /dev/null
+++ b/l10n/ast/core.po
@@ -0,0 +1,809 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:36
+msgid "Sunday"
+msgstr "Domingu"
+
+#: js/config.php:37
+msgid "Monday"
+msgstr "Llunes"
+
+#: js/config.php:38
+msgid "Tuesday"
+msgstr "Martes"
+
+#: js/config.php:39
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#: js/config.php:40
+msgid "Thursday"
+msgstr "Xueves"
+
+#: js/config.php:41
+msgid "Friday"
+msgstr "Vienres"
+
+#: js/config.php:42
+msgid "Saturday"
+msgstr "Sábadu"
+
+#: js/config.php:47
+msgid "January"
+msgstr "Xineru"
+
+#: js/config.php:48
+msgid "February"
+msgstr "Febreru"
+
+#: js/config.php:49
+msgid "March"
+msgstr "Marzu"
+
+#: js/config.php:50
+msgid "April"
+msgstr "Abril"
+
+#: js/config.php:51
+msgid "May"
+msgstr "Mayu"
+
+#: js/config.php:52
+msgid "June"
+msgstr "Xunu"
+
+#: js/config.php:53
+msgid "July"
+msgstr "Xunetu"
+
+#: js/config.php:54
+msgid "August"
+msgstr "Agostu"
+
+#: js/config.php:55
+msgid "September"
+msgstr "Setiembre"
+
+#: js/config.php:56
+msgid "October"
+msgstr "Ochobre"
+
+#: js/config.php:57
+msgid "November"
+msgstr "Payares"
+
+#: js/config.php:58
+msgid "December"
+msgstr "Avientu"
+
+#: js/js.js:479
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:564
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1124
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1125
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1126
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1127
+msgid "today"
+msgstr ""
+
+#: js/js.js:1128
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1129
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1130
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1131
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1132
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:1133
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1134
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:379
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:389
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:460
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr "Compartir"
+
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:767
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:171
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:178
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:188
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:190
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:214
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:220
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:223
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: js/share.js:230
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:234
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:235
+msgid "Send"
+msgstr ""
+
+#: js/share.js:240
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:241
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:277
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:280
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:324 js/share.js:363
+msgid "group"
+msgstr "grupu"
+
+#: js/share.js:335
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:379
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:401
+msgid "Unshare"
+msgstr "Dexar de compartir"
+
+#: js/share.js:409
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:412
+msgid "can edit"
+msgstr "pue editar"
+
+#: js/share.js:414
+msgid "access control"
+msgstr ""
+
+#: js/share.js:417
+msgid "create"
+msgstr ""
+
+#: js/share.js:420
+msgid "update"
+msgstr ""
+
+#: js/share.js:423
+msgid "delete"
+msgstr ""
+
+#: js/share.js:426
+msgid "share"
+msgstr ""
+
+#: js/share.js:698
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:711
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:729
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:754
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:765
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:789
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Desaniciar"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:8
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:17
+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 ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:7
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Personal"
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation. "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/ast/files.po b/l10n/ast/files.po
new file mode 100644
index 00000000000..79497938ef8
--- /dev/null
+++ b/l10n/ast/files.po
@@ -0,0 +1,408 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 19:30+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:98
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:107
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:159
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:169
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:184
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:385
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:477
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:542
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:546
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
+
+#: js/file-upload.js:548 js/filelist.js:603
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:600
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:613
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:653
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:164
+msgid "Share"
+msgstr "Compartir"
+
+#: js/fileactions.js:177
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:238
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:630
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:789
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:822
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:1052 js/filelist.js:1090
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:121
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:134
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:138
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:142
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:331
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:570 templates/index.php:67
+msgid "Name"
+msgstr ""
+
+#: js/files.js:571 templates/index.php:79
+msgid "Size"
+msgstr ""
+
+#: js/files.js:572 templates/index.php:81
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved."
+msgstr ""
+
+#: lib/app.php:93
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:14 templates/index.php:22
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:5
+msgid "New"
+msgstr ""
+
+#: templates/index.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/index.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:51
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/index.php:56
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:73
+msgid "Download"
+msgstr "Descargar"
+
+#: templates/index.php:84 templates/index.php:85
+msgid "Delete"
+msgstr "Desaniciar"
+
+#: templates/index.php:96
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:98
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:103
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:106
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/ast/files_encryption.po b/l10n/ast/files_encryption.po
new file mode 100644
index 00000000000..85dc08a6ce7
--- /dev/null
+++ b/l10n/ast/files_encryption.po
@@ -0,0 +1,201 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:295
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ast/files_external.po b/l10n/ast/files_external.po
new file mode 100644
index 00000000000..6cc7ffe3e12
--- /dev/null
+++ b/l10n/ast/files_external.po
@@ -0,0 +1,127 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 19:30+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:654
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:658
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:661
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr "Desaniciar"
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/ast/files_sharing.po b/l10n/ast/files_sharing.po
new file mode 100644
index 00000000000..75d475c4855
--- /dev/null
+++ b/l10n/ast/files_sharing.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/share.js:33
+msgid "Shared by {owner}"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:17
+#, php-format
+msgid "shared by %s"
+msgstr ""
+
+#: templates/public.php:44
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:48
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/ast/files_trashbin.po b/l10n/ast/files_trashbin.po
new file mode 100644
index 00000000000..0df0166dc8f
--- /dev/null
+++ b/l10n/ast/files_trashbin.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 19:30+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/filelist.js:3
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:264
+msgid "Deleted Files"
+msgstr ""
+
+#: lib/trashbin.php:859 lib/trashbin.php:861
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:6
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr "Desaniciar"
diff --git a/l10n/ast/files_versions.po b/l10n/ast/files_versions.po
new file mode 100644
index 00000000000..0fbdc2c22ad
--- /dev/null
+++ b/l10n/ast/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/ast/lib.po b/l10n/ast/lib.po
new file mode 100644
index 00000000000..f5115138fc9
--- /dev/null
+++ b/l10n/ast/lib.po
@@ -0,0 +1,338 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 19:30+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr "Personal"
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:875
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:232
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:233
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:234 private/files.php:262
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:259
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:260
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:63 private/json.php:88
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:52
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:202
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:203
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:133
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:135
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:137
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:139
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:141
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:142
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:144
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:145
+msgid "years ago"
+msgstr ""
diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po
new file mode 100644
index 00000000000..3029c44d880
--- /dev/null
+++ b/l10n/ast/settings.po
@@ -0,0 +1,824 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 19:30+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr "Solicitú non válida"
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:243
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:274
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:275
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:276
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:313
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr "Desaniciar"
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:48 personal.php:49
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:90
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:104
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:107
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:118
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:123
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:127
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:131
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:146
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:192
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:200
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:205
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:219
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:228
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:243
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:246
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:254
+msgid "Allow user to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:261
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:274
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:276
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:282
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:377
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:416 templates/personal.php:171
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:420 templates/personal.php:174
+msgid ""
+"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>."
+msgstr ""
+
+#: templates/apps.php:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:137
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:139
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:151
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:157
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:162
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr "Otru"
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po
new file mode 100644
index 00000000000..f13251011b1
--- /dev/null
+++ b/l10n/ast/user_ldap.po
@@ -0,0 +1,534 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr "Falló'l borráu"
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:838
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:847
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:856
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:873 js/settings.js:882
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:876 js/settings.js:885
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:879
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:906
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:913
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:922
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:923
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:79 lib/wizard.php:93
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:122
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:784 lib/wizard.php:796
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:963
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:14
+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 ""
+
+#: templates/settings.php:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/ast/user_webdavauth.po b/l10n/ast/user_webdavauth.po
new file mode 100644
index 00000000000..e3c12d518ce
--- /dev/null
+++ b/l10n/ast/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/az/core.po b/l10n/az/core.po
index d27ed545d6b..16e53892b8e 100644
--- a/l10n/az/core.po
+++ b/l10n/az/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: az\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/az/user_ldap.po b/l10n/az/user_ldap.po
index 5aaa8ff5dcf..df36a475ca0 100644
--- a/l10n/az/user_ldap.po
+++ b/l10n/az/user_ldap.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: az\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
@@ -131,12 +131,14 @@ msgstr ""
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
+msgstr[1] ""
#: lib/wizard.php:122
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
+msgstr[1] ""
#: lib/wizard.php:784 lib/wizard.php:796
msgid "Invalid Host"
@@ -417,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/be/core.po b/l10n/be/core.po
index b654e238ac4..08ac377c071 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,19 +135,19 @@ msgstr "Лістапад"
msgid "December"
msgstr "Снежань"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Налады"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "Секунд таму"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -155,7 +155,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -163,15 +163,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "Сёння"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "Ўчора"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -179,11 +179,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "У мінулым месяцы"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -191,15 +191,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "Месяцаў таму"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "У мінулым годзе"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "Гадоў таму"
@@ -240,32 +240,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -544,14 +552,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index 766cac335ef..ba05cf01fbb 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -423,41 +423,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -473,15 +484,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -518,10 +529,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index ca776f7ede6..53dbcfcf824 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-25 01:55-0400\n"
-"PO-Revision-Date: 2014-03-24 08:40+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,63 +135,63 @@ msgstr "Ноември"
msgid "December"
msgstr "Декември"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Настройки"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Записване..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "преди секунди"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "днес"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "последният месец"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "Преди месеци"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "последната година"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "последните години"
@@ -230,32 +230,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Отказ"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -534,14 +542,14 @@ msgstr "Нова парола"
msgid "Reset password"
msgstr "Нулиране на парола"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 78f3b6a1147..240293f936f 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index de745e7cda0..de3aa807873 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr "নভেম্বর"
msgid "December"
msgstr "ডিসেম্বর"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "নিয়ামকসমূহ"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "সংরক্ষণ করা হচ্ছে.."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "সেকেন্ড পূর্বে"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "আজ"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "গতকাল"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "গত মাস"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "মাস পূর্বে"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "গত বছর"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "বছর পূর্বে"
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "বাতির"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr "নতুন কূটশব্দ"
msgid "Reset password"
msgstr "কূটশব্দ পূনঃনির্ধারণ কর"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index a7caeb40194..4c9a205b7bf 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "বাইটে"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index fe90076c0d4..0b742954372 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: bs\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,67 +134,67 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Spašavam..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -234,32 +234,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -538,14 +546,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
index 268fdc806b2..b4625092d33 100644
--- a/l10n/bs/user_ldap.po
+++ b/l10n/bs/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 6ea1ff1cdb7..5926fde25bb 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-26 01:55-0400\n"
-"PO-Revision-Date: 2014-03-25 13:08+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,24 +20,24 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "La data de venciment és en el passat."
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "No s'ha pogut enviar correu als usuaris següents: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Activat el mode de manteniment"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Desactivat el mode de manteniment"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Actualitzada la base de dades"
@@ -137,63 +137,63 @@ msgstr "Novembre"
msgid "December"
msgstr "Desembre"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Configuració"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Desant..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "segons enrere"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "fa %n minut"
msgstr[1] "fa %n minuts"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "fa %n hora"
msgstr[1] "fa %n hores"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "avui"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ahir"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "fa %n dies"
msgstr[1] "fa %n dies"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "el mes passat"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "fa %n mes"
msgstr[1] "fa %n mesos"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "mesos enrere"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "l'any passat"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "anys enrere"
@@ -232,32 +232,40 @@ msgid "One file conflict"
msgstr "Un fitxer en conflicte"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Quin fitxer voleu conservar?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Cancel·la"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Continua"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(selecciona-ho tot)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} seleccionats)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Error en carregar la plantilla de fitxer existent"
@@ -536,14 +544,14 @@ msgstr "Contrasenya nova"
msgid "Reset password"
msgstr "Reinicialitza la contrasenya"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!"
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux."
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 90f2c187f2f..30ed5e7f450 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -422,41 +422,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Quan està activat, els grups que contenen grups estan permesos. (Només funciona si l'atribut del grup membre conté DNs.)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Atributs especials"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Camp de quota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Quota per defecte"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Camp de correu electrònic"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Norma per anomenar la carpeta arrel d'usuari"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Nom d'usuari intern"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -472,15 +483,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home d'usuari. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits)."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Atribut nom d'usuari intern:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Sobrescriu la detecció UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -491,19 +502,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran als usuaris i grups LDAP mapats de nou (afegits)."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Atribut UUID per Usuaris:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Atribut UUID per Grups:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Mapatge d'usuari Nom d'usuari-LDAP"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -517,10 +528,10 @@ msgid ""
"experimental stage."
msgstr "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria de cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Elimina el mapatge d'usuari Nom d'usuari-LDAP"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Elimina el mapatge de grup Nom de grup-LDAP"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 32fec75418b..3daadc82e18 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-24 01:55-0400\n"
-"PO-Revision-Date: 2014-03-23 22:41+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,24 +25,24 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "Datum expirace je v minulosti."
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nebylo možné odeslat e-mail následujícím uživatelům: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Zapnut režim údržby"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Vypnut režim údržby"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Zaktualizována databáze"
@@ -142,67 +142,67 @@ msgstr "Listopad"
msgid "December"
msgstr "Prosinec"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Nastavení"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Ukládám..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "před pár vteřinami"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "před %n minutou"
msgstr[1] "před %n minutami"
msgstr[2] "před %n minutami"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "před %n hodinou"
msgstr[1] "před %n hodinami"
msgstr[2] "před %n hodinami"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "dnes"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "včera"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "před %n dnem"
msgstr[1] "před %n dny"
msgstr[2] "před %n dny"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "minulý měsíc"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "před %n měsícem"
msgstr[1] "před %n měsíci"
msgstr[2] "před %n měsíci"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "před měsíci"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "před lety"
@@ -242,32 +242,40 @@ msgid "One file conflict"
msgstr "Jeden konflikt souboru"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Které soubory chcete ponechat?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Zrušit"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Pokračovat"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(vybráno vše)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "(vybráno {count})"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Chyba při nahrávání šablony existence souboru"
@@ -546,14 +554,14 @@ msgstr "Nové heslo"
msgid "Reset password"
msgstr "Obnovit heslo"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!"
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru."
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index f20b90fcd2d..c2845ec7a58 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -427,41 +427,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Pokud zapnuto, je možno používat skupiny, které obsahují jiné skupiny. (Funguje pouze pokud atribut člena skupiny obsahuje DN.)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Speciální atributy"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Pole pro kvótu"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Výchozí kvóta"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "v bajtech"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Pole e-mailu"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Pravidlo pojmenování domovské složky uživatele"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Interní uživatelské jméno"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -477,15 +488,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména a není potřeba provádět konverzi znaků. Interní uživatelské jméno je omezeno na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením může být výchozí chování změněno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Atribut interního uživatelského jména:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Nastavit ručně UUID atribut"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -496,19 +507,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut, který sami zvolíte. Musíte se ale ujistit, že atribut, který vyberete, bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID atribut pro uživatele:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID atribut pro skupiny:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Mapování uživatelských jmen z LDAPu"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -522,10 +533,10 @@ msgid ""
"experimental stage."
msgstr "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To vyžaduje mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro zmenšení interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Interní uživatelské jméno se používá celé. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Zrušit mapování uživatelských jmen LDAPu"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Zrušit mapování názvů skupin LDAPu"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 68a772c1cb9..2e8afc0dbc8 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,19 +135,19 @@ msgstr "Tachwedd"
msgid "December"
msgstr "Rhagfyr"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Gosodiadau"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Yn cadw..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "eiliad yn ôl"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -155,7 +155,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -163,15 +163,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "heddiw"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ddoe"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -179,11 +179,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "mis diwethaf"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -191,15 +191,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "misoedd yn ôl"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "y llynedd"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "blwyddyn yn ôl"
@@ -240,32 +240,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Diddymu"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -544,14 +552,14 @@ msgstr "Cyfrinair newydd"
msgid "Reset password"
msgstr "Ailosod cyfrinair"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index cc9dff4f5d9..e7a8c333fd3 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -423,41 +423,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -473,15 +484,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -518,10 +529,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 352b90b2cff..7cee7a2d715 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-25 01:55-0400\n"
-"PO-Revision-Date: 2014-03-24 11:00+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,24 +24,24 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Kunne ikke sende mail til følgende brugere: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Startede vedligeholdelsestilstand"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "standsede vedligeholdelsestilstand"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Opdaterede database"
@@ -141,63 +141,63 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Indstillinger"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Gemmer..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut siden"
msgstr[1] "%n minutter siden"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time siden"
msgstr[1] "%n timer siden"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "i dag"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "i går"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag siden"
msgstr[1] "%n dage siden"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "sidste måned"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n måned siden"
msgstr[1] "%n måneder siden"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "sidste år"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "år siden"
@@ -236,32 +236,40 @@ msgid "One file conflict"
msgstr "En filkonflikt"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Hvilke filer ønsker du at beholde?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Annuller"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Videre"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(alle valgt)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} valgt)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Fejl ved inlæsning af; fil eksistere skabelon"
@@ -540,14 +548,14 @@ msgstr "Nyt kodeord"
msgid "Reset password"
msgstr "Nulstil kodeord"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 91bc2bece8a..d97bda300db 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -420,41 +420,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Kvote Felt"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Email Felt"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Internt Brugernavn"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -470,15 +481,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -515,10 +526,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 471f29b8a0e..7cf5b2bf1cf 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-23 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 10:50+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,24 +27,24 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "Ablaufdatum liegt in der Vergangenheit."
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Wartungsmodus eingeschaltet"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Wartungsmodus ausgeschaltet"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Datenbank aktualisiert"
@@ -144,63 +144,63 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Speichern..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "Heute"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "Vor Jahren"
@@ -239,32 +239,40 @@ msgid "One file conflict"
msgstr "Ein Dateikonflikt"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Welche Dateien möchtest Du behalten?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Fortsetzen"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(Alle ausgewählt)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} ausgewählt)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Fehler beim Laden der vorhanden Dateivorlage"
@@ -543,14 +551,14 @@ msgstr "Neues Passwort"
msgid "Reset password"
msgstr "Passwort zurücksetzen"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!"
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden."
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 61ce5eaac60..91044ece8b3 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -423,41 +423,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Spezielle Eigenschaften"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Kontingent Feld"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Standard Kontingent"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "E-Mail Feld"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Interner Benutzername"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -473,15 +484,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Attribut für interne Benutzernamen:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "UUID-Erkennung überschreiben"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Du musst allerdings sicherstellen, dass deine gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lasse es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID-Attribute für Benutzer:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID-Attribute für Gruppen:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -518,10 +529,10 @@ msgid ""
"experimental stage."
msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Lösche LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Lösche LDAP-Gruppennamenzuordnung"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index 1134976fb22..9d060609c66 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: de_AT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,63 +135,63 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -230,32 +230,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -534,14 +542,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
index 1e86832a9e0..23ae3177db3 100644
--- a/l10n/de_AT/user_ldap.po
+++ b/l10n/de_AT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index bb41b4f03b5..dcd044d0b5c 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -27,24 +27,24 @@ msgstr ""
"Language: de_CH\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Wartungsmodus eingeschaltet"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Wartungsmodus ausgeschaltet"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Datenbank aktualisiert"
@@ -144,63 +144,63 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Speichern..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "Heute"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "Vor Jahren"
@@ -239,32 +239,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -543,14 +551,14 @@ msgstr "Neues Passwort"
msgid "Reset password"
msgstr "Passwort zurücksetzen"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index 14344bc7b1d..2ae224c6325 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -427,41 +427,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Spezielle Eigenschaften"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Kontingent-Feld"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Standard-Kontingent"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "E-Mail-Feld"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Interner Benutzername"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -477,15 +488,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Interne Eigenschaften des Benutzers:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "UUID-Erkennung überschreiben"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -496,19 +507,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -522,10 +533,10 @@ msgid ""
"experimental stage."
msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Lösche LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Lösche LDAP-Gruppennamenzuordnung"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 16a7061e933..c04fc90ee20 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-23 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 10:50+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,24 +28,24 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "Ablaufdatum liegt in der Vergangenheit."
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "An folgende Benutzer konnte keine E-Mail gesendet werden: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Wartungsmodus eingeschaltet "
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Wartungsmodus ausgeschaltet"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Datenbank aktualisiert"
@@ -145,63 +145,63 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Speichern..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "Heute"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "Vor Jahren"
@@ -240,32 +240,40 @@ msgid "One file conflict"
msgstr "Ein Dateikonflikt"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Welche Dateien möchten Sie behalten?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Fortsetzen"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(Alle ausgewählt)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} ausgewählt)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Fehler beim Laden der vorhanden Dateivorlage"
@@ -544,14 +552,14 @@ msgstr "Neues Passwort"
msgid "Reset password"
msgstr "Passwort zurücksetzen"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!"
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden."
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 721016886e3..07050c277c5 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -425,41 +425,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Spezielle Eigenschaften"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Kontingent-Feld"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Standard-Kontingent"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "E-Mail-Feld"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Interner Benutzername"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -475,15 +486,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Interne Eigenschaften des Benutzers:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "UUID-Erkennung überschreiben"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -494,19 +505,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID-Attribute für Benutzer:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID-Attribute für Gruppen:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -520,10 +531,10 @@ msgid ""
"experimental stage."
msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Lösche LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Lösche LDAP-Gruppennamenzuordnung"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 7f52a39aed6..e12cf5bd9ae 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-01 01:55-0400\n"
-"PO-Revision-Date: 2014-03-31 16:30+0000\n"
-"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -144,63 +144,63 @@ msgstr "Νοέμβριος"
msgid "December"
msgstr "Δεκέμβριος"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: js/js.js:543
+#: js/js.js:564
msgid "Saving..."
msgstr "Γίνεται αποθήκευση..."
-#: js/js.js:1103
+#: js/js.js:1124
msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
-#: js/js.js:1104
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n λεπτό πριν"
msgstr[1] "%n λεπτά πριν"
-#: js/js.js:1105
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ώρα πριν"
msgstr[1] "%n ώρες πριν"
-#: js/js.js:1106
+#: js/js.js:1127
msgid "today"
msgstr "σήμερα"
-#: js/js.js:1107
+#: js/js.js:1128
msgid "yesterday"
msgstr "χτες"
-#: js/js.js:1108
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ημέρα πριν"
msgstr[1] "%n ημέρες πριν"
-#: js/js.js:1109
+#: js/js.js:1130
msgid "last month"
msgstr "τελευταίο μήνα"
-#: js/js.js:1110
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n μήνας πριν"
msgstr[1] "%n μήνες πριν"
-#: js/js.js:1111
+#: js/js.js:1132
msgid "months ago"
msgstr "μήνες πριν"
-#: js/js.js:1112
+#: js/js.js:1133
msgid "last year"
msgstr "τελευταίο χρόνο"
-#: js/js.js:1113
+#: js/js.js:1134
msgid "years ago"
msgstr "χρόνια πριν"
@@ -239,32 +239,40 @@ msgid "One file conflict"
msgstr "Ένα αρχείο διαφέρει"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Ποια αρχεία θέλετε να κρατήσετε;"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Άκυρο"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Συνέχεια"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(όλα τα επιλεγμένα)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} επιλέχθησαν)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Σφάλμα κατά την φόρτωση του προτύπου ύπαρξης αρχείου"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index aeb2e200366..690afb7856d 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-01 01:55-0400\n"
-"PO-Revision-Date: 2014-03-31 17:11+0000\n"
-"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -422,41 +422,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Ειδικά Χαρακτηριστικά "
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Ποσοσταση πεδιου"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Προκαθισμενο πεδιο"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "σε bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Email τυπος"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας "
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Εσωτερικό Όνομα Χρήστη"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -472,15 +483,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Εξ ορισμού, το εσωτερικό όνομα χρήστη θα δημιουργηθεί από το χαρακτηριστικό UUID. Αυτό βεβαιώνει ότι το όνομα χρήστη είναι μοναδικό και δεν χρειάζεται μετατροπή χαρακτήρων. Το εσωτερικό όνομα χρήστη έχει τον περιορισμό ότι μόνο αυτοί οι χαρακτήρες επιτρέπονται: [ a-zA-Z0-9_.@- ]. Οι άλλοι χαρακτήρες αντικαθίστανται με τους αντίστοιχους ASCII ή απλά παραλείπονται. Στις συγκρούσεις ένας αριθμός θα προστεθεί / αυξηθεί. Το εσωτερικό όνομα χρήστη χρησιμοποιείται για την αναγνώριση ενός χρήστη εσωτερικά. Είναι επίσης το προεπιλεγμένο όνομα για τον αρχικό φάκελο χρήστη. Αποτελεί επίσης μέρος των απομακρυσμένων διευθύνσεων URL, για παράδειγμα για όλες τις υπηρεσίες *DAV. Με αυτή τη ρύθμιση, η προεπιλεγμένη συμπεριφορά μπορεί να παρακαμφθεί. Για να επιτευχθεί μια παρόμοια συμπεριφορά όπως πριν το ownCloud 5 εισάγετε το χαρακτηριστικό του προβαλλόμενου ονόματος χρήστη στο παρακάτω πεδίο. Αφήστε το κενό για την προεπιλεγμένη λειτουργία. Οι αλλαγές θα έχουν ισχύ μόνο σε νεώτερους (προστιθέμενους) χρήστες LDAP."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Ιδιότητα Εσωτερικού Ονόματος Χρήστη:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Παράκαμψη ανίχνευσης UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -491,19 +502,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Από προεπιλογή, το χαρακτηριστικό UUID εντοπίζεται αυτόματα. Το χαρακτηριστικό UUID χρησιμοποιείται για την αναγνώριση χωρίς αμφιβολία χρηστών και ομάδων LDAP. Επίσης, το εσωτερικό όνομα χρήστη θα δημιουργηθεί με βάση το UUID, εφόσον δεν ορίζεται διαφορετικά ανωτέρω. Μπορείτε να παρακάμψετε τη ρύθμιση και να ορίσετε ένα χαρακτηριστικό της επιλογής σας. Θα πρέπει να βεβαιωθείτε ότι το χαρακτηριστικό της επιλογής σας μπορεί να ληφθεί για τους χρήστες και τις ομάδες και ότι είναι μοναδικό. Αφήστε το κενό για την προεπιλεγμένη λειτουργία. Οι αλλαγές θα έχουν ισχύ μόνο σε πρόσφατα αντιστοιχισμένους (προστιθέμενους) χρήστες και ομάδες LDAP."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Χαρακτηριστικό UUID για Χρήστες:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Χαρακτηριστικό UUID για Ομάδες:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Αντιστοίχιση Χρηστών Όνομα Χρήστη-LDAP"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -517,10 +528,10 @@ msgid ""
"experimental stage."
msgstr "Τα ονόματα χρηστών χρησιμοποιούνται για την αποθήκευση και την ανάθεση (μετα) δεδομένων. Προκειμένου να προσδιοριστούν με ακρίβεια και να αναγνωρίστουν οι χρήστες, κάθε χρήστης LDAP θα έχει ένα εσωτερικό όνομα. Αυτό απαιτεί μια αντιστοίχιση του ονόματος χρήστη με το χρήστη LDAP. Το όνομα χρήστη που δημιουργήθηκε αντιστοιχίζεται στην UUID του χρήστη LDAP. Επιπροσθέτως, το DN αποθηκεύεται προσωρινά (cache) ώστε να μειωθεί η αλληλεπίδραση LDAP, αλλά δεν χρησιμοποιείται για την ταυτοποίηση. Αν το DN αλλάξει, οι αλλαγές θα βρεθούν. Το εσωτερικό όνομα χρήστη χρησιμοποιείται παντού. Η εκκαθάριση των αντιστοιχίσεων θα αφήσει κατάλοιπα παντού. Η εκκαθάριση των αντιστοιχίσεων δεν επηρεάζεται από τη διαμόρφωση, επηρεάζει όλες τις διαμορφώσεις LDAP! Μην διαγράψετε ποτέ τις αντιστοιχίσεις σε ένα λειτουργικό περιβάλλον παρά μόνο σε δοκιμές ή σε πειραματικό στάδιο."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Διαγραφή αντιστοίχησης Ονόματος Χρήστη LDAP-Χρήστη"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Διαγραφή αντιστοίχησης Ονόματος Ομάδας-LDAP Ομάδας"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 90ddc87e52a..ccdc20247b6 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,63 +135,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -230,32 +230,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -534,14 +542,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index e236d0b96dc..dc0cd36afee 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index b6c1fd256b2..1dd7f065f01 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-24 01:55-0400\n"
-"PO-Revision-Date: 2014-03-23 15:01+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "Expiration date is in the past."
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Couldn't send mail to following users: %s "
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Turned on maintenance mode"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Turned off maintenance mode"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Updated database"
@@ -135,63 +135,63 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Settings"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Saving..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "seconds ago"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute ago"
msgstr[1] "%n minutes ago"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hour ago"
msgstr[1] "%n hours ago"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "today"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "yesterday"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n day ago"
msgstr[1] "%n days ago"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "last month"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n month ago"
msgstr[1] "%n months ago"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "months ago"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "last year"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "years ago"
@@ -230,32 +230,40 @@ msgid "One file conflict"
msgstr "One file conflict"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Which files do you wish to keep?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "If you select both versions, the copied file will have a number added to its name."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Cancel"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Continue"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(all selected)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} selected)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Error loading file exists template"
@@ -534,14 +542,14 @@ msgstr "New password"
msgid "Reset password"
msgstr "Reset password"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! "
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr "For the best results, please consider using a GNU/Linux server instead."
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index 334316ca9ef..40e5e22c87e 100644
--- a/l10n/en_GB/user_ldap.po
+++ b/l10n/en_GB/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -420,41 +420,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Special Attributes"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Quota Field"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Quota Default"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "in bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Email Field"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "User Home Folder Naming Rule"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Internal Username"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -470,15 +481,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Internal Username Attribute:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Override UUID detection"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "By default, the UUID attribute is automatically detected. The UUID attribute is used to unambiguously identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID Attribute for Users:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID Attribute for Groups:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Username-LDAP User Mapping"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -515,10 +526,10 @@ msgid ""
"experimental stage."
msgstr "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Clear Username-LDAP User Mapping"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Clear Groupname-LDAP Group Mapping"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index c6fd33cd860..c82b3cafbeb 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Ĝisdatiĝis datumbazo"
@@ -136,63 +136,63 @@ msgstr "Novembro"
msgid "December"
msgstr "Decembro"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Agordo"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Konservante..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "sekundoj antaŭe"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "antaŭ %n minuto"
msgstr[1] "antaŭ %n minutoj"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "antaŭ %n horo"
msgstr[1] "antaŭ %n horoj"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "hodiaŭ"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "hieraŭ"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "antaŭ %n tago"
msgstr[1] "antaŭ %n tagoj"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "lastamonate"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "antaŭ %n monato"
msgstr[1] "antaŭ %n monatoj"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "monatoj antaŭe"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "lastajare"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "jaroj antaŭe"
@@ -231,32 +231,40 @@ msgid "One file conflict"
msgstr "Unu dosierkonflikto"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Kiujn dosierojn vi volas konservi?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Nuligi"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(ĉiuj elektitas)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} elektitas)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -535,14 +543,14 @@ msgstr "Nova pasvorto"
msgid "Reset password"
msgstr "Rekomenci la pasvorton"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 1f0d5fdcec3..83e2dc3b628 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -420,41 +420,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Specialaj atribuoj"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Kampo de kvoto"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "duumoke"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Kampo de retpoŝto"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Ena uzantonomo"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -470,15 +481,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Atribuo de ena uzantonomo:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID-atribuo por uzantoj:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID-atribuo por grupoj:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -515,10 +526,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 758f1024ad2..808e4ef74ff 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-29 01:55-0400\n"
-"PO-Revision-Date: 2014-03-28 06:06+0000\n"
-"Last-Translator: victormce <victormce@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -148,63 +148,63 @@ msgstr "Noviembre"
msgid "December"
msgstr "Diciembre"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:543
+#: js/js.js:564
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:1103
+#: js/js.js:1124
msgid "seconds ago"
msgstr "segundos antes"
-#: js/js.js:1104
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "Hace %n minutos"
-#: js/js.js:1105
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "Hace %n horas"
-#: js/js.js:1106
+#: js/js.js:1127
msgid "today"
msgstr "hoy"
-#: js/js.js:1107
+#: js/js.js:1128
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1108
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n día"
msgstr[1] "Hace %n días"
-#: js/js.js:1109
+#: js/js.js:1130
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:1110
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "Hace %n meses"
-#: js/js.js:1111
+#: js/js.js:1132
msgid "months ago"
msgstr "meses antes"
-#: js/js.js:1112
+#: js/js.js:1133
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:1113
+#: js/js.js:1134
msgid "years ago"
msgstr "años antes"
@@ -243,32 +243,40 @@ msgid "One file conflict"
msgstr "On conflicto de archivo"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "¿Que archivos deseas mantener?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(seleccionados todos)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Error cargando plantilla de archivo existente"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 81a43116f95..836a65c92ac 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: Jose Luis Tirado <joseluis.tirado@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -428,41 +428,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Cuando se active, se permitirán grupos que contenga otros grupos (solo funciona si el atributo de miembro de grupo contiene DNs)."
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Atributos especiales"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Cuota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Cuota por defecto"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "E-mail"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Regla para la carpeta Home de usuario"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Nombre de usuario interno"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -478,15 +489,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Atributo Nombre de usuario Interno:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Sobrescribir la detección UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -497,19 +508,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Atributo UUID para usuarios:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Atributo UUID para Grupos:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Asignación del Nombre de usuario de un usuario LDAP"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -523,10 +534,10 @@ msgid ""
"experimental stage."
msgstr "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 3250550af81..422d04ec0d9 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "No se pudieron mandar correos a los siguientes usuarios: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Modo de mantenimiento activado"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Modo de mantenimiento desactivado"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Base de datos actualizada"
@@ -136,63 +136,63 @@ msgstr "noviembre"
msgid "December"
msgstr "diciembre"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Configuración"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "Hace %n minutos"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "Hace %n horas"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "hoy"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n día"
msgstr[1] "Hace %n días"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "Hace %n meses"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "años atrás"
@@ -231,32 +231,40 @@ msgid "One file conflict"
msgstr "Un archivo en conflicto"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "¿Qué archivos deseas retener?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(todos están seleccionados)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Error cargando la plantilla de archivo existente"
@@ -535,14 +543,14 @@ msgstr "Nueva contraseña:"
msgid "Reset password"
msgstr "Restablecer contraseña"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index bbccd0908e1..797a098e3a8 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Atributos Especiales"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Campo de cuota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Cuota por defecto"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Campo de e-mail"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Regla de nombre de los directorios de usuario"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Nombre interno de usuario"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados)."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Atributo Nombre Interno de usuario:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Sobrescribir la detección UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados)."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Atributo UUID para usuarios:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Atributo UUID para grupos:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Asignación del Nombre de usuario de un usuario LDAP"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
diff --git a/l10n/es_CL/core.po b/l10n/es_CL/core.po
index e028df6bb61..911131ea81b 100644
--- a/l10n/es_CL/core.po
+++ b/l10n/es_CL/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: es_CL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,63 +135,63 @@ msgstr "Noviembre"
msgid "December"
msgstr "Diciembre"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Configuración"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "segundos antes"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "hoy"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "mes anterior"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "meses antes"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "último año"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "años anteriores"
@@ -230,32 +230,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -534,14 +542,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/es_CL/user_ldap.po b/l10n/es_CL/user_ldap.po
index 5a138f0da1b..f1d3cad48fb 100644
--- a/l10n/es_CL/user_ldap.po
+++ b/l10n/es_CL/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
index 7486794d9d7..10a4321b52f 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "No se pudo enviar el mensaje a los siguientes usuarios: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Modo mantenimiento activado"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Modo mantenimiento desactivado"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Base de datos actualizada"
@@ -134,63 +134,63 @@ msgstr "Noviembre"
msgid "December"
msgstr "Diciembre"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "segundos antes"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "Hace %n minutos"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "Hace %n horas"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "hoy"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n día"
msgstr[1] "Hace %n días"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "Hace %n meses"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "meses antes"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "años antes"
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr "Un conflicto de archivo"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "¿Que archivos deseas mantener?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(todos seleccionados)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Error cargando plantilla de archivo existente"
@@ -533,14 +541,14 @@ msgstr "Nueva contraseña"
msgid "Reset password"
msgstr "Restablecer contraseña"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po
index 78711d7f98b..7687611cb1c 100644
--- a/l10n/es_MX/user_ldap.po
+++ b/l10n/es_MX/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Atributos especiales"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Cuota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Cuota por defecto"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "E-mail"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Regla para la carpeta Home de usuario"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Nombre de usuario interno"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Atributo Nombre de usuario Interno:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Sobrescribir la detección UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Atributo UUID para usuarios:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Atributo UUID para Grupos:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Asignación del Nombre de usuario de un usuario LDAP"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index cad1b261fb2..f006da74b91 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-02 01:55-0400\n"
-"PO-Revision-Date: 2014-04-01 07:30+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -136,63 +136,63 @@ msgstr "November"
msgid "December"
msgstr "Detsember"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Seaded"
-#: js/js.js:543
+#: js/js.js:564
msgid "Saving..."
msgstr "Salvestamine..."
-#: js/js.js:1103
+#: js/js.js:1124
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: js/js.js:1104
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut tagasi"
msgstr[1] "%n minutit tagasi"
-#: js/js.js:1105
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tund tagasi"
msgstr[1] "%n tundi tagasi"
-#: js/js.js:1106
+#: js/js.js:1127
msgid "today"
msgstr "täna"
-#: js/js.js:1107
+#: js/js.js:1128
msgid "yesterday"
msgstr "eile"
-#: js/js.js:1108
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n päev tagasi"
msgstr[1] "%n päeva tagasi"
-#: js/js.js:1109
+#: js/js.js:1130
msgid "last month"
msgstr "viimasel kuul"
-#: js/js.js:1110
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuu tagasi"
msgstr[1] "%n kuud tagasi"
-#: js/js.js:1111
+#: js/js.js:1132
msgid "months ago"
msgstr "kuu tagasi"
-#: js/js.js:1112
+#: js/js.js:1133
msgid "last year"
msgstr "viimasel aastal"
-#: js/js.js:1113
+#: js/js.js:1134
msgid "years ago"
msgstr "aastat tagasi"
@@ -231,32 +231,40 @@ msgid "One file conflict"
msgstr "Üks failikonflikt"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Milliseid faile sa soovid alles hoida?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Loobu"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Jätka"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(kõik valitud)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} valitud)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Viga faili olemasolu malli laadimisel"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 5997b64962b..7e81ca1b008 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-04 01:55-0400\n"
-"PO-Revision-Date: 2014-04-04 05:30+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 15:10+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -85,7 +85,7 @@ msgstr "Valikud"
#: templates/settings.php:12
msgid "Available for"
-msgstr ""
+msgstr "Saadaval"
#: templates/settings.php:32
msgid "Add storage"
@@ -93,7 +93,7 @@ msgstr "Lisa andmehoidla"
#: templates/settings.php:92
msgid "No user or group"
-msgstr ""
+msgstr "Ühtki kasutajat või gruppi"
#: templates/settings.php:95
msgid "All Users"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index f5726070dde..01175efd2a3 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-02 01:55-0400\n"
-"PO-Revision-Date: 2014-04-01 07:05+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Sisse lülitamisel on toetatakse gruppe sisaldavad gruppe. (Toimib, kui grupi liikme atribuut sisaldab DN-e.)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Spetsiifilised atribuudid"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Mahupiirangu atribuut"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Vaikimisi mahupiirang"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "baitides"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "E-posti väli"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Kasutaja kodukataloogi nimetamise reegel"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Sisemine kasutajanimi"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URLi osaks, näiteks kõikidel *DAV teenustel. Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Sisemise kasutajatunnuse atribuut:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Tühista UUID tuvastus"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID atribuut kasutajatele:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID atribuut gruppidele:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "LDAP-Kasutajatunnus Kasutaja Vastendus"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Puhasta LDAP-Grupinimi Grupp Vastendus"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index caf5ea80714..aa87563e834 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Ezin izan da posta bidali hurrengo erabiltzaileei: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Mantenu modua gaitu da"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Mantenu modua desgaitu da"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Datu basea eguneratu da"
@@ -136,63 +136,63 @@ msgstr "Azaroa"
msgid "December"
msgstr "Abendua"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Ezarpenak"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Gordetzen..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "segundu"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "orain dela minutu %n"
msgstr[1] "orain dela %n minutu"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "orain dela ordu %n"
msgstr[1] "orain dela %n ordu"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "gaur"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "atzo"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "orain dela egun %n"
msgstr[1] "orain dela %n egun"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "joan den hilabetean"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "orain dela hilabete %n"
msgstr[1] "orain dela %n hilabete"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "hilabete"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "joan den urtean"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "urte"
@@ -231,32 +231,40 @@ msgid "One file conflict"
msgstr "Fitxategi batek konfliktua sortu du"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Ze fitxategi mantendu nahi duzu?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Ezeztatu"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Jarraitu"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(denak hautatuta)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} hautatuta)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Errorea fitxategia existitzen da txantiloiak kargatzerakoan"
@@ -535,14 +543,14 @@ msgstr "Pasahitz berria"
msgid "Reset password"
msgstr "Berrezarri pasahitza"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 502322ad159..2b4fbff486d 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -420,41 +420,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Atributu Bereziak"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Kuota Eremua"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Kuota Lehenetsia"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "bytetan"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Eposta eremua"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Barneko erabiltzaile izena"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -470,15 +481,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Baliogabeko Erabiltzaile Izen atributua"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Gainidatzi UUID antzematea"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Erabiltzaileentzako UUID atributuak:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Taldeentzako UUID atributuak:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -515,10 +526,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index d2c3ce4ab95..767e8da8b59 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: eu_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Ezeztatu"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po
index bbc3027bfca..8e28c9a6557 100644
--- a/l10n/eu_ES/user_ldap.po
+++ b/l10n/eu_ES/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index f16b1d2870f..119af666fc7 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,59 +135,59 @@ msgstr "نوامبر"
msgid "December"
msgstr "دسامبر"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "تنظیمات"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "در حال ذخیره سازی..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "ثانیه‌ها پیش"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "امروز"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "دیروز"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "ماه قبل"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "ماه‌های قبل"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "سال قبل"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "سال‌های قبل"
@@ -225,32 +225,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "منصرف شدن"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -529,14 +537,14 @@ msgstr "گذرواژه جدید"
msgid "Reset password"
msgstr "دوباره سازی گذرواژه"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 978827d9d51..1a904629e87 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -418,41 +418,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "ویژگی های مخصوص"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "سهمیه بندی انجام نشد."
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "سهمیه بندی پیش فرض"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "در بایت"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "ایمیل ارسال نشد."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "قانون نامگذاری پوشه خانه کاربر"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "خالی گذاشتن برای نام کاربری (پیش فرض). در غیر این صورت، تعیین یک ویژگی LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "نام کاربری داخلی"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -468,15 +479,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "ویژگی نام کاربری داخلی:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "نادیده گرفتن تشخیص UUID "
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -487,19 +498,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "نام کاربری - نگاشت کاربر LDAP "
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -513,10 +524,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "پاک کردن نام کاربری- LDAP نگاشت کاربر "
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "پاک کردن نام گروه -LDAP گروه نقشه برداری"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 5a164229847..267d952cacc 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -20,24 +20,24 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "Päättymispäivä on menneisyydessä."
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Siirrytty ylläpitotilaan"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Ylläpitotila laitettu pois päältä"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Tietokanta ajan tasalla"
@@ -137,63 +137,63 @@ msgstr "marraskuu"
msgid "December"
msgstr "joulukuu"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Asetukset"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Tallennetaan..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuutti sitten"
msgstr[1] "%n minuuttia sitten"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tunti sitten"
msgstr[1] "%n tuntia sitten"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "tänään"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "eilen"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n päivä sitten"
msgstr[1] "%n päivää sitten"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "viime kuussa"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuukausi sitten"
msgstr[1] "%n kuukautta sitten"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "kuukautta sitten"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "viime vuonna"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "vuotta sitten"
@@ -232,32 +232,40 @@ msgid "One file conflict"
msgstr "Yhden tiedoston ristiriita"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Mitkä tiedostot haluat säilyttää?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Peru"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Jatka"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(kaikki valittu)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} valittu)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Virhe ladatessa mallipohjaa"
@@ -536,14 +544,14 @@ msgstr "Uusi salasana"
msgid "Reset password"
msgstr "Palauta salasana"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 83464ec1114..4bd3ca6c6ae 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "tavuissa"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Sähköpostikenttä"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 874c40d0d41..196546196fe 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
-"PO-Revision-Date: 2014-04-06 19:40+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -237,32 +237,40 @@ msgid "One file conflict"
msgstr "Un conflit de fichier"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Quels fichiers désirez-vous garder ?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Annuler"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Poursuivre"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(tous sélectionnés)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} sélectionnés)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Erreur de chargement du modèle de fichier existant"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 09a7f945aba..cde39796c94 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -422,41 +422,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Si activé, les groupes contenant d'autres groupes sont supportés (fonctionne uniquement si l'attribut membre du groupe contient des DNs)."
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Attributs spéciaux"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Champ du quota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Quota par défaut"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Champ Email"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Convention de nommage du répertoire utilisateur"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Laisser vide "
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Nom d'utilisateur interne"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -472,15 +483,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Nom d'utilisateur interne:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Surcharger la détection d'UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -491,19 +502,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Par défaut, l'attribut UUID est automatiquement détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Attribut UUID pour les utilisateurs :"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Attribut UUID pour les groupes :"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Association Nom d'utilisateur-Utilisateur LDAP"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -517,10 +528,10 @@ msgid ""
"experimental stage."
msgstr "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Supprimer l'association utilisateur interne-utilisateur LDAP"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Supprimer l'association nom de groupe-groupe LDAP"
diff --git a/l10n/fr_CA/core.po b/l10n/fr_CA/core.po
index a2dc9cb6682..cc4a62b68dd 100644
--- a/l10n/fr_CA/core.po
+++ b/l10n/fr_CA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: fr_CA\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/fr_CA/user_ldap.po b/l10n/fr_CA/user_ldap.po
index e513ed6934f..193204b8c23 100644
--- a/l10n/fr_CA/user_ldap.po
+++ b/l10n/fr_CA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 7839bd4996c..80e4b68f99a 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-23 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 10:00+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "A data de caducidade está no pasado."
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Non é posíbel enviar correo aos usuarios seguintes: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Modo de mantemento activado"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Modo de mantemento desactivado"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Base de datos actualizada"
@@ -136,63 +136,63 @@ msgstr "novembro"
msgid "December"
msgstr "decembro"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Axustes"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Gardando..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "hai %n minuto"
msgstr[1] "hai %n minutos"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "hai %n hora"
msgstr[1] "hai %n horas"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "hoxe"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "onte"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "hai %n día"
msgstr[1] "hai %n días"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "último mes"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "hai %n mes"
msgstr[1] "hai %n meses"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "último ano"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "anos atrás"
@@ -231,32 +231,40 @@ msgid "One file conflict"
msgstr "Un conflito de ficheiro"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Que ficheiros quere conservar?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(todo o seleccionado)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Produciuse un erro ao cargar o modelo de ficheiro existente"
@@ -535,14 +543,14 @@ msgstr "Novo contrasinal"
msgid "Reset password"
msgstr "Restabelecer o contrasinal"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!"
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto."
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 2070e8c7153..f91b4635d8c 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Se está activado, admítense grupos que conteñen grupos. (Só funciona se o atributo de membro de grupo conten os DN.)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Atributos especiais"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Campo de cota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Cota predeterminada"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Campo do correo"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Regra de nomeado do cartafol do usuario"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Nome de usuario interno"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ]. Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario. Tamén é parte dun URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Atributo do nome de usuario interno:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Ignorar a detección do UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "De xeito predeterminado, o atributo UUID é detectado automaticamente. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Atributo do UUID para usuarios:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Atributo do UUID para grupos:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Asignación do usuario ao «nome de usuario LDAP»"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr "Os nomes de usuario empreganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Limpar a asignación do usuario ao «nome de usuario LDAP»"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Limpar a asignación do grupo ao «nome de grupo LDAP»"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 41af2ccd477..198d901917a 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -136,63 +136,63 @@ msgstr "נובמבר"
msgid "December"
msgstr "דצמבר"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "הגדרות"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "שמירה…"
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "שניות"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "לפני %n דקה"
msgstr[1] "לפני %n דקות"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "לפני %n שעה"
msgstr[1] "לפני %n שעות"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "היום"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "אתמול"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "לפני %n יום"
msgstr[1] "לפני %n ימים"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "חודש שעבר"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "לפני %n חודש"
msgstr[1] "לפני %n חודשים"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "חודשים"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "שנה שעברה"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "שנים"
@@ -231,32 +231,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "ביטול"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -535,14 +543,14 @@ msgstr "ססמה חדשה"
msgid "Reset password"
msgstr "איפוס ססמה"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 5a7b24997c7..761cc4181c9 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -420,41 +420,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "בבתים"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -470,15 +481,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -515,10 +526,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index ed9d8a2cc5f..465201029d5 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -136,63 +136,63 @@ msgstr "नवंबर"
msgid "December"
msgstr "दिसम्बर"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "सेटिंग्स"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -231,32 +231,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -535,14 +543,14 @@ msgstr "नया पासवर्ड"
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 1c1bdbf62bb..904a9c1fab6 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index cc5099c80a1..be6045fb23b 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,67 +134,67 @@ msgstr "Studeni"
msgid "December"
msgstr "Prosinac"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Postavke"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Spremanje..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "sekundi prije"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "danas"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "jučer"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "prošli mjesec"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "mjeseci"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "prošlu godinu"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "godina"
@@ -234,32 +234,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Odustani"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -538,14 +546,14 @@ msgstr "Nova lozinka"
msgid "Reset password"
msgstr "Poništavanje lozinke"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 0d0c691cf7a..110b3e10c6c 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 954685a0322..42057bd33af 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -20,24 +20,24 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "A karbantartási mód bekapcsolva"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "A karbantartási mód kikapcsolva"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Frissítet adatbázis"
@@ -137,63 +137,63 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Beállítások"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Mentés..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "pár másodperce"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n perccel ezelőtt"
msgstr[1] "%n perccel ezelőtt"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n órával ezelőtt"
msgstr[1] "%n órával ezelőtt"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "ma"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "tegnap"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n nappal ezelőtt"
msgstr[1] "%n nappal ezelőtt"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "múlt hónapban"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n hónappal ezelőtt"
msgstr[1] "%n hónappal ezelőtt"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "több hónapja"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "tavaly"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "több éve"
@@ -232,32 +232,40 @@ msgid "One file conflict"
msgstr "Egy file ütközik"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Melyik file-okat akarod megtartani?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Mégsem"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Folytatás"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(all selected)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} kiválasztva)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Hiba a létező sablon betöltésekor"
@@ -536,14 +544,14 @@ msgstr "Az új jelszó"
msgid "Reset password"
msgstr "Jelszó-visszaállítás"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 37aa013a6f8..47568fd0f88 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Különleges attribútumok"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Kvóta mező"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Alapértelmezett kvóta"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "bájtban"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Email mező"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "A home könyvtár elérési útvonala"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!"
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Belső felhasználónév"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Alapértelmezetten a belső felhasználónév az UUID tulajdonságból jön létre. Ez biztosítja a felhasználónév egyediségét és hogy a nem kell konvertálni a karaktereket benne. A belső felhasználónévnél a megkötés az, hogy csak a következő karakterek engdélyezettek benne: [ a-zA-Z0-9_.@- ]. Ezeken a karaktereken kivül minden karakter le lesz cserélve az adott karakter ASCII kódtáblában használható párjára vagy ha ilyen nincs akkor egyszerűen ki lesz hagyva. Ha így mégis ütköznének a nevek akkor hozzá lesz füzve egy folyamatosan növekvő számláló rész. A belső felhasználónevet lehet használni a felhasználó azonosítására a programon belül. Illetve ez lesz az alapáértelmezett neve a felhasználó kezdő könyvtárának az ownCloud-ban. Illetve..............................."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "A belső felhasználónév attribútuma:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Az UUID-felismerés felülbírálása"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Az UUID attribútum alapértelmezetten felismerésre kerül. Az UUID attribútum segítségével az LDAP felhasználók és csoportok egyértelműen azonosíthatók. A belső felhasználónév is azonos lesz az UUID-vel, ha fentebb nincs másként definiálva. Ezt a beállítást felülbírálhatja és bármely attribútummal helyettesítheti. Ekkor azonban gondoskodnia kell arról, hogy a kiválasztott attribútum minden felhasználó és csoport esetén lekérdezhető és egyedi értékkel bír. Ha a mezőt üresen hagyja, akkor az alapértelmezett attribútum lesz érvényes. Egy esetleges módosítás csak az újonnan hozzárendelt (ill. létrehozott) felhasználókra és csoportokra lesz érvényes."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "A felhasználók UUID attribútuma:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "A csoportok UUID attribútuma:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Felhasználó - LDAP felhasználó hozzárendelés"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr "A felhasználónevek segítségével történik a (meta)adatok tárolása és hozzárendelése. A felhasználók pontos azonosítása céljából minden LDAP felhasználóhoz egy belső felhasználónevet rendelünk. Ezt a felhasználónevet az LDAP felhasználó UUID attribútumához rendeljük hozzá. Ezen túlmenően a DN is tárolásra kerül a gyorsítótárban, hogy csökkentsük az LDAP lekérdezések számát, de a DN-t nem használjuk azonosításra. Ha a DN megváltozik, akkor a rendszer ezt észleli. A belső felhasználóneveket a rendszer igen sok helyen használja, ezért a hozzárendelések törlése sok érvénytelen adatrekordot eredményez az adatbázisban. A hozzárendelések törlése nem függ a konfigurációtól, minden LDAP konfigurációt érint! Ténylegesen működő szolgáltatás esetén sose törölje a hozzárendeléseket, csak tesztelési vagy kísérleti célú szerveren!"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "A felhasználó - LDAP felhasználó hozzárendelés törlése"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "A csoport - LDAP csoport hozzárendelés törlése"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index eee6695972a..92b8b8c3854 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr "Նոյեմբեր"
msgid "December"
msgstr "Դեկտեմբեր"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 1acfafd169e..21b936379d0 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 8f19872d14e..b2feb59e742 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr "Novembre"
msgid "December"
msgstr "Decembre"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Configurationes"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Cancellar"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr "Nove contrasigno"
msgid "Reset password"
msgstr "Reinitialisar contrasigno"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 8cf13b0b0d6..6109e27e981 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 40cd13bd6d0..27d4c0d4a70 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Tidak dapat mengirim Email ke pengguna berikut: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Hidupkan mode perawatan"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Matikan mode perawatan"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Basis data terbaru"
@@ -134,59 +134,59 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Pengaturan"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Menyimpan..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n menit yang lalu"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n jam yang lalu"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "hari ini"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "kemarin"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n hari yang lalu"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "bulan kemarin"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n bulan yang lalu"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "beberapa bulan lalu"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "tahun kemarin"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "beberapa tahun lalu"
@@ -224,32 +224,40 @@ msgid "One file conflict"
msgstr "Satu berkas konflik"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Berkas mana yang ingin anda pertahankan?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jika anda memilih kedua versi, berkas yang disalin akan memiliki nomor yang ditambahkan sesuai namanya."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Lanjutkan"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(semua terpilih)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} terpilih)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Galat memuat templat berkas yang sudah ada"
@@ -528,14 +536,14 @@ msgstr "Sandi baru"
msgid "Reset password"
msgstr "Atur ulang sandi"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index fcf502a7a8d..8317de9115d 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Atribut Khusus"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Bidang Kuota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Kuota Baku"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "dalam bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Bidang Email"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Aturan Penamaan Folder Home Pengguna"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 42cbfba8d34..92864f101c9 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,63 +135,63 @@ msgstr "Nóvember"
msgid "December"
msgstr "Desember"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Stillingar"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Er að vista ..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "sek."
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "í dag"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "í gær"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "síðasta mánuði"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "mánuðir síðan"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "síðasta ári"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "einhverjum árum"
@@ -230,32 +230,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Hætta við"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -534,14 +542,14 @@ msgstr "Nýtt lykilorð"
msgid "Reset password"
msgstr "Endursetja lykilorð"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index df6247cd5d8..71cca1d2e03 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -420,41 +420,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -470,15 +481,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -515,10 +526,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index a58e08ae696..2643e15d352 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-23 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 09:00+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,24 +21,24 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "La data di scadenza è nel passato."
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Impossibile inviare email ai seguenti utenti: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Modalità di manutenzione attivata"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Modalità di manutenzione disattivata"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Database aggiornato"
@@ -138,63 +138,63 @@ msgstr "Novembre"
msgid "December"
msgstr "Dicembre"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Impostazioni"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Salvataggio in corso..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "secondi fa"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuto fa"
msgstr[1] "%n minuti fa"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ora fa"
msgstr[1] "%n ore fa"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "oggi"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n giorno fa"
msgstr[1] "%n giorni fa"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "mese scorso"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n mese fa"
msgstr[1] "%n mesi fa"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "mesi fa"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "anno scorso"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "anni fa"
@@ -233,32 +233,40 @@ msgid "One file conflict"
msgstr "Un file in conflitto"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Quali file vuoi mantenere?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Annulla"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Continua"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(tutti i selezionati)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} selezionati)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Errore durante il caricamento del modello del file esistente"
@@ -537,14 +545,14 @@ msgstr "Nuova password"
msgid "Reset password"
msgstr "Ripristina la password"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!"
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux."
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index da54354cf9c..58546f1fb70 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Quando è attivato, i gruppi che contengono altri gruppi sono supportati. (Funziona solo se l'attributo del gruppo membro contiene DN.)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Attributi speciali"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Campo Quota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Quota predefinita"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "in byte"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Campo Email"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Regola di assegnazione del nome della cartella utente"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Nome utente interno"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri: [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà aggiunto/incrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una parte di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti)."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Attributo nome utente interno:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Ignora rilevamento UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti)."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Attributo UUID per gli utenti:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Attributo UUID per i gruppi:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Associazione Nome utente-Utente LDAP"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno è utilizzato dappertutto. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Cancella associazione Nome utente-Utente LDAP"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Cancella associazione Nome gruppo-Gruppo LDAP"
diff --git a/l10n/ja/core.po b/l10n/ja/core.po
index da079b0afbe..8caab377b9e 100644
--- a/l10n/ja/core.po
+++ b/l10n/ja/core.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-06 01:55-0400\n"
-"PO-Revision-Date: 2014-04-05 09:40+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -230,32 +230,40 @@ msgid "One file conflict"
msgstr "1ファイルが競合"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "どちらのファイルを保持したいですか?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "キャンセル"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "続ける"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(全て選択)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} 選択)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "既存ファイルのテンプレートの読み込みエラー"
diff --git a/l10n/ja/user_ldap.po b/l10n/ja/user_ldap.po
index e670589dd74..3a893d0ed2c 100644
--- a/l10n/ja/user_ldap.po
+++ b/l10n/ja/user_ldap.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "オンに切り替えたら、グループを含むグループがサポートされます。(グループメンバーの属性がDNを含む場合のみ有効です。)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "特殊属性"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "クォータフィールド"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "クォータのデフォルト"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "バイト"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "メールフィールド"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "ユーザーのホームフォルダー命名規則"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "ユーザー名を空のままにしてください(デフォルト)。もしくは、LDAPもしくはADの属性を指定してください。"
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "内部ユーザー名"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "デフォルトでは、内部ユーザー名はUUID属性から作成されます。これにより、ユーザー名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザー名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザー名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダー名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザー表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング(追加)されたLDAPユーザーにおいてのみ有効となります。"
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "内部ユーザー名属性:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "UUID検出を再定義する"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザーとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザー名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザーとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング(追加)されたLDAPユーザーとLDAPグループに対してのみ有効となります。"
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "ユーザーの UUID 属性:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "グループの UUID 属性:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "ユーザー名とLDAPユーザのマッピング"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr "ユーザー名は(メタ)データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます!本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "ユーザー名とLDAPユーザーのマッピングをクリアする"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "グループ名とLDAPグループのマッピングをクリアする"
diff --git a/l10n/jv/core.po b/l10n/jv/core.po
new file mode 100644
index 00000000000..17dbc1170a8
--- /dev/null
+++ b/l10n/jv/core.po
@@ -0,0 +1,809 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:119 ajax/share.php:161
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:36
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:39
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:40
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:41
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:42
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:47
+msgid "January"
+msgstr ""
+
+#: js/config.php:48
+msgid "February"
+msgstr ""
+
+#: js/config.php:49
+msgid "March"
+msgstr ""
+
+#: js/config.php:50
+msgid "April"
+msgstr ""
+
+#: js/config.php:51
+msgid "May"
+msgstr ""
+
+#: js/config.php:52
+msgid "June"
+msgstr ""
+
+#: js/config.php:53
+msgid "July"
+msgstr ""
+
+#: js/config.php:54
+msgid "August"
+msgstr ""
+
+#: js/config.php:55
+msgid "September"
+msgstr ""
+
+#: js/config.php:56
+msgid "October"
+msgstr ""
+
+#: js/config.php:57
+msgid "November"
+msgstr ""
+
+#: js/config.php:58
+msgid "December"
+msgstr ""
+
+#: js/js.js:479
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:564
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1124
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1125
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1126
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1127
+msgid "today"
+msgstr ""
+
+#: js/js.js:1128
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1129
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1130
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1131
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1132
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:1133
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1134
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:379
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:389
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:460
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:767
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:171
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:178
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:188
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:190
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:214
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:220
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:223
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: js/share.js:230
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:234
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:235
+msgid "Send"
+msgstr ""
+
+#: js/share.js:240
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:241
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:277
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:280
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:324 js/share.js:363
+msgid "group"
+msgstr ""
+
+#: js/share.js:335
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:379
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:401
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:409
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:412
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:414
+msgid "access control"
+msgstr ""
+
+#: js/share.js:417
+msgid "create"
+msgstr ""
+
+#: js/share.js:420
+msgid "update"
+msgstr ""
+
+#: js/share.js:423
+msgid "delete"
+msgstr ""
+
+#: js/share.js:426
+msgid "share"
+msgstr ""
+
+#: js/share.js:698
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:711
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:729
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:754
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:765
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:789
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:8
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:17
+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 ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:7
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation. "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/jv/files.po b/l10n/jv/files.po
new file mode 100644
index 00000000000..010013ec49a
--- /dev/null
+++ b/l10n/jv/files.po
@@ -0,0 +1,408 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 17:00+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:98
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:107
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:159
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:169
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:184
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:385
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:477
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:542
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:546
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
+
+#: js/file-upload.js:548 js/filelist.js:603
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:600
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:613
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:653
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:164
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:177
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:238
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:267 js/filelist.js:1113
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:630
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:789
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:814 js/filelist.js:891 js/files.js:589
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:815 js/filelist.js:892 js/files.js:595
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:822
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:1052 js/filelist.js:1090
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:121
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:134
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:138
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:142
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:331
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:570 templates/index.php:67
+msgid "Name"
+msgstr ""
+
+#: js/files.js:571 templates/index.php:79
+msgid "Size"
+msgstr ""
+
+#: js/files.js:572 templates/index.php:81
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved."
+msgstr ""
+
+#: lib/app.php:93
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:14 templates/index.php:22
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:5
+msgid "New"
+msgstr ""
+
+#: templates/index.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/index.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:45
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:51
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/index.php:56
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:73
+msgid "Download"
+msgstr "Njipuk"
+
+#: templates/index.php:84 templates/index.php:85
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:96
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:98
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:103
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:106
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/jv/files_encryption.po b/l10n/jv/files_encryption.po
new file mode 100644
index 00000000000..8d6649ddda9
--- /dev/null
+++ b/l10n/jv/files_encryption.po
@@ -0,0 +1,201 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:295
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/jv/files_external.po b/l10n/jv/files_external.po
new file mode 100644
index 00000000000..180822df4a2
--- /dev/null
+++ b/l10n/jv/files_external.po
@@ -0,0 +1,127 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:654
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:658
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:661
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/jv/files_sharing.po b/l10n/jv/files_sharing.po
new file mode 100644
index 00000000000..9fedbf7af1e
--- /dev/null
+++ b/l10n/jv/files_sharing.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/share.js:33
+msgid "Shared by {owner}"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:17
+#, php-format
+msgid "shared by %s"
+msgstr ""
+
+#: templates/public.php:44
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:48
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/jv/files_trashbin.po b/l10n/jv/files_trashbin.po
new file mode 100644
index 00000000000..be9965732a8
--- /dev/null
+++ b/l10n/jv/files_trashbin.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/filelist.js:3
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:264
+msgid "Deleted Files"
+msgstr ""
+
+#: lib/trashbin.php:859 lib/trashbin.php:861
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:6
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/jv/files_versions.po b/l10n/jv/files_versions.po
new file mode 100644
index 00000000000..adf7b45d3ed
--- /dev/null
+++ b/l10n/jv/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/jv/lib.po b/l10n/jv/lib.po
new file mode 100644
index 00000000000..9f4e998e7f1
--- /dev/null
+++ b/l10n/jv/lib.po
@@ -0,0 +1,338 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:875
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:232
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:233
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:234 private/files.php:262
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:259
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:260
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:63 private/json.php:88
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:52
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:202
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:203
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:133
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:135
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:137
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:139
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:141
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:142
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:144
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:145
+msgid "years ago"
+msgstr ""
diff --git a/l10n/jv/settings.po b/l10n/jv/settings.po
new file mode 100644
index 00000000000..7cba8a701d0
--- /dev/null
+++ b/l10n/jv/settings.po
@@ -0,0 +1,824 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 17:00+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr "Panjalukan salah"
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:243
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:274
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:275
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:276
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:313
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:48 personal.php:49
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:90
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:104
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:107
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:118
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:123
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:127
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:131
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:146
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:192
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:200
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:205
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:219
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:228
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:243
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:246
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:254
+msgid "Allow user to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:261
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:274
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:276
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:282
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:377
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:416 templates/personal.php:171
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:420 templates/personal.php:174
+msgid ""
+"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>."
+msgstr ""
+
+#: templates/apps.php:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:137
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:139
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:151
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:157
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:162
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/jv/user_ldap.po b/l10n/jv/user_ldap.po
new file mode 100644
index 00000000000..2371aadaeb6
--- /dev/null
+++ b/l10n/jv/user_ldap.po
@@ -0,0 +1,534 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:838
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:847
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:856
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:873 js/settings.js:882
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:876 js/settings.js:885
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:879
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:906
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:913
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:922
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:923
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:79 lib/wizard.php:93
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:122
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:784 lib/wizard.php:796
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:963
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:14
+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 ""
+
+#: templates/settings.php:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/jv/user_webdavauth.po b/l10n/jv/user_webdavauth.po
new file mode 100644
index 00000000000..c09af40c57c
--- /dev/null
+++ b/l10n/jv/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 2f9ec267e33..daac560faaf 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,59 +134,59 @@ msgstr "ნოემბერი"
msgid "December"
msgstr "დეკემბერი"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "პარამეტრები"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "შენახვა..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "წამის წინ"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "დღეს"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "გასულ თვეში"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "თვის წინ"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "ბოლო წელს"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "წლის წინ"
@@ -224,32 +224,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "უარყოფა"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -528,14 +536,14 @@ msgstr "ახალი პაროლი"
msgid "Reset password"
msgstr "პაროლის შეცვლა"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index ea64bec0b7f..5dc273c6b7e 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "სპეციალური ატრიბუტები"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "ქვოტას ველი"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "საწყისი ქვოტა"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "ბაიტებში"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "იმეილის ველი"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/km/core.po b/l10n/km/core.po
index 740792ba4ca..75a4a0c4afd 100644
--- a/l10n/km/core.po
+++ b/l10n/km/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,59 +135,59 @@ msgstr "ខែវិច្ឆិកា"
msgid "December"
msgstr "ខែធ្នូ"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "ការកំណត់"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "កំពុង​រក្សាទុក"
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "វិនាទី​មុន"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n នាទី​មុន"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ម៉ោង​មុន"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "ថ្ងៃនេះ"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ម្សិលមិញ"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ថ្ងៃ​មុន"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "ខែមុន"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n ខែ​មុន"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "ខែ​មុន"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "ឆ្នាំ​មុន"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "ឆ្នាំ​មុន"
@@ -225,32 +225,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "លើកលែង"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -529,14 +537,14 @@ msgstr "ពាក្យ​សម្ងាត់​ថ្មី"
msgid "Reset password"
msgstr "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po
index 5f8d728426c..5a41e124531 100644
--- a/l10n/km/user_ldap.po
+++ b/l10n/km/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -418,41 +418,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -468,15 +479,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -487,19 +498,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -513,10 +524,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 26a5f9246ea..0d2fc8f5d55 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,59 +134,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -224,32 +224,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -528,14 +536,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index 43493a88cac..4c39375aee3 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 4d28ccc174c..6932d89f8b3 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -24,24 +24,24 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "%s 님에게 메일을 보낼 수 없습니다."
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "유지 보수 모드 켜짐"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "유지 보수 모드 꺼짐"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "데이터베이스 업데이트 됨"
@@ -141,59 +141,59 @@ msgstr "11월"
msgid "December"
msgstr "12월"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "설정"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "저장 중..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "초 전"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n분 전 "
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n시간 전 "
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "오늘"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "어제"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n일 전 "
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "지난 달"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n달 전 "
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "개월 전"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "작년"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "년 전"
@@ -231,32 +231,40 @@ msgid "One file conflict"
msgstr "파일 1개 충돌"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "어느 파일을 유지하시겠습니까?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "두 버전을 모두 선택하면, 파일 이름에 번호가 추가될 것입니다."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "취소"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "계속"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(모두 선택됨)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count}개 선택됨)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "파일 존재함 템플릿을 불러오는 중 오류 발생"
@@ -535,14 +543,14 @@ msgstr "새 암호"
msgid "Reset password"
msgstr "암호 재설정"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 06500e88a3f..b8de7e931fc 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -420,41 +420,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "특수 속성"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "할당량 필드"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "기본 할당량"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "바이트 단위"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "이메일 필드"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "사용자 홈 폴더 이름 규칙"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "내부 사용자 이름"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -470,15 +481,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "기본적으로 내부 사용자 이름은 UUID 속성에서 생성됩니다. 사용자 이름이 중복되지 않고 문자열을 변환할 필요가 없도록 합니다. 내부 사용자 이름에는 다음과 같은 문자열만 사용할 수 있습니다: [a-zA-Z0-9_.@-] 다른 문자열은 ASCII에 해당하는 문자열로 변경되거나 없는 글자로 취급됩니다. 충돌하는 경우 숫자가 붙거나 증가합니다. 내부 사용자 이름은 내부적으로 사용자를 식별하는 데 사용되며, 사용자 홈 폴더의 기본 이름입니다. 또한 *DAV와 같은 외부 URL의 일부로 사용됩니다. 이 설정을 사용하면 기본 설정을 재정의할 수 있습니다. ownCloud 5 이전의 행동을 사용하려면 아래 필드에 사용자의 표시 이름 속성을 입력하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자에게만 적용됩니다."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "내부 사용자 이름 속성:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "UUID 확인 재정의"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "기본적으로 UUID 속성은 자동적으로 감지됩니다. UUID 속성은 LDAP 사용자와 그룹을 정확히 식별하는 데 사용됩니다. 지정하지 않은 경우 내부 사용자 이름은 UUID를 기반으로 생성됩니다. 이 설정을 다시 정의하고 임의의 속성을 지정할 수 있습니다. 사용자와 그룹 모두에게 속성을 적용할 수 있고 중복된 값이 없는지 확인하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자와 그룹에만 적용됩니다."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "사용자 UUID 속성:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "그룹 UUID 속성:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "사용자 이름-LDAP 사용자 매핑"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -515,10 +526,10 @@ msgid ""
"experimental stage."
msgstr "사용자 이름은 (메타) 데이터를 저장하고 할당하는 데 사용됩니다. 사용자를 정확하게 식별하기 위하여 각각 LDAP 사용자는 내부 사용자 이름을 갖습니다. 이는 사용자 이름과 LDAP 사용자 간의 매핑이 필요합니다. 생성된 사용자 이름은 LDAP 사용자의 UUID로 매핑됩니다. 추가적으로 LDAP 통신을 줄이기 위해서 DN이 캐시에 저장되지만 식별에 사용되지는 않습니다. DN이 변경되면 변경 사항이 기록됩니다. 내부 사용자 이름은 계속 사용됩니다. 매핑을 비우면 흔적이 남아 있게 됩니다. 매핑을 비우는 작업은 모든 LDAP 설정에 영향을 줍니다! 테스트 및 실험 단계에만 사용하고, 사용 중인 서버에서는 시도하지 마십시오."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "사용자 이름-LDAP 사용자 매핑 비우기"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "그룹 이름-LDAP 그룹 매핑 비우기"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 305363b858c..3f62db2a42d 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "ده‌ستكاری"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "پاشکه‌وتده‌کات..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "لابردن"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr "وشەی نهێنی نوێ"
msgid "Reset password"
msgstr "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 4635426b59a..e006b5932ac 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index aea34c25680..e07f5422ac6 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Maintenance Modus ass un"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Maintenance Modus ass aus"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Datebank ass geupdate ginn"
@@ -136,63 +136,63 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Astellungen"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Speicheren..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "Sekonnen hir"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n Minutt hir"
msgstr[1] "%n Minutten hir"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "haut"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "gëschter"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "leschte Mount"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "Méint hir"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "Lescht Joer"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "Joren hir"
@@ -231,32 +231,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Weieng Fichieren wëlls de gär behalen?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Ofbriechen"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Weider"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(all ausgewielt)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} ausgewielt)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -535,14 +543,14 @@ msgstr "Neit Passwuert"
msgid "Reset password"
msgstr "Passwuert zréck setzen"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 4edf0855c49..7ffaec0adf3 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 5a431dd6444..bde5eb1e70e 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -22,24 +22,24 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nepavyko nusiųsti el. pašto šiems naudotojams: %s "
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Įjungta priežiūros veiksena"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Išjungta priežiūros veiksena"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Atnaujinta duomenų bazė"
@@ -139,67 +139,67 @@ msgstr "Lapkritis"
msgid "December"
msgstr "Gruodis"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Nustatymai"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Saugoma..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "prieš sekundę"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] " prieš %n minutę"
msgstr[1] " prieš %n minučių"
msgstr[2] " prieš %n minučių"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "prieš %n valandą"
msgstr[1] "prieš %n valandų"
msgstr[2] "prieš %n valandų"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "šiandien"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "prieš %n dieną"
msgstr[1] "prieš %n dienas"
msgstr[2] "prieš %n dienų"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "praeitą mėnesį"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "prieš %n mėnesį"
msgstr[1] "prieš %n mėnesius"
msgstr[2] "prieš %n mėnesių"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "prieš mėnesį"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "praeitais metais"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "prieš metus"
@@ -239,32 +239,40 @@ msgid "One file conflict"
msgstr "Vienas failo konfliktas"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Kuriuos failus norite laikyti?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Atšaukti"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Tęsti"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(visi pažymėti)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} pažymėtų)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Klaida įkeliant esančių failų ruošinį"
@@ -543,14 +551,14 @@ msgstr "Naujas slaptažodis"
msgid "Reset password"
msgstr "Atkurti slaptažodį"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 074b5567000..1e9fab49ec4 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -423,41 +423,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Specialūs atributai"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Kvotos laukas"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Numatyta kvota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "baitais"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "El. pašto laukas"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Naudotojo namų aplanko pavadinimo taisyklė"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Vidinis naudotojo vardas"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -473,15 +484,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Vidinis naudotojo vardo atributas:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Perrašyti UUID aptikimą"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Naudotojo vardo - LDAP naudotojo sąsaja"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -518,10 +529,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Išvalyti naudotojo vardo - LDAP naudotojo sąsają"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Išvalyti grupės pavadinimo - LDAP naudotojo sąsają"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index fb37ca57ae9..a2dfeb1d55b 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,67 +135,67 @@ msgstr "Novembris"
msgid "December"
msgstr "Decembris"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Iestatījumi"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Saglabā..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "sekundes atpakaļ"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Tagad, %n minūtes"
msgstr[1] "Pirms %n minūtes"
msgstr[2] "Pirms %n minūtēm"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Šodien, %n stundas"
msgstr[1] "Pirms %n stundas"
msgstr[2] "Pirms %n stundām"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "šodien"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Šodien, %n dienas"
msgstr[1] "Pirms %n dienas"
msgstr[2] "Pirms %n dienām"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "pagājušajā mēnesī"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Šomēnes, %n mēneši"
msgstr[1] "Pirms %n mēneša"
msgstr[2] "Pirms %n mēnešiem"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "mēnešus atpakaļ"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "gājušajā gadā"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "gadus atpakaļ"
@@ -235,32 +235,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Atcelt"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -539,14 +547,14 @@ msgstr "Jauna parole"
msgid "Reset password"
msgstr "Mainīt paroli"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 90f2e4597e8..6861a984e01 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Īpašie atribūti"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Kvotu lauks"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Kvotas noklusējums"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "baitos"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "E-pasta lauks"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Lietotāja mājas mapes nosaukšanas kārtula"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 9f3faff1447..b513e1ed08b 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Вклучен е модот за одржување"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Ислкучен е модот за одржување"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Базата е надградена"
@@ -135,63 +135,63 @@ msgstr "Ноември"
msgid "December"
msgstr "Декември"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Подесувања"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Снимам..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "пред секунди"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "денеска"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "минатиот месец"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "пред месеци"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "минатата година"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "пред години"
@@ -230,32 +230,40 @@ msgid "One file conflict"
msgstr "Конфликт со една датотека"
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Продолжи"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(сите одбрани)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} одбраните)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Грешка при вчитување на датотеката, шаблонот постои "
@@ -534,14 +542,14 @@ msgstr "Нова лозинка"
msgid "Reset password"
msgstr "Ресетирај лозинка"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 9fbc64a8403..5550ed99dd9 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -420,41 +420,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -470,15 +481,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -515,10 +526,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ml/core.po b/l10n/ml/core.po
index 15de395bd8e..23e35f07f39 100644
--- a/l10n/ml/core.po
+++ b/l10n/ml/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ml\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ml/user_ldap.po b/l10n/ml/user_ldap.po
index bb825706df6..74e585ae93b 100644
--- a/l10n/ml/user_ldap.po
+++ b/l10n/ml/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index 20f6eaa8db1..fc5ab544f59 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ml_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ml_IN/user_ldap.po b/l10n/ml_IN/user_ldap.po
index 7d109240d01..39c0ec79a26 100644
--- a/l10n/ml_IN/user_ldap.po
+++ b/l10n/ml_IN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/mn/core.po b/l10n/mn/core.po
index a9b5d68e767..f6d739d99cc 100644
--- a/l10n/mn/core.po
+++ b/l10n/mn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: mn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/mn/user_ldap.po b/l10n/mn/user_ldap.po
index b5d1295fd92..51f10319473 100644
--- a/l10n/mn/user_ldap.po
+++ b/l10n/mn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 6ddccd56f8b..2bd3a56010f 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,59 +134,59 @@ msgstr "November"
msgid "December"
msgstr "Disember"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Tetapan"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Simpan..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -224,32 +224,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -528,14 +536,14 @@ msgstr "Kata laluan baru"
msgid "Reset password"
msgstr "Penetapan semula kata laluan"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index ffaf5f23caa..f99f0580f35 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 822acd25a9a..4c8f0dee364 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,59 +134,59 @@ msgstr "နိုဝင်ဘာ"
msgid "December"
msgstr "ဒီဇင်ဘာ"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "စက္ကန့်အနည်းငယ်က"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "ယနေ့"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "မနေ့က"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "ပြီးခဲ့သောလ"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "မနှစ်က"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "နှစ် အရင်က"
@@ -224,32 +224,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "ပယ်ဖျက်မည်"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -528,14 +536,14 @@ msgstr "စကားဝှက်အသစ်"
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index f168578c576..e251fa3611f 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 8cce143dc2c..5a72ebdb028 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
-"PO-Revision-Date: 2014-04-06 16:40+0000\n"
-"Last-Translator: espenbye <espenbye@me.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -233,32 +233,40 @@ msgid "One file conflict"
msgstr "En filkonflikt"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Hvilke filer vil du beholde?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Fortsett"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(alle valgt)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} valgt)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Feil ved lasting av \"filen eksisterer\"-mal"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 8de5b111cf9..50adfe578c7 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -420,41 +420,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Spesielle attributter"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Felt med lagringskvote"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Standard lagringskvote"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Felt med e-postadresse"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Navneregel for brukers hjemmemappe"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Internt brukernavn"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -470,15 +481,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Som standard vil det interne brukernavnet bli laget utifra UUID-attributten. Dette sikrer at brukernavnet er unikt og at det ikke er nødvendig å konvertere tegn. Det interne brukernavnet har den begrensningen at bare disse tegnene er tillatt: [ a-zA-Z0-9_.@- ]. Andre tegn erstattes av tilsvarende ASCII-tegn eller blir ganske enkelt utelatt. Ved kollisjon blir et nummer lagt til / øket. Det interne brukernavnet brukes til å identifisere en bruker internt. Det er også standardnavnet på brukerens hjemmemappe. Det er også med i fjern-URL-er, for eksempel for alle *DAV-tjenester. Med denne innstillingen kan standard oppførsel overstyres. For å få en oppførsel som likner oppførselen før ownCloud 5, legg inn attributten for brukerens visningsnavn i dette feltet. La feltet stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Attributt for internt brukernavn:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Overstyr UUID-oppdaging"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -489,19 +500,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Som standard blir UUID-attributten oppdaget automatisk. UUID-attributten brukes til å identifisere LDAP-brukere og -grupper uten tvil. Det interne brukernavnet vil også bli laget basert på UUID, hvis ikke annet er spesifisert ovenfor. Du kan overstyre innstillingen og oppgi den attributten du ønsker. Du må forsikre det om at din valgte attributt kan hentes ut både for brukere og for grupper og at den er unik. La stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere og -grupper."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID-attributt for brukere:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID-attributt for grupper:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Tilknytning av brukernavn til LDAP-bruker"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -515,10 +526,10 @@ msgid ""
"experimental stage."
msgstr "Brukernavn brukes til å lagre og tilordne (meta)data. For at brukere skal identifiseres og gjenkjennes presist, vil hver LDAP-bruker ha et internt brukernavn. Dette krever en tilknytning fra brukernavn til LDAP-bruker. Brukernavn som opprettes blir knyttet til LDAP-brukerens UUID. I tillegg mellomlagres DN for å redusere LDAP-kommunikasjon, men det brukes ikke til identifisering. Hvis DN endres vil endringene bli oppdaget. Det interne brukernavnet brukes alle steder. Nullstilling av tilknytningene vil etterlate seg rester overalt. Nullstilling av tilknytningene skjer ikke pr. konfigurasjon, det påvirker alle LDAP-konfigurasjoner! Nullstill aldri tilknytningene i et produksjonsmiljø, kun ved testing eller eksperimentering."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Nullstill tilknytning av brukernavn til LDAP-bruker"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Nullstill tilknytning av gruppenavn til LDAP-gruppe"
diff --git a/l10n/nds/core.po b/l10n/nds/core.po
index 648e46df300..93b4795b345 100644
--- a/l10n/nds/core.po
+++ b/l10n/nds/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: nds\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/nds/user_ldap.po b/l10n/nds/user_ldap.po
index 66bc16b25d8..87f72df86c2 100644
--- a/l10n/nds/user_ldap.po
+++ b/l10n/nds/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 0de88d8e9fd..be84d374419 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 8d19c156bd5..2837bbbb4c5 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 0177e68a325..24cfbb7f963 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-23 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 06:50+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,24 +20,24 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "De vervaldatum ligt in het verleden."
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Kon geen e-mail sturen aan de volgende gebruikers: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Onderhoudsmodus ingeschakeld"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Onderhoudsmodus uitgeschakeld"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Database bijgewerkt"
@@ -137,63 +137,63 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Instellingen"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Opslaan"
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "seconden geleden"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n minuten geleden"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n uur geleden"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "vandaag"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "gisteren"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n dagen geleden"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "vorige maand"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n maanden geleden"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "maanden geleden"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "vorig jaar"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "jaar geleden"
@@ -232,32 +232,40 @@ msgid "One file conflict"
msgstr "Een bestandsconflict"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Welke bestanden wilt u bewaren?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Annuleer"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Verder"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(alles geselecteerd)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} geselecteerd)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Fout bij laden bestand bestaat al sjabloon"
@@ -536,14 +544,14 @@ msgstr "Nieuw wachtwoord"
msgid "Reset password"
msgstr "Reset wachtwoord"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!"
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server."
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index a4759a0e924..cc0208d7cd0 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -422,41 +422,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Wanneer ingeschakeld worden groepen binnen groepen ondersteund. (Werkt alleen als het groepslid attribuut DNs bevat)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Speciale attributen"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Quota veld"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Quota standaard"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "in bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "E-mailveld"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Gebruikers Home map naamgevingsregel"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Interne gebruikersnaam"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -472,15 +483,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Standaard wordt de interne gebruikersnaam aangemaakt op basis van het UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle *DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van vóór ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op gekoppelde (toegevoegde) LDAP-gebruikers."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Interne gebruikersnaam attribuut:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Negeren UUID detectie"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -491,19 +502,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID attribuut voor gebruikers:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID attribuut voor groepen:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Gebruikersnaam-LDAP gebruikers vertaling"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -517,10 +528,10 @@ msgid ""
"experimental stage."
msgstr "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Leegmaken Groepsnaam-LDAP groep vertaling"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index bde8baeea24..6b639db57e0 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -20,24 +20,24 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Skrudde på vedlikehaldsmodus"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Skrudde av vedlikehaldsmodus"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Database oppdatert"
@@ -137,63 +137,63 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Innstillingar"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Lagrar …"
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "sekund sidan"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minutt sidan"
msgstr[1] "%n minutt sidan"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time sidan"
msgstr[1] "%n timar sidan"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "i dag"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "i går"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag sidan"
msgstr[1] "%n dagar sidan"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "førre månad"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n månad sidan"
msgstr[1] "%n månadar sidan"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "månadar sidan"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "i fjor"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "år sidan"
@@ -232,32 +232,40 @@ msgid "One file conflict"
msgstr "Éin filkonflikt"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Kva filer vil du spara?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Gå vidare"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(alle valte)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} valte)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Klarte ikkje å lasta fil-finst-mal"
@@ -536,14 +544,14 @@ msgstr "Nytt passord"
msgid "Reset password"
msgstr "Nullstill passord"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 37d6774cb71..403a8918af4 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index fca384c25d9..ebd63b4cd6b 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: nqo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,59 +134,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -224,32 +224,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -528,14 +536,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/nqo/user_ldap.po b/l10n/nqo/user_ldap.po
index 19a09572685..aa3ecec450f 100644
--- a/l10n/nqo/user_ldap.po
+++ b/l10n/nqo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 152d585a7a7..27973e1d237 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr "Novembre"
msgid "December"
msgstr "Decembre"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Configuracion"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Enregistra..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "segonda a"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "uèi"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ièr"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "mes passat"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "meses a"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "an passat"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "ans a"
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Annula"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr "Senhal novèl"
msgid "Reset password"
msgstr "Senhal tornat botar"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 1c69513cbd9..5bf21b613f8 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
index b6b1af47d5f..622bfea68c3 100644
--- a/l10n/pa/core.po
+++ b/l10n/pa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,63 +135,63 @@ msgstr "ਨਵੰਬ"
msgid "December"
msgstr "ਦਸੰਬਰ"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "ਸੈਟਿੰਗ"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "ਅੱਜ"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ਕੱਲ੍ਹ"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "ਪਿਛਲੇ ਮਹੀਨੇ"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "ਮਹੀਨੇ ਪਹਿਲਾਂ"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "ਪਿਛਲੇ ਸਾਲ"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
@@ -230,32 +230,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -534,14 +542,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/pa/user_ldap.po b/l10n/pa/user_ldap.po
index 1baf1bc601a..37579bfed80 100644
--- a/l10n/pa/user_ldap.po
+++ b/l10n/pa/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 92279c7d0a2..b0f9ae1e7f4 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-23 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 07:20+0000\n"
-"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,24 +21,24 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "Data wygaśnięcia jest w przeszłości"
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nie można było wysłać wiadomości do następujących użytkowników: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Włączony tryb konserwacji"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Wyłączony tryb konserwacji"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Zaktualizuj bazę"
@@ -138,67 +138,67 @@ msgstr "Listopad"
msgid "December"
msgstr "Grudzień"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Ustawienia"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Zapisywanie..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "sekund temu"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute temu"
msgstr[1] "%n minut temu"
msgstr[2] "%n minut temu"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n godzine temu"
msgstr[1] "%n godzin temu"
msgstr[2] "%n godzin temu"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "dziś"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "wczoraj"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dzień temu"
msgstr[1] "%n dni temu"
msgstr[2] "%n dni temu"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "w zeszłym miesiącu"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n miesiąc temu"
msgstr[1] "%n miesięcy temu"
msgstr[2] "%n miesięcy temu"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "miesięcy temu"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "w zeszłym roku"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "lat temu"
@@ -238,32 +238,40 @@ msgid "One file conflict"
msgstr "Konflikt pliku"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Które pliki chcesz zachować?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Anuluj"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Kontynuuj "
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(wszystkie zaznaczone)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} zaznaczonych)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Błąd podczas ładowania szablonu istniejącego pliku"
@@ -542,14 +550,14 @@ msgstr "Nowe hasło"
msgid "Reset password"
msgstr "Zresetuj hasło"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!"
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux."
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 25da5a7a43f..1ef7dec262c 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: maxxx <maxxxrally@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -426,41 +426,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Kiedy włączone, grupy, które zawierają grupy, są wspierane. (Działa tylko, jeśli członek grupy ma ustawienie DNs)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Specjalne atrybuty"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Pole przydziału"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Przydział domyślny"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "w bajtach"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Pole email"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Reguły nazewnictwa folderu domowego użytkownika"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Wewnętrzna nazwa użytkownika"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -476,15 +487,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Domyślnie, wewnętrzna nazwa użytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator użytkownika. To daje pewność, że nazwa użytkownika jest niepowtarzalna, a znaki nie muszą być konwertowane. Wewnętrzna nazwa użytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. Pozostałe znaki zamieniane są na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa się powtarza na końcu jest dodawana / zwiększana cyfra. Wewnętrzna nazwa użytkownika służy do wewnętrznej identyfikacji użytkownika. Jest to również domyślna nazwa folderu domowego użytkownika. Jest to również część zdalnego adresu URL, na przykład dla wszystkich usług *DAV. Dzięki temu ustawieniu można nadpisywać domyślne zachowanie aplikacji. Aby osiągnąć podobny efekt jak przed ownCloud 5 wpisz atrybut nazwy użytkownika w poniższym polu. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników LDAP."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Wewnętrzny atrybut nazwy uzżytkownika:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Zastąp wykrywanie UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -495,19 +506,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Domyślnie, atrybut UUID jest wykrywany automatycznie. Atrybut UUID jest używany do niepodważalnej identyfikacji użytkowników i grup LDAP. Również wewnętrzna nazwa użytkownika zostanie stworzona na bazie UUID, jeśli nie zostanie podana powyżej. Możesz nadpisać to ustawienie i użyć atrybutu wedle uznania. Musisz się jednak upewnić, że atrybut ten może zostać pobrany zarówno dla użytkowników, jak i grup i jest unikalny. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników i grupy LDAP."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Atrybuty UUID dla użytkowników:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Atrybuty UUID dla grup:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Mapowanie użytkownika LDAP"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -521,10 +532,10 @@ msgid ""
"experimental stage."
msgstr "Nazwy użytkowników są używane w celu przechowywania i przypisywania (meta) danych. Aby dokładnie zidentyfikować i rozpoznać użytkowników, każdy użytkownik LDAP będzie miał wewnętrzną nazwę. To wymaga utworzenia przypisania nazwy użytkownika do użytkownika LDAP. Utworzona nazwa użytkownika jet przypisywana do UUID użytkownika LDAP. Dodatkowo DN jest również buforowany aby zmniejszyć interakcję z LDAP, ale nie jest używany do identyfikacji. Jeśli DN się zmieni, zmiany zostaną odnalezione. Wewnętrzny użytkownik jest używany we wszystkich przypadkach. Wyczyszczenie mapowań spowoduje pozostawienie wszędzie resztek informacji. Wyczyszczenie mapowań nie jest wrażliwe na konfigurację, wpływa ono na wszystkie konfiguracje LDAP! Nigdy nie czyść mapowań w środowisku produkcyjnym, tylko podczas testów lub w fazie eksperymentalnej. "
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Czyść Mapowanie użytkownika LDAP"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Czyść Mapowanie nazwy grupy LDAP"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 9592e53fa5b..fef8f059623 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-23 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 14:31+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "A data de vencimento passou."
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Não foi possível enviar e-mail para os seguintes usuários: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Ativar modo de manutenção"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Desligar o modo de manutenção"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Atualizar o banco de dados"
@@ -136,63 +136,63 @@ msgstr "novembro"
msgid "December"
msgstr "dezembro"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Salvando..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] " ha %n minuto"
msgstr[1] "ha %n minutos"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "ha %n hora"
msgstr[1] "ha %n horas"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "hoje"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "ha %n dia"
msgstr[1] "ha %n dias"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "último mês"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "ha %n mês"
msgstr[1] "ha %n meses"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "último ano"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "anos atrás"
@@ -231,32 +231,40 @@ msgid "One file conflict"
msgstr "Conflito em um arquivo"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Qual arquivo você quer manter?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(todos os selecionados)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} selecionados)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Erro ao carregar arquivo existe modelo"
@@ -535,14 +543,14 @@ msgstr "Nova senha"
msgid "Reset password"
msgstr "Redefinir senha"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!"
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar."
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index f8940d0e55c..f61634c1304 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Quando habilitado, os grupos que contêm os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Atributos Especiais"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Campo de Cota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Cota Padrão"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Campo de Email"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Regra para Nome da Pasta Pessoal do Usuário"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Nome de usuário interno"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é único e que caracteres não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_.@- ]. Outros caracteres são substituídos por seus correspondentes em ASCII ou simplesmente serão omitidos. Em caso de colisão um número será adicionado/aumentado. O nome de usuário interno é usado para identificar um usuário internamente. É também o nome padrão da pasta \"home\" do usuário. É também parte de URLs remotas, por exemplo, para todos as instâncias *DAV. Com esta definição, o comportamento padrão pode ser sobrescrito. Para alcançar um comportamento semelhante ao de antes do ownCloud 5, forneça o atributo do nome de exibição do usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários LDAP recém mapeados (adicionados)."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Atributo Interno de Nome de Usuário:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Substituir detecção UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Por padrão, o atributo UUID é detectado automaticamente. O atributo UUID é usado para identificar, sem dúvidas, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificado acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser lido tanto para usuários como para grupos, e que seja único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários e grupos LDAP recém mapeados (adicionados)."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID Atributos para Usuários:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID Atributos para Grupos:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Usuário-LDAP Mapeamento de Usuário"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr "Nomes de usuários sãi usados para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Adicionalmente, o DN fica em cache, assim como para reduzir a interação LDAP, mas não é utilizado para a identificação. Se o DN muda, as mudanças serão encontradas. O nome de usuário interno é utilizado em todo lugar. Limpar os mapeamentos não influencia a configuração. Limpar os mapeamentos deixará rastros em todo lugar. Limpar os mapeamentos não influencia a configuração, mas afeta as configurações LDAP! Somente limpe os mapeamentos em embiente de testes ou em estágio experimental."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Limpar Mapeamento de Usuário Nome de Usuário-LDAP"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 30a03fb0c3d..f4403d00eb6 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -24,24 +24,24 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Não conseguiu enviar correio aos seguintes utilizadores: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Activado o modo de manutenção"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Desactivado o modo de manutenção"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Base de dados actualizada"
@@ -141,63 +141,63 @@ msgstr "Novembro"
msgid "December"
msgstr "Dezembro"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Configurações"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "A guardar..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "Minutos atrás"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuto atrás"
msgstr[1] "%n minutos atrás"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hora atrás"
msgstr[1] "%n horas atrás"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "hoje"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dia atrás"
msgstr[1] "%n dias atrás"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "ultímo mês"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n mês atrás"
msgstr[1] "%n meses atrás"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "ano passado"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "anos atrás"
@@ -236,32 +236,40 @@ msgid "One file conflict"
msgstr "Um conflito no ficheiro"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Quais os ficheiros que pretende manter?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(todos seleccionados)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Erro ao carregar o modelo de existências do ficheiro"
@@ -540,14 +548,14 @@ msgstr "Nova palavra-chave"
msgid "Reset password"
msgstr "Repor password"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 98b05141911..24be2d824ab 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -423,41 +423,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Atributos especiais"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Quota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Quota padrão"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Campo de email"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Regra da pasta inicial do utilizador"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Nome de utilizador interno"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -473,15 +484,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres não necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituídos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para utilizadores mapeados (adicionados) LDAP."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Atributo do nome de utilizador interno"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Passar a detecção do UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Atributo UUID para utilizadores:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Atributo UUID para grupos:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Mapeamento do utilizador LDAP"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -518,10 +529,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Limpar mapeamento do utilizador-LDAP"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Limpar o mapeamento do nome de grupo LDAP"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 970eadbc863..720dcd043e3 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -21,24 +21,24 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Bază de date actualizată"
@@ -138,67 +138,67 @@ msgstr "Noiembrie"
msgid "December"
msgstr "Decembrie"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Setări"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Se salvează..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "secunde în urmă"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "acum %n minut"
msgstr[1] "acum %n minute"
msgstr[2] "acum %n minute"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "acum %n oră"
msgstr[1] "acum %n ore"
msgstr[2] "acum %n ore"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "astăzi"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "acum %n zi"
msgstr[1] "acum %n zile"
msgstr[2] "acum %n zile"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "ultima lună"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "luni în urmă"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "ultimul an"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "ani în urmă"
@@ -238,32 +238,40 @@ msgid "One file conflict"
msgstr "Un conflict de fișier"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Ce fișiere vrei să păstrezi?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Anulare"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Continuă"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -542,14 +550,14 @@ msgstr "Noua parolă"
msgid "Reset password"
msgstr "Resetează parola"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index a209336d3df..8d75f9248c8 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "în octeți"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index fec52335def..de631e3a6e4 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -24,9 +24,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-28 01:55-0400\n"
-"PO-Revision-Date: 2014-03-27 14:31+0000\n"
-"Last-Translator: Swab <swab@i.ua>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,24 +34,24 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr "Дата истечения срока действия в прошлом."
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Невозможно отправить письмо следующим пользователям: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Режим отладки включён"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Режим отладки отключён"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "База данных обновлена"
@@ -151,67 +151,67 @@ msgstr "Ноябрь"
msgid "December"
msgstr "Декабрь"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Конфигурация"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Сохранение..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "несколько секунд назад"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n минуту назад"
msgstr[1] "%n минуты назад"
msgstr[2] "%n минут назад"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n час назад"
msgstr[1] "%n часа назад"
msgstr[2] "%n часов назад"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "сегодня"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n день назад"
msgstr[1] "%n дня назад"
msgstr[2] "%n дней назад"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "в прошлом месяце"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n месяц назад"
msgstr[1] "%n месяца назад"
msgstr[2] "%n месяцев назад"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "несколько месяцев назад"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "в прошлом году"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "несколько лет назад"
@@ -251,32 +251,40 @@ msgid "One file conflict"
msgstr "Один конфликт в файлах"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Какие файлы вы хотите сохранить?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "При выборе обоих версий, к названию копируемого файла будет добавлена цифра"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Отменить"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Продолжить"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(выбраны все)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} выбрано)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Ошибка при загрузке шаблона существующего файла"
@@ -555,14 +563,14 @@ msgstr "Новый пароль"
msgid "Reset password"
msgstr "Сбросить пароль"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!"
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер."
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 449f689dc96..feb3e9d1eb9 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -431,41 +431,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Специальные атрибуты"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Поле квоты"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Квота по умолчанию"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Поле адреса электронной почты"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Правило именования домашней папки пользователя"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Внутреннее имя пользователя"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -481,15 +492,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для папки пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Атрибут для внутреннего имени:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Переопределить нахождение UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -500,19 +511,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID-атрибуты для пользователей:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID-атрибуты для групп:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Соответствия Имя-Пользователь LDAP"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -526,10 +537,10 @@ msgid ""
"experimental stage."
msgstr "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует привязки имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кешируется различающееся имя (DN) для уменьшения числа обращений к LDAP, однако оно не используется для идентификации. Если различающееся имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. После сброса привязок в базе могут сохраниться остатки старой информации. Сброс привязок не привязан к конфигурации, он повлияет на все LDAP-подключения! Ни в коем случае не рекомендуется сбрасывать привязки, если система уже находится в эксплуатации, только на этапе тестирования."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Очистить соответствия Имя-Пользователь LDAP"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Очистить соответствия Группа-Группа LDAP"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index d52d4ae3894..2379dad798a 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr "නොවැම්බර්"
msgid "December"
msgstr "දෙසැම්බර්"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "සිටුවම්"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "සුරැකෙමින් පවතී..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "තත්පරයන්ට පෙර"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "අද"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ඊයේ"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "පෙර මාසයේ"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "මාස කීපයකට පෙර"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "එපා"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr "නව මුරපදය"
msgid "Reset password"
msgstr "මුරපදය ප්‍රත්‍යාරම්භ කරන්න"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index e6f39fc39de..ed0af373d58 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 72d438e715b..65348532a41 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,67 +134,67 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Nastavenia"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -234,32 +234,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Zrušiť"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -538,14 +546,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 6caf66c53b3..76ac5cd2ac8 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 91d7cf7c70b..fecc3ec62bb 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-01 01:55-0400\n"
-"PO-Revision-Date: 2014-03-31 10:38+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
#: ajax/share.php:87
msgid "Expiration date is in the past."
-msgstr ""
+msgstr " \t\nDátum expirácie spadá do minulosti."
#: ajax/share.php:119 ajax/share.php:161
#, php-format
@@ -136,67 +136,67 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Nastavenia"
-#: js/js.js:543
+#: js/js.js:564
msgid "Saving..."
msgstr "Ukladám..."
-#: js/js.js:1103
+#: js/js.js:1124
msgid "seconds ago"
msgstr "pred sekundami"
-#: js/js.js:1104
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "pred %n minútou"
msgstr[1] "pred %n minútami"
msgstr[2] "pred %n minútami"
-#: js/js.js:1105
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "pred %n hodinou"
msgstr[1] "pred %n hodinami"
msgstr[2] "pred %n hodinami"
-#: js/js.js:1106
+#: js/js.js:1127
msgid "today"
msgstr "dnes"
-#: js/js.js:1107
+#: js/js.js:1128
msgid "yesterday"
msgstr "včera"
-#: js/js.js:1108
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "pred %n dňom"
msgstr[1] "pred %n dňami"
msgstr[2] "pred %n dňami"
-#: js/js.js:1109
+#: js/js.js:1130
msgid "last month"
msgstr "minulý mesiac"
-#: js/js.js:1110
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "pred %n mesiacom"
msgstr[1] "pred %n mesiacmi"
msgstr[2] "pred %n mesiacmi"
-#: js/js.js:1111
+#: js/js.js:1132
msgid "months ago"
msgstr "pred mesiacmi"
-#: js/js.js:1112
+#: js/js.js:1133
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:1113
+#: js/js.js:1134
msgid "years ago"
msgstr "pred rokmi"
@@ -236,54 +236,62 @@ msgid "One file conflict"
msgstr "Jeden konflikt súboru"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Ktoré súbory chcete ponechať?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Zrušiť"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Pokračovať"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(všetko vybrané)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} vybraných)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Chyba pri nahrávaní šablóny existencie súboru"
#: js/setup.js:84
msgid "Very weak password"
-msgstr ""
+msgstr "Veľmi slabé heslo"
#: js/setup.js:85
msgid "Weak password"
-msgstr ""
+msgstr "Slabé heslo"
#: js/setup.js:86
msgid "So-so password"
-msgstr ""
+msgstr "Priemerné heslo"
#: js/setup.js:87
msgid "Good password"
-msgstr ""
+msgstr "Dobré heslo"
#: js/setup.js:88
msgid "Strong password"
-msgstr ""
+msgstr "Silné heslo"
#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
@@ -482,7 +490,7 @@ msgstr "reset hesla %s"
msgid ""
"A problem has occurred whilst sending the email, please contact your "
"administrator."
-msgstr ""
+msgstr "Vyskytol sa problém pri odosielaní emailu, prosím obráťte sa na správcu."
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -545,12 +553,12 @@ msgstr "Obnovenie hesla"
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
-msgstr ""
+msgstr "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!"
#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera."
#: strings.php:5
msgid "Personal"
@@ -616,7 +624,7 @@ msgid ""
"just letting you know that %s shared %s with you.\n"
"View it: %s\n"
"\n"
-msgstr "Ahoj,\n\nchcem ti dať navedomie, že %s s tebou zdieľa %s.\nTu je odkaz: %s\n\n"
+msgstr "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n"
#: templates/altmail.php:4 templates/mail.php:17
#, php-format
@@ -672,7 +680,7 @@ msgstr "Vytvoriť <strong>administrátorský účet</strong>"
#: templates/installation.php:70
msgid "Storage & database"
-msgstr ""
+msgstr "Úložislo & databáza"
#: templates/installation.php:77
msgid "Data folder"
@@ -773,7 +781,7 @@ msgstr "Alternatívne prihlásenie"
msgid ""
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
"with you.<br><a href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>"
#: templates/singleuser.user.php:3
msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 01efcb33fae..c3cda0fa890 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-04 01:55-0400\n"
-"PO-Revision-Date: 2014-04-04 05:56+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:42+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"
@@ -35,7 +35,7 @@ msgstr "Meno súboru nemôže byť prázdne"
#: ajax/newfile.php:63
#, php-format
msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" je neplatné meno súboru."
#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
msgid ""
@@ -46,7 +46,7 @@ msgstr "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú
#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:145
#: lib/app.php:65
msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "Cieľový priečinok bol premiestnený alebo odstránený."
#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
#, php-format
@@ -150,12 +150,12 @@ msgstr "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má
#: js/file-upload.js:258
msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Celková veľkosť súboru {size1} prekračuje upload limit {size2}"
#: js/file-upload.js:268
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}"
#: js/file-upload.js:340
msgid "Upload cancelled."
@@ -253,7 +253,7 @@ msgstr[2] "Nahrávam %n súborov"
#: js/files.js:96
msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" je neplatné meno súboru."
#: js/files.js:117
msgid "Your storage is full, files can not be updated or synced anymore!"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 224946f78bd..b1a00a41e46 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-01 01:55-0400\n"
-"PO-Revision-Date: 2014-03-31 10:51+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:52+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"
@@ -53,7 +53,7 @@ msgstr ""
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
msgid "Encryption"
msgstr "Šifrovanie"
@@ -205,7 +205,7 @@ msgstr "chyba pri aktualizácii aplikácie"
msgid "Error"
msgstr "Chyba"
-#: js/apps.js:153 templates/apps.php:54
+#: js/apps.js:153 templates/apps.php:55
msgid "Update"
msgstr "Aktualizovať"
@@ -213,31 +213,31 @@ msgstr "Aktualizovať"
msgid "Updated"
msgstr "Aktualizované"
-#: js/personal.js:246
+#: js/personal.js:243
msgid "Select a profile picture"
msgstr "Vybrať avatara"
-#: js/personal.js:277
+#: js/personal.js:274
msgid "Very weak password"
-msgstr ""
+msgstr "Veľmi slabé heslo"
-#: js/personal.js:278
+#: js/personal.js:275
msgid "Weak password"
-msgstr ""
+msgstr "Slabé heslo"
-#: js/personal.js:279
+#: js/personal.js:276
msgid "So-so password"
-msgstr ""
+msgstr "Priemerné heslo"
-#: js/personal.js:280
+#: js/personal.js:277
msgid "Good password"
-msgstr ""
+msgstr "Dobré heslo"
-#: js/personal.js:281
+#: js/personal.js:278
msgid "Strong password"
-msgstr ""
+msgstr "Silné heslo"
-#: js/personal.js:316
+#: js/personal.js:313
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať."
@@ -591,11 +591,11 @@ msgstr "Viac"
msgid "Less"
msgstr "Menej"
-#: templates/admin.php:416 templates/personal.php:181
+#: templates/admin.php:416 templates/personal.php:171
msgid "Version"
msgstr "Verzia"
-#: templates/admin.php:420 templates/personal.php:184
+#: templates/admin.php:420 templates/personal.php:174
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -613,23 +613,23 @@ msgstr "Pridať vašu aplikáciu"
msgid "More Apps"
msgstr "Viac aplikácií"
-#: templates/apps.php:37
+#: templates/apps.php:38
msgid "Select an App"
msgstr "Vyberte aplikáciu"
-#: templates/apps.php:42
+#: templates/apps.php:43
msgid "Documentation:"
msgstr ""
-#: templates/apps.php:48
+#: templates/apps.php:49
msgid "See application page at apps.owncloud.com"
msgstr "Pozrite si stránku aplikácií na apps.owncloud.com"
-#: templates/apps.php:50
+#: templates/apps.php:51
msgid "See application website"
msgstr ""
-#: templates/apps.php:52
+#: templates/apps.php:53
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>"
@@ -666,108 +666,108 @@ msgstr "Znovu zobraziť sprievodcu prvým spustením"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných "
-#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
msgid "Password"
msgstr "Heslo"
-#: templates/personal.php:40
+#: templates/personal.php:39
msgid "Your password was changed"
msgstr "Vaše heslo bolo zmenené"
-#: templates/personal.php:41
+#: templates/personal.php:40
msgid "Unable to change your password"
msgstr "Nie je možné zmeniť vaše heslo"
-#: templates/personal.php:43
+#: templates/personal.php:42
msgid "Current password"
msgstr "Aktuálne heslo"
-#: templates/personal.php:46
+#: templates/personal.php:45
msgid "New password"
msgstr "Nové heslo"
-#: templates/personal.php:50
+#: templates/personal.php:49
msgid "Change password"
msgstr "Zmeniť heslo"
-#: templates/personal.php:64 templates/users.php:86
+#: templates/personal.php:61 templates/users.php:86
msgid "Full Name"
msgstr "Meno a priezvisko"
-#: templates/personal.php:81
+#: templates/personal.php:76
msgid "Email"
msgstr "Email"
-#: templates/personal.php:83
+#: templates/personal.php:78
msgid "Your email address"
msgstr "Vaša emailová adresa"
-#: templates/personal.php:86
+#: templates/personal.php:81
msgid ""
"Fill in an email address to enable password recovery and receive "
"notifications"
msgstr ""
-#: templates/personal.php:96
+#: templates/personal.php:89
msgid "Profile picture"
msgstr "Avatar"
-#: templates/personal.php:101
+#: templates/personal.php:94
msgid "Upload new"
msgstr "Nahrať nový"
-#: templates/personal.php:103
+#: templates/personal.php:96
msgid "Select new from Files"
msgstr "Vyberte nový zo súborov"
-#: templates/personal.php:104
+#: templates/personal.php:97
msgid "Remove image"
msgstr "Zmazať obrázok"
-#: templates/personal.php:105
+#: templates/personal.php:98
msgid "Either png or jpg. Ideally square but you will be able to crop it."
msgstr "Formát súboru png alebo jpg. V ideálnom prípade štvorec, ale budete mať možnosť ho orezať."
-#: templates/personal.php:107
+#: templates/personal.php:100
msgid "Your avatar is provided by your original account."
msgstr "Váš avatar je použitý z pôvodného účtu."
-#: templates/personal.php:111
+#: templates/personal.php:104
msgid "Cancel"
msgstr "Zrušiť"
-#: templates/personal.php:112
+#: templates/personal.php:105
msgid "Choose as profile image"
msgstr "Vybrať ako avatara"
-#: templates/personal.php:120 templates/personal.php:121
+#: templates/personal.php:111 templates/personal.php:112
msgid "Language"
msgstr "Jazyk"
-#: templates/personal.php:140
+#: templates/personal.php:131
msgid "Help translate"
msgstr "Pomôcť s prekladom"
-#: templates/personal.php:147
+#: templates/personal.php:137
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:149
+#: templates/personal.php:139
#, php-format
msgid ""
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
"WebDAV</a>"
msgstr "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>"
-#: templates/personal.php:161
+#: templates/personal.php:151
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory."
-#: templates/personal.php:167
+#: templates/personal.php:157
msgid "Log-in password"
msgstr "Prihlasovacie heslo"
-#: templates/personal.php:172
+#: templates/personal.php:162
msgid "Decrypt all Files"
msgstr "Dešifrovať všetky súbory"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 2359384c654..38484ed97b5 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -423,41 +423,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Špeciálne atribúty"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Pole kvóty"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Predvolená kvóta"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "v bajtoch"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Pole emailu"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Pravidlo pre nastavenie názvu používateľského priečinka dát"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút z LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Interné používateľské meno"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -473,15 +484,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby *DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Atribút interného používateľského mena:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Prepísať UUID detekciu"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -492,19 +503,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné používateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri používateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID atribút pre používateľov:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID atribút pre skupiny:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Mapovanie názvov LDAP používateľských mien"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -518,10 +529,10 @@ msgid ""
"experimental stage."
msgstr "Používateľské mená sa používajú pre uchovávanie a priraďovanie (meta) dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapovaní vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Zrušiť mapovanie LDAP používateľských mien"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Zrušiť mapovanie názvov LDAP skupín"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index e3285d025c8..ed2f640c387 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-30 01:55-0400\n"
-"PO-Revision-Date: 2014-03-29 20:30+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -136,19 +136,19 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Nastavitve"
-#: js/js.js:543
+#: js/js.js:564
msgid "Saving..."
msgstr "Poteka shranjevanje ..."
-#: js/js.js:1103
+#: js/js.js:1124
msgid "seconds ago"
msgstr "pred nekaj sekundami"
-#: js/js.js:1104
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "pred %n minuto"
@@ -156,7 +156,7 @@ msgstr[1] "pred %n minutama"
msgstr[2] "pred %n minutami"
msgstr[3] "pred %n minutami"
-#: js/js.js:1105
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "pred %n uro"
@@ -164,15 +164,15 @@ msgstr[1] "pred %n urama"
msgstr[2] "pred %n urami"
msgstr[3] "pred %n urami"
-#: js/js.js:1106
+#: js/js.js:1127
msgid "today"
msgstr "danes"
-#: js/js.js:1107
+#: js/js.js:1128
msgid "yesterday"
msgstr "včeraj"
-#: js/js.js:1108
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "pred %n dnevom"
@@ -180,11 +180,11 @@ msgstr[1] "pred %n dnevoma"
msgstr[2] "pred %n dnevi"
msgstr[3] "pred %n dnevi"
-#: js/js.js:1109
+#: js/js.js:1130
msgid "last month"
msgstr "zadnji mesec"
-#: js/js.js:1110
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "pred %n mesecem"
@@ -192,15 +192,15 @@ msgstr[1] "pred %n mesecema"
msgstr[2] "pred %n meseci"
msgstr[3] "pred %n meseci"
-#: js/js.js:1111
+#: js/js.js:1132
msgid "months ago"
msgstr "mesecev nazaj"
-#: js/js.js:1112
+#: js/js.js:1133
msgid "last year"
msgstr "lansko leto"
-#: js/js.js:1113
+#: js/js.js:1134
msgid "years ago"
msgstr "let nazaj"
@@ -241,32 +241,40 @@ msgid "One file conflict"
msgstr "En spor datotek"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Katare datoteke želite ohraniti?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Prekliči"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Nadaljuj"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(vse izbrano)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} izbranih)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Napaka nalaganja predloge obstoječih datotek"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 222415e4d01..ecfe45ca6b2 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-30 01:55-0400\n"
-"PO-Revision-Date: 2014-03-29 20:50+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -425,41 +425,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Posebni atributi"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Polje količinske omejitve"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Privzeta količinska omejitev"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "v bajtih"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Polje elektronske pošte"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Pravila poimenovanja uporabniške osebne mape"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Programsko uporabniško ime"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -475,15 +486,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Privzeto je notranje uporabniško ime ustvarjeno na osnovi atributa UUID. To omogoča določitev uporabniškega imena kot enoličnega, zato znakov ni treba pretvarjati. Notranje ime je omejeno na standardne znake: [ a-zA-Z0-9_.@- ]. Morebitni drugi znaki so zamenjani z ustreznim ASCII znakom, ali pa so enostavno izpuščeni. V primeru sporov je prišteta ali odšteta številčna vrednost. Notranje uporabniško ime je uporabljeno za določanje uporabnika in je privzeto ime uporabnikove domače mape. Hkrati je tudi del oddaljenega naslova URL, na primer za storitve *DAV. S to nastavitvijo je prepisan privzet način delovanja. Pri različicah ownCloud, nižjih od 5.0, je podoben učinek mogoče doseči z vpisom prikaznega imena oziroma z neizpolnjenim (praznim) poljem te vrednosti. Spremembe bodo uveljavljene le za nove preslikane (dodane) uporabnike LDAP."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Programski atribut uporabniškega imena:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Prezri zaznavo UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -494,19 +505,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Privzeto je atribut UUID samodejno zaznan. Uporabljen je za določevanje uporabnikov LDAP in skupin. Notranje uporabniško ime je določeno prav na atributu UUID, če ni določeno drugače. To nastavitev je mogoče prepisati in poslati poljuben atribut. Zagotoviti je treba le, da je ta pridobljen kot enolični podatek za uporabnika ali skupino. Prazno polje določa privzeti način. Spremembe bodo vplivale na novo preslikane (dodane) uporabnike LDAP in skupine."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Atribut UUID za uporabnike:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Atribut UUID za skupine:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Uporabniška preslikava uporabniškega imena na LDAP"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -520,10 +531,10 @@ msgid ""
"experimental stage."
msgstr "Uporabniška imena so uporabljena za shranjevanje in dodeljevanje (meta) podatkov. Za natančno določanje in prepoznavanje uporabnikov je uporabljen sistem notranjega uporabniškega imena vsakega uporabnika LDAP. Ta možnost zahteva preslikavo uporabniškega imena v uporabnika LDAP in preslikano na njegov UUID. Sistem predpomni enolična imena za zmanjšanje odvisnosti LDAP, vendar pa ta podatek ni uporabljen za določevanje uporabnika. Če se enolično ime spremeni, se spremeni notranje uporabniško ime. Čiščenje preslikav pušča ostanke podatkov in vpliva na vse nastavitve LDAP! V delovnem okolju zato spreminjanje preslikav ni priporočljivo, možnost pa je na voljo za preizkušanje."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Izbriši preslikavo uporabniškega imena na LDAP"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Izbriši preslikavo skupine na LDAP"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index adf1767891c..776c5cef955 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Mënyra e mirëmbajtjes u aktivizua"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Mënyra e mirëmbajtjes u çaktivizua"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Database-i u azhurnua"
@@ -136,63 +136,63 @@ msgstr "Nëntor"
msgid "December"
msgstr "Dhjetor"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Parametra"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Duke ruajtur..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "sekonda më parë"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut më parë"
msgstr[1] "%n minuta më parë"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n orë më parë"
msgstr[1] "%n orë më parë"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "sot"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "dje"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ditë më parë"
msgstr[1] "%n ditë më parë"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "muajin e shkuar"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n muaj më parë"
msgstr[1] "%n muaj më parë"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "muaj më parë"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "vitin e shkuar"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "vite më parë"
@@ -231,32 +231,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Anulo"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -535,14 +543,14 @@ msgstr "Kodi i ri"
msgid "Reset password"
msgstr "Rivendos kodin"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index b8ed2aa5515..963d74c361b 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Atribute të veçanta"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Hapsira e Kuotës"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Kuota e paracaktuar"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "në byte"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Hapsira e Postës Elektronike"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Rregulli i emërimit të dosjes së përdoruesit"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lëreni bosh për emrin e përdoruesit (I Paracaktuar). Ose, përcaktoni një atribut LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Emër i brëndshëm i përdoruesit"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Atributet e emrit të përdoruesit të brëndshëm"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Mbivendosni gjetjen e UUID"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Emri përdoruesit-LAPD përcaktues përdoruesi"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Fshini Emër përdoruesi-LAPD Përcaktues përdoruesi"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Fshini Emër Grupi-LADP Përcaktues grupi"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 0b51c7f639f..4c5eb4cf733 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,67 +134,67 @@ msgstr "Новембар"
msgid "December"
msgstr "Децембар"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Поставке"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Чување у току..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "пре неколико секунди"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "данас"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "јуче"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "прошлог месеца"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "месеци раније"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "прошле године"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "година раније"
@@ -234,32 +234,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -538,14 +546,14 @@ msgstr "Нова лозинка"
msgid "Reset password"
msgstr "Ресетуј лозинку"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index d39190908f6..3e050f44943 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "у бајтовима"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 19ec0717037..f10dd683cd2 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -136,67 +136,67 @@ msgstr "Novembar"
msgid "December"
msgstr "Decembar"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Podešavanja"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "Pre par sekundi"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "Danas"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "juče"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Prije %n dan."
msgstr[1] "Prije %n dana."
msgstr[2] "Prije %n dana."
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "prošlog meseca"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "pre nekoliko meseci"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "prošle godine"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "pre nekoliko godina"
@@ -236,32 +236,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Otkaži"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -540,14 +548,14 @@ msgstr "Nova lozinka"
msgid "Reset password"
msgstr "Resetuj lozinku"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index bfe386afdc3..ff6b66a5c7d 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/su/core.po b/l10n/su/core.po
index a30711bcf79..ac15217b14a 100644
--- a/l10n/su/core.po
+++ b/l10n/su/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: su\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,59 +134,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -224,32 +224,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -528,14 +536,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/su/user_ldap.po b/l10n/su/user_ldap.po
index aa4721f182c..b7878fb8312 100644
--- a/l10n/su/user_ldap.po
+++ b/l10n/su/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 94929d66930..02ab3d0821f 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
-"PO-Revision-Date: 2014-04-06 10:50+0000\n"
-"Last-Translator: AsavarTzeth <asavartzeth@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -237,32 +237,40 @@ msgid "One file conflict"
msgstr "En filkonflikt"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Vilken fil vill du behålla?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Fortsätt"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(Alla valda)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} valda)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Fel uppstod filmall existerar"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 82b52acf7de..09ceeb1a4bf 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-06 01:55-0400\n"
-"PO-Revision-Date: 2014-04-05 21:00+0000\n"
-"Last-Translator: AsavarTzeth <asavartzeth@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -428,41 +428,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "När den är påslagen, stöds grupper som innehåller grupper. (Fungerar endast om gruppmedlemmens attribut innehåller DNs.)"
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Specialattribut"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Kvotfält"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Datakvot standard"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "E-postfält"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Namnregel för hemkatalog"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Internt Användarnamn"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -478,15 +489,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Som standard skapas det interna användarnamnet från UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillåtna: [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas på vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärråtkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet åsidosättas. För att uppnå ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att påverka nyligen mappade (tillagda) LDAP-användare"
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Internt Användarnamn Attribut:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "Åsidosätt UUID detektion"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -497,19 +508,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "UUID Attribut för Användare:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "UUID Attribut för Grupper:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Användarnamn-LDAP User Mapping"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -523,10 +534,10 @@ msgid ""
"experimental stage."
msgstr "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Rensa Användarnamn-LDAP User Mapping"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Rensa Gruppnamn-LDAP Group Mapping"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 69c0afe6ace..4670128c670 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index 578d7e4aa09..3dffd9f58ac 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 18b304ba112..9ac011d35d1 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr "கார்த்திகை"
msgid "December"
msgstr "மார்கழி"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "அமைப்புகள்"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "சேமிக்கப்படுகிறது..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "செக்கன்களுக்கு முன்"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "இன்று"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "நேற்று"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "கடந்த மாதம்"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "மாதங்களுக்கு முன்"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "கடந்த வருடம்"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "வருடங்களுக்கு முன்"
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "இரத்து செய்க"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr "புதிய கடவுச்சொல்"
msgid "Reset password"
msgstr "மீளமைத்த கடவுச்சொல்"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 7095ac9958f..4e168a7dcc4 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "bytes களில் "
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 7387068662b..01416c7db55 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -135,63 +135,63 @@ msgstr "నవంబర్"
msgid "December"
msgstr "డిసెంబర్"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "అమరికలు"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "క్షణాల క్రితం"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n నిమిషం క్రితం"
msgstr[1] "%n నిమిషాల క్రితం"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n గంట క్రితం"
msgstr[1] "%n గంటల క్రితం"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "ఈరోజు"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "నిన్న"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n రోజు క్రితం"
msgstr[1] "%n రోజుల క్రితం"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "పోయిన నెల"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n నెల క్రితం"
msgstr[1] "%n నెలల క్రితం"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "నెలల క్రితం"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "పోయిన సంవత్సరం"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "సంవత్సరాల క్రితం"
@@ -230,32 +230,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "రద్దుచేయి"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "కొనసాగించు"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -534,14 +542,14 @@ msgstr "కొత్త సంకేతపదం"
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index d7bc4f03188..515b88f3503 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index dc2a86bb6c8..e20208b113b 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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"
@@ -230,32 +230,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its "
"name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 525b817c1a3..a74152007ab 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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 bddf4926cca..49f422a52b5 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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 e6f5ae7a53c..18a1c4f9470 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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_sharing.pot b/l10n/templates/files_sharing.pot
index f694d95e78b..1921e80d189 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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 5a0e62b6fd3..2c3b8e0b23a 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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 6a7d0941746..b4091594867 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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 0bb735ef277..1b8acf89a6c 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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/private.pot b/l10n/templates/private.pot
index 837b1f9161b..1f1e3b0d7af 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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 631b8a0d73a..d2de043e5c8 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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"
@@ -210,31 +210,31 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:246
+#: js/personal.js:243
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:274
msgid "Very weak password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:275
msgid "Weak password"
msgstr ""
-#: js/personal.js:279
+#: js/personal.js:276
msgid "So-so password"
msgstr ""
-#: js/personal.js:280
+#: js/personal.js:277
msgid "Good password"
msgstr ""
-#: js/personal.js:281
+#: js/personal.js:278
msgid "Strong password"
msgstr ""
-#: js/personal.js:316
+#: js/personal.js:313
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 7004cf562db..8f3d9e5a09e 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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"
@@ -419,40 +419,51 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It "
"makes sure that the username is unique and characters do not need to be "
@@ -468,15 +479,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute "
"is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -487,19 +498,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -513,10 +524,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index c0c22d81309..58dd8f57b34 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-07 01:55-0400\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\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/th_TH/core.po b/l10n/th_TH/core.po
index cea1f814214..fbdd17bf421 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,59 +134,59 @@ msgstr "พฤศจิกายน"
msgid "December"
msgstr "ธันวาคม"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "ตั้งค่า"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "กำลังบันทึกข้อมูล..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "วินาที ก่อนหน้านี้"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "วันนี้"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "เมื่อวานนี้"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "เดือนที่แล้ว"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "เดือน ที่ผ่านมา"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "ปีที่แล้ว"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
@@ -224,32 +224,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "ยกเลิก"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -528,14 +536,14 @@ msgstr "รหัสผ่านใหม่"
msgid "Reset password"
msgstr "เปลี่ยนรหัสผ่าน"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 1e29595c3f8..1dd27e0b070 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "คุณลักษณะพิเศษ"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "ในหน่วยไบต์"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 9853fc1dab8..583c77a58df 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-06 01:55-0400\n"
-"PO-Revision-Date: 2014-04-06 00:10+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -233,32 +233,40 @@ msgid "One file conflict"
msgstr "Bir dosya çakışması"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Hangi dosyaları saklamak istiyorsunuz?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "İptal"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Devam et"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(tümü seçildi)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} seçildi)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Dosya mevcut şablonu yüklenirken hata"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 33a02856ebe..90ef7866c03 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -422,41 +422,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr "Etkinleştirildiğinde, grup içeren gruplar desteklenir (Sadece grup üyesi DN niteliği içeriyorsa çalışır)."
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Özel Öznitelikler"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Kota Alanı"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Öntanımlı Kota"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "byte cinsinden"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "E-posta Alanı"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Kullanıcı Ana Dizini İsimlendirme Kuralı"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). "
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "Dahili Kullanıcı Adı"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -472,15 +483,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu yar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır."
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "Dahili Kullanıcı Adı Özniteliği:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "UUID tespitinin üzerine yaz"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -491,19 +502,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Öntanımlı olarak, UUID niteliği otomatik olarak tespit edilmez. UUID niteliği LDAP kullanıcılarını ve gruplarını şüphesiz biçimde tanımlamak için kullanılır. Ayrıca yukarıda belirtilmemişse, bu UUID'ye bağlı olarak dahili bir kullanıcı adı oluşturulacaktır. Bu ayarın üzerine yazabilir ve istediğiniz bir nitelik belirtebilirsiniz. Ancak istediğiniz niteliğin benzersiz olduğundan ve hem kullanıcı hem de gruplar tarafından getirilebileceğinden emin olmalısınız. Öntanımlı davranış için boş bırakın. Değişiklikler sadece yeni eşleştirilen (eklenen) LDAP kullanıcı ve gruplarında etkili olacaktır."
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr "Kullanıcılar için UUID Özniteliği:"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr "Gruplar için UUID Özniteliği:"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirme"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -517,10 +528,10 @@ msgid ""
"experimental stage."
msgstr "Kullanıcı adları, (üst) veri depolaması ve ataması için kullanılır. Kullanıcıları kesin olarak tanımlamak ve algılamak için, her LDAP kullanıcısı bir dahili kullanıcı adına sahip olacak. Bu kullanıcı adı ile LDAP kullanıcısı arasında bir eşleşme gerektirir. Oluşturulan kullanıcı adı LDAP kullanıcısının UUID'si ile eşleştirilir. Ek olarak LDAP etkileşimini azaltmak için DN de önbelleğe alınır ancak bu kimlik tanıma için kullanılmaz. Eğer DN değişirse, değişiklikler tespit edilir. Dahili kullanıcı her yerde kullanılır. Eşleştirmeleri temizlemek, her yerde kalıntılar bırakacaktır. Eşleştirmeleri temizlemek yapılandırmaya hassas bir şekilde bağlı değildir, tüm LDAP yapılandırmalarını etkiler! Üretim ortamında eşleştirmeleri asla temizlemeyin, sadece sınama veya deneysel aşamada kullanın."
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Temizle"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Grup Adı-LDAP Grubu Eşleştirme"
diff --git a/l10n/tzm/core.po b/l10n/tzm/core.po
index 5188ffa1f44..528cc7ed88b 100644
--- a/l10n/tzm/core.po
+++ b/l10n/tzm/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: tzm\n"
"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/tzm/user_ldap.po b/l10n/tzm/user_ldap.po
index f4b3363e222..33f053cd3f6 100644
--- a/l10n/tzm/user_ldap.po
+++ b/l10n/tzm/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index a8ad67283df..ca775aa5dc9 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,59 +134,59 @@ msgstr "ئوغلاق"
msgid "December"
msgstr "كۆنەك"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "تەڭشەكلەر"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "ساقلاۋاتىدۇ…"
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "بۈگۈن"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "تۈنۈگۈن"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -224,32 +224,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "ۋاز كەچ"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -528,14 +536,14 @@ msgstr "يېڭى ئىم"
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index 4ac58f58360..31a16bcc3d1 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 31bbc3a69de..8f273371747 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Неможливо надіслати пошту наступним користувачам: %s "
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Увімкнено захищений режим"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Вимкнено захищений режим"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Базу даних оновлено"
@@ -135,67 +135,67 @@ msgstr "Листопад"
msgid "December"
msgstr "Грудень"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Налаштування"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Зберігаю..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "секунди тому"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n хвилину тому"
msgstr[1] "%n хвилини тому"
msgstr[2] "%n хвилин тому"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n годину тому"
msgstr[1] "%n години тому"
msgstr[2] "%n годин тому"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "сьогодні"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "вчора"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n день тому"
msgstr[1] "%n дні тому"
msgstr[2] "%n днів тому"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "минулого місяця"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n місяць тому"
msgstr[1] "%n місяці тому"
msgstr[2] "%n місяців тому"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "місяці тому"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "минулого року"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "роки тому"
@@ -235,32 +235,40 @@ msgid "One file conflict"
msgstr "Один файловий конфлікт"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Які файли ви хочете залишити?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Якщо ви оберете обидві версії, скопійований файл буде мати номер, доданий у його ім'я."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Відмінити"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Продовжити"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(все вибрано)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} вибрано)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Помилка при завантаженні файлу існуючого шаблону"
@@ -539,14 +547,14 @@ msgstr "Новий пароль"
msgid "Reset password"
msgstr "Скинути пароль"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 0e0f846c7ff..189454a8bba 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -421,41 +421,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Спеціальні Атрибути"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "Поле Квоти"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "Квота за замовчанням"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "Поле Ел. пошти"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "Правило іменування домашньої теки користувача"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -471,15 +482,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -490,19 +501,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -516,10 +527,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ur/core.po b/l10n/ur/core.po
index 4a075757d6a..ccec776d8f5 100644
--- a/l10n/ur/core.po
+++ b/l10n/ur/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ur/user_ldap.po b/l10n/ur/user_ldap.po
index 52d4b1c41d6..5cac65d044b 100644
--- a/l10n/ur/user_ldap.po
+++ b/l10n/ur/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index dd41da4e86a..b00e1bcc896 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,63 +134,63 @@ msgstr "نومبر"
msgid "December"
msgstr "دسمبر"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "سیٹینگز"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "منسوخ کریں"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -533,14 +541,14 @@ msgstr "نیا پاسورڈ"
msgid "Reset password"
msgstr "ری سیٹ پاسورڈ"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 9210c2d915a..7fcccee2a11 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/uz/core.po b/l10n/uz/core.po
index 7b8fa16a1d7..6685162cdfb 100644
--- a/l10n/uz/core.po
+++ b/l10n/uz/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,59 +134,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr ""
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr ""
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr ""
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr ""
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr ""
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -224,32 +224,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -528,14 +536,14 @@ msgstr ""
msgid "Reset password"
msgstr ""
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/uz/user_ldap.po b/l10n/uz/user_ldap.po
index e93eae4a9d2..33dee47c293 100644
--- a/l10n/uz/user_ldap.po
+++ b/l10n/uz/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 48a4e5f7c78..e2374b58219 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -21,24 +21,24 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Không thể gửi thư cho người dùng: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Bật chế độ bảo trì"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Tắt chế độ bảo trì"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Cơ sở dữ liệu đã được cập nhật"
@@ -138,59 +138,59 @@ msgstr "Tháng 11"
msgid "December"
msgstr "Tháng 12"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Cài đặt"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Đang lưu..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "vài giây trước"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n phút trước"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n giờ trước"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "hôm nay"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "hôm qua"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ngày trước"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "tháng trước"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n tháng trước"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "tháng trước"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "năm trước"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "năm trước"
@@ -228,32 +228,40 @@ msgid "One file conflict"
msgstr "Một tập tin xung đột"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "Bạn muốn tiếp tục với những tập tin nào?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Nếu bạn chọn cả hai phiên bản, tập tin được sao chép sẽ được đánh thêm số vào tên của nó."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Hủy"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Tiếp tục"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(Tất cả các lựa chọn)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} được chọn)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Lỗi khi tải tập tin mẫu đã tồn tại"
@@ -532,14 +540,14 @@ msgstr "Mật khẩu mới"
msgid "Reset password"
msgstr "Khôi phục mật khẩu"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 0874d51ffbd..04ba1f8caa4 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "Special Attributes"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "Theo Byte"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 0345cacc602..7f2eab3c3ed 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -22,24 +22,24 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "发送失败,用户如下: %s "
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "启用维护模式"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "关闭维护模式"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "数据库已更新"
@@ -139,59 +139,59 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "设置"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "保存中"
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "秒前"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分钟前"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小时前"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "今天"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "上月"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 月前"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "月前"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "去年"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "年前"
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr "1个文件冲突"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "想要保留哪一个文件呢?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "如果同时选择了连个版本,复制的文件名将会添加上一个数字。"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "继续"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(选中全部)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "(选择了{count}个)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "加载文件存在性模板失败"
@@ -533,14 +541,14 @@ msgstr "新密码"
msgid "Reset password"
msgstr "重置密码"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 79cecd9f5ea..d58c0a99e59 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "特殊属性"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "配额字段"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "默认配额"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "字节数"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "电邮字段"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "用户主目录命名规则"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "内部用户名"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "内部用户名属性:"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "超越UUID检测"
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "用户名-LDAP用户映射"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "清除用户-LDAP用户映射"
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "清除组用户-LDAP级映射"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 2b6ff7ae0db..a3f0d6b64eb 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr ""
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr ""
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr ""
@@ -134,59 +134,59 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "設定"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr ""
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr ""
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "今日"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "前一月"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "個月之前"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr ""
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr ""
@@ -224,32 +224,40 @@ msgid "One file conflict"
msgstr ""
#: js/oc-dialogs.js:367
-msgid "Which files do you want to keep?"
+msgid "New Files"
msgstr ""
#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr ""
@@ -528,14 +536,14 @@ msgstr "新密碼"
msgid "Reset password"
msgstr "重設密碼"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 67182c3f7e1..96105f465a5 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -417,41 +417,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 9595c3fa222..c1493949695 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "無法寄送郵件給這些使用者:%s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "已啓用維護模式"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "已停用維護模式"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "已更新資料庫"
@@ -136,59 +136,59 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "設定"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "儲存中..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "幾秒前"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分鐘前"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小時前"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "今天"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "上個月"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 個月前"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "幾個月前"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "去年"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "幾年前"
@@ -226,32 +226,40 @@ msgid "One file conflict"
msgstr "一個檔案衝突"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "您要保留哪一個檔案?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "如果您同時選擇兩個版本,被複製的那個檔案名稱後面會加上編號"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "繼續"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(已全選)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "(已選 {count} 項)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "載入檔案存在樣板出錯"
@@ -530,14 +538,14 @@ msgstr "新密碼"
msgid "Reset password"
msgstr "重設密碼"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index f025e58cce9..8f76848a295 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-27 01:55-0400\n"
-"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -419,41 +419,52 @@ msgid ""
"the group member attribute contains DNs.)"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "特殊屬性"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "配額欄位"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "預設配額"
-#: templates/settings.php:44
+#: templates/settings.php:45
msgid "in bytes"
msgstr "以位元組為單位"
-#: templates/settings.php:45
+#: templates/settings.php:46
msgid "Email Field"
msgstr "電郵欄位"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "使用者家目錄的命名規則"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。"
-#: templates/settings.php:52
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "內部使用者名稱"
-#: templates/settings.php:53
+#: templates/settings.php:54
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -469,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -488,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -514,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
diff --git a/lib/l10n/ast.php b/lib/l10n/ast.php
new file mode 100644
index 00000000000..1e4f406b85a
--- /dev/null
+++ b/lib/l10n/ast.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"Personal" => "Personal",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/jv.php b/lib/l10n/jv.php
new file mode 100644
index 00000000000..15f78e0bce6
--- /dev/null
+++ b/lib/l10n/jv.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
new file mode 100644
index 00000000000..6b01085c49f
--- /dev/null
+++ b/settings/l10n/ast.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"Invalid request" => "Solicitú non válida",
+"Delete" => "Desaniciar",
+"Other" => "Otru"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/jv.php b/settings/l10n/jv.php
new file mode 100644
index 00000000000..60f6d245940
--- /dev/null
+++ b/settings/l10n/jv.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Invalid request" => "Panjalukan salah"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index e613b5b04c7..af49e8e95d0 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -39,6 +39,11 @@ $TRANSLATIONS = array(
"Update" => "Aktualizovať",
"Updated" => "Aktualizované",
"Select a profile picture" => "Vybrať avatara",
+"Very weak password" => "Veľmi slabé heslo",
+"Weak password" => "Slabé heslo",
+"So-so password" => "Priemerné heslo",
+"Good password" => "Dobré heslo",
+"Strong password" => "Silné heslo",
"Decrypting files... Please wait, this can take some time." => "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
"deleted" => "zmazané",
"undo" => "vrátiť",