[tx-robot] updated from transifex

6 files changed, 53 insertions, 34 deletions

diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index dc3e2404f58..f12da2a6831 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-08-22 01:54-0400\n"
-"PO-Revision-Date: 2014-08-22 05:25+0000\n"
-"Last-Translator: Darren Richardson <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-08-23 01:54-0400\n"
+"PO-Revision-Date: 2014-08-23 05:54+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"
@@ -23,32 +23,32 @@ msgstr ""
 msgid "Couldn't send mail to following users: %s "
 msgstr "Couldn't send mail to following users: %s "
 
-#: ajax/update.php:9
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Turned on maintenance mode"
 
-#: ajax/update.php:12
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Turned off maintenance mode"
 
-#: ajax/update.php:15
+#: ajax/update.php:16
 msgid "Updated database"
 msgstr "Updated database"
 
-#: ajax/update.php:18
+#: ajax/update.php:19
 msgid "Checked database schema update"
 msgstr "Checked database schema update"
 
-#: ajax/update.php:21
+#: ajax/update.php:22
 msgid "Checked database schema update for apps"
 msgstr "Checked database schema update for apps"
 
-#: ajax/update.php:24
+#: ajax/update.php:25
 #, php-format
 msgid "Updated \"%s\" to %s"
 msgstr "Updated \"%s\" to %s"
 
-#: ajax/update.php:32
+#: ajax/update.php:33
 #, php-format
 msgid "Disabled incompatible apps: %s"
 msgstr "Disabled incompatible apps: %s"
@@ -843,6 +843,28 @@ msgstr "Contact your system administrator if this message persists or appeared u
 msgid "Thank you for your patience."
 msgstr "Thank you for your patience."
 
+#: templates/untrustedDomain.php:5
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: templates/untrustedDomain.php:8
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: templates/untrustedDomain.php:10
+msgid ""
+"Depending on your configuration, as an administrator you might also be able "
+"to use the button below to trust this domain."
+msgstr ""
+
+#: templates/untrustedDomain.php:14
+#, php-format
+msgid "Add \"%s\" as trusted domain"
+msgstr ""
+
 #: templates/update.admin.php:3
 #, php-format
 msgid "%s will be updated to version %s."
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index b12ea0ac681..5e516580c5e 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-22 01:54-0400\n"
-"PO-Revision-Date: 2014-08-22 05:02+0000\n"
+"POT-Creation-Date: 2014-08-23 01:54-0400\n"
+"PO-Revision-Date: 2014-08-23 05:02+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"
diff --git a/l10n/en_GB/files_external.po b/l10n/en_GB/files_external.po
index d24356753a0..a457d3e296c 100644
--- a/l10n/en_GB/files_external.po
+++ b/l10n/en_GB/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-22 01:54-0400\n"
-"PO-Revision-Date: 2014-08-22 05:03+0000\n"
+"POT-Creation-Date: 2014-08-23 01:54-0400\n"
+"PO-Revision-Date: 2014-08-23 05:03+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"
diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po
index 640a253a2f6..32324a4e986 100644
--- a/l10n/en_GB/files_trashbin.po
+++ b/l10n/en_GB/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-22 01:54-0400\n"
-"PO-Revision-Date: 2014-08-22 05:03+0000\n"
+"POT-Creation-Date: 2014-08-23 01:54-0400\n"
+"PO-Revision-Date: 2014-08-23 05:03+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"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 5abb861b4fe..6628af12975 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-22 01:54-0400\n"
-"PO-Revision-Date: 2014-08-22 05:25+0000\n"
-"Last-Translator: Darren Richardson <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-08-23 01:54-0400\n"
+"PO-Revision-Date: 2014-08-23 05:54+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"
@@ -51,17 +51,6 @@ msgid ""
 "before performing changes on config.php"
 msgstr "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php"
 
-#: base.php:693
-msgid "You are accessing the server from an untrusted domain."
-msgstr "You are accessing the server from an untrusted domain."
-
-#: base.php:694
-msgid ""
-"Please contact your administrator. If you are an administrator of this "
-"instance, configure the \"trusted_domain\" setting in config/config.php. An "
-"example configuration is provided in config/config.sample.php."
-msgstr "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php."
-
 #: private/app.php:374
 msgid "Help"
 msgstr "Help"
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 691dd8061a4..341a15b3ca1 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-22 01:54-0400\n"
-"PO-Revision-Date: 2014-08-22 05:25+0000\n"
-"Last-Translator: Darren Richardson <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-08-23 01:54-0400\n"
+"PO-Revision-Date: 2014-08-23 05:54+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"
@@ -194,7 +194,15 @@ msgstr "Back-end doesn't support password change, but the user's encryption key
 msgid "Unable to change password"
 msgstr "Unable to change password"
 
-#: js/admin.js:128
+#: js/admin.js:45
+msgid "Are you really sure you want add \"{domain}\" as trusted domain?"
+msgstr ""
+
+#: js/admin.js:46
+msgid "Add trusted domain"
+msgstr ""
+
+#: js/admin.js:146
 msgid "Sending..."
 msgstr "Sending..."