merge master into filesystem

10 files changed, 113 insertions, 91 deletions

diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 630e3926531..ff3c8bfbf6b 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -161,8 +161,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
-#: js/share.js:553
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
+#: js/share.js:566
 msgid "Error"
 msgstr ""
 
@@ -174,7 +174,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:581
+#: js/share.js:124 js/share.js:594
 msgid "Error while sharing"
 msgstr ""
 
@@ -202,11 +202,11 @@ msgstr ""
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:164
+#: js/share.js:166
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:26
+#: js/share.js:168 templates/installation.php:44 templates/login.php:35
 #: templates/verify.php:13
 msgid "Password"
 msgstr ""
@@ -271,23 +271,23 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:353 js/share.js:528 js/share.js:530
+#: js/share.js:356 js/share.js:541
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:541
+#: js/share.js:554
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:553
+#: js/share.js:566
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:568
+#: js/share.js:581
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:579
+#: js/share.js:592
 msgid "Email sent"
 msgstr ""
 
@@ -312,7 +312,7 @@ msgid "Request failed!"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
-#: templates/login.php:21
+#: templates/login.php:28
 msgid "Username"
 msgstr ""
 
@@ -526,29 +526,29 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:8
+#: templates/login.php:10
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:9
+#: templates/login.php:11
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:13
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:15
+#: templates/login.php:19
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:29
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:30
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 775839bdf02..0818212bd19 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -110,76 +110,76 @@ msgstr ""
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:209
+#: js/files.js:212
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:209
+#: js/files.js:212
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:229
 msgid "Close"
 msgstr ""
 
-#: js/files.js:245 js/files.js:359 js/files.js:389
+#: js/files.js:248 js/files.js:362 js/files.js:392
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:265
+#: js/files.js:268
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:268 js/files.js:322 js/files.js:337
+#: js/files.js:271 js/files.js:325 js/files.js:340
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:340 js/files.js:373
+#: js/files.js:343 js/files.js:376
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:442
+#: js/files.js:445
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:512
+#: js/files.js:515
 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:693
+#: js/files.js:699
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:701
+#: js/files.js:707
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:774 templates/index.php:66
+#: js/files.js:780 templates/index.php:66
 msgid "Name"
 msgstr ""
 
-#: js/files.js:775 templates/index.php:77
+#: js/files.js:781 templates/index.php:77
 msgid "Size"
 msgstr ""
 
-#: js/files.js:776 templates/index.php:79
+#: js/files.js:782 templates/index.php:79
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:803
+#: js/files.js:801
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:805
+#: js/files.js:803
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:813
+#: js/files.js:811
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:815
+#: js/files.js:813
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index ccb8c5a32f3..fb7b97cbf90 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,14 +21,14 @@ msgstr ""
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: templates/settings.php:6
+msgid "Enable Encryption"
 msgstr ""
 
-#: templates/settings.php:5
+#: templates/settings.php:7
 msgid "None"
 msgstr ""
 
 #: templates/settings.php:12
-msgid "Enable Encryption"
+msgid "Exclude the following file types from encryption"
 msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 522a78047c3..659e1e0bb54 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -99,7 +99,7 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
 msgid "Delete"
 msgstr ""
 
@@ -111,10 +111,10 @@ msgstr ""
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:139
+#: templates/settings.php:136
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:158
+#: templates/settings.php:153
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index c037b0ebf54..1984b3a0014 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 39fd04b5637..4b79897af20 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
+#: js/settings-personal.js:31 templates/settings-personal.php:7
 msgid "Expire all versions"
 msgstr ""
 
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Versions"
 msgstr ""
 
-#: templates/settings-personal.php:7
+#: templates/settings-personal.php:10
 msgid "This will delete all existing backup versions of your files"
 msgstr ""
 
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index a134890e469..f7d273a1391 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 003b49846d2..081fc8b3630 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,28 +116,28 @@ msgid ""
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/help.php:3
+msgid "User Documentation"
 msgstr ""
 
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "Administrator Documentation"
 msgstr ""
 
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Online Documentation"
 msgstr ""
 
-#: templates/help.php:22
-msgid "Problems connecting to help database."
+#: templates/help.php:7
+msgid "Forum"
 msgstr ""
 
-#: templates/help.php:23
-msgid "Go there manually."
+#: templates/help.php:9
+msgid "Bugtracker"
 msgstr ""
 
-#: templates/help.php:31
-msgid "Answer"
+#: templates/help.php:11
+msgid "Commercial Support"
 msgstr ""
 
 #: templates/personal.php:8
@@ -146,62 +146,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
 #: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+msgid "Clients"
 msgstr ""
 
 #: templates/personal.php:13
-msgid "Download"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
 msgstr ""
 
-#: templates/personal.php:19
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
+
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:22
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:23
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:24
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:22
+#: templates/personal.php:25
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:23
+#: templates/personal.php:26
 msgid "show"
 msgstr ""
 
-#: templates/personal.php:24
+#: templates/personal.php:27
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:30
+#: templates/personal.php:33
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:31
+#: templates/personal.php:34
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:32
+#: templates/personal.php:35
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
 msgstr ""
 
-#: templates/personal.php:61
+#: templates/personal.php:65
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -214,10 +234,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr ""
-
 #: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 8ca63857cbe..1915a2b814d 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index a552795d14f..8eab468ae32 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"POT-Creation-Date: 2012-12-25 00:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,5 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: templates/settings.php:4
-msgid "WebDAV URL: http://"
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"ownCloud will send the user credentials to this URL is interpret http 401 "
+"and http 403 as credentials wrong and all other codes as credentials correct."
 msgstr ""