summaryrefslogtreecommitdiffstats
path: root/l10n/templates
diff options
context:
space:
mode:
Diffstat (limited to 'l10n/templates')
-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
12 files changed, 62 insertions, 43 deletions
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"