merge master with resolved conflicts

3 files changed, 28 insertions, 28 deletions

diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index 8600b9ee05f..4247e556cf2 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 13:00+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-10-21 13:01-0400\n"
+"PO-Revision-Date: 2013-10-21 17:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -79,3 +79,7 @@ msgstr "Cancel upload"
 #: templates/public.php:91
 msgid "No preview available for"
 msgstr "No preview available for"
+
+#: templates/public.php:98
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index ec486461596..02ac1254c69 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-06 19:07-0400\n"
-"PO-Revision-Date: 2013-10-02 13:21+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-10-17 13:47-0400\n"
+"PO-Revision-Date: 2013-10-17 17:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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,51 +18,47 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:237
+#: private/app.php:243
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "App \"%s\" can't be installed because it is not compatible with this version of ownCloud."
 
-#: private/app.php:248
+#: private/app.php:254
 msgid "No app name specified"
 msgstr "No app name specified"
 
-#: private/app.php:352
+#: private/app.php:359
 msgid "Help"
 msgstr "Help"
 
-#: private/app.php:365
+#: private/app.php:372
 msgid "Personal"
 msgstr "Personal"
 
-#: private/app.php:376
+#: private/app.php:383
 msgid "Settings"
 msgstr "Settings"
 
-#: private/app.php:388
+#: private/app.php:395
 msgid "Users"
 msgstr "Users"
 
-#: private/app.php:401
+#: private/app.php:408
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:832
+#: private/app.php:872
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Failed to upgrade \"%s\"."
 
-#: private/avatar.php:56
-msgid "Custom profile pictures don't work with encryption yet"
-msgstr "Custom profile pictures don't work with encryption yet"
-
-#: private/avatar.php:64
+#: private/avatar.php:60
 msgid "Unknown filetype"
 msgstr "Unknown filetype"
 
-#: private/avatar.php:69
+#: private/avatar.php:65
 msgid "Invalid image"
 msgstr "Invalid image"
 
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 8dd6d17f485..1046e2596ea 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2013-10-21 13:01-0400\n"
+"PO-Revision-Date: 2013-10-21 17:01+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -288,13 +288,13 @@ msgstr "Execute one task with each page loaded"
 
 #: templates/admin.php:107
 msgid ""
-"cron.php is registered at a webcron service to call cron.php once a minute "
-"over http."
-msgstr "cron.php is registered at a webcron service to call cron.php once a minute over http."
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
 
 #: templates/admin.php:115
-msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr "Use systems cron service to call the cron.php file once a minute."
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
 
 #: templates/admin.php:120
 msgid "Sharing"