merge master into filesystem

3 files changed, 143 insertions, 76 deletions

diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 57c778722b2..994085414f7 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,30 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -137,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:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr ""
 
@@ -150,7 +174,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -187,70 +211,86 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index a677ece5f4b..e48f1229d3e 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:09+0100\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+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:435
+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 ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 16fd4ec4207..3c0afbd378a 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""