diaspora addon EN GB translation updated THX AndyH§

diff --git a/diaspora/lang/en-gb/messages.po b/diaspora/lang/en-gb/messages.po
index ce3dd2f..798e3b2 100644 (file)
--- a/diaspora/lang/en-gb/messages.po
+++ b/diaspora/lang/en-gb/messages.po
@@ -4,13 +4,13 @@
 # 
 # 
 # Translators:
-# Andy H3 <andy@hubup.pro>, 2018
+# Andy H3 <andy@hubup.pro>, 2018,2020
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2018-03-22 08:36+0000\n"
+"POT-Creation-Date: 2020-05-07 00:15-0400\n"
+"PO-Revision-Date: 2020-06-23 16:10+0000\n"
 "Last-Translator: Andy H3 <andy@hubup.pro>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -19,44 +19,96 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: diaspora.php:37
+#: diaspora.php:53
 msgid "Post to Diaspora"
 msgstr "Post to Diaspora"
 
-#: diaspora.php:142
+#: diaspora.php:78
+#, php-format
 msgid ""
-"Can't login to your Diaspora account. Please check username and password and"
-" ensure you used the complete address (including http...)"
-msgstr "Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"
+"Please remember: You can always be reached from Diaspora with your Friendica"
+" handle <strong>%s</strong>. "
+msgstr "Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. "
 
-#: diaspora.php:149 diaspora.php:153
+#: diaspora.php:79
+msgid ""
+"This connector is only meant if you still want to use your old Diaspora "
+"account for some time. "
+msgstr "This connector is only meant if you still want to use your old Diaspora account for some time. "
+
+#: diaspora.php:80
+#, php-format
+msgid ""
+"However, it is preferred that you tell your Diaspora contacts the new handle"
+" <strong>%s</strong> instead."
+msgstr "It's preferrable that you tell your Diaspora contacts the new handle <strong>%s</strong> instead."
+
+#: diaspora.php:90
+msgid "All aspects"
+msgstr "All aspects"
+
+#: diaspora.php:91
+msgid "Public"
+msgstr "Public"
+
+#: diaspora.php:97
+msgid "Post to aspect:"
+msgstr "Post to aspect:"
+
+#: diaspora.php:98
+#, php-format
+msgid "Connected with your Diaspora account <strong>%s</strong>"
+msgstr "Connected with your Diaspora account <strong>%s</strong>"
+
+#: diaspora.php:101
+msgid ""
+"Can't login to your Diaspora account. Please check handle (in the format "
+"user@domain.tld) and password."
+msgstr "Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."
+
+#: diaspora.php:109
 msgid "Diaspora Export"
 msgstr "Diaspora Export"
 
-#: diaspora.php:163
+#: diaspora.php:110
+msgid "Information"
+msgstr "Information"
+
+#: diaspora.php:111
+msgid "Error"
+msgstr "Error"
+
+#: diaspora.php:112
+msgid "Save Settings"
+msgstr "Save settings"
+
+#: diaspora.php:116
 msgid "Enable Diaspora Post Addon"
 msgstr "Enable Diaspora export"
 
-#: diaspora.php:168
-msgid "Diaspora username"
-msgstr "Diaspora username"
+#: diaspora.php:117
+msgid "Diaspora handle"
+msgstr "Diaspora handle"
 
-#: diaspora.php:173
+#: diaspora.php:118
 msgid "Diaspora password"
 msgstr "Diaspora password"
 
-#: diaspora.php:178
-msgid "Diaspora site URL"
-msgstr "Diaspora site URL"
+#: diaspora.php:118
+msgid ""
+"Privacy notice: Your Diaspora password will be stored unencrypted to "
+"authenticate you with your Diaspora pod. This means your Friendica node "
+"administrator can have access to it."
+msgstr "Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it."
 
-#: diaspora.php:183
+#: diaspora.php:120
 msgid "Post to Diaspora by default"
 msgstr "Post to Diaspora by default"
 
-#: diaspora.php:189
-msgid "Save Settings"
-msgstr "Save settings"
+#: diaspora.php:138
+msgid "Diaspora settings updated."
+msgstr "Diaspora settings updated."
 
-#: diaspora.php:324
-msgid "Diaspora post failed. Queued for retry."
-msgstr "Diaspora post failed. Queued for retry."
+#: diaspora.php:141
+msgid "Diaspora connector disabled."
+msgstr "Diaspora connector disabled."

diff --git a/diaspora/lang/en-gb/strings.php b/diaspora/lang/en-gb/strings.php
index 5e37591..7a84ef4 100644 (file)
--- a/diaspora/lang/en-gb/strings.php
+++ b/diaspora/lang/en-gb/strings.php
@@ -2,16 +2,27 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
+       $n = intval($n);
        return ($n != 1);;
 }}
 ;
 $a->strings["Post to Diaspora"] = "Post to Diaspora";
-$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)";
+$a->strings["Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. "] = "Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. ";
+$a->strings["This connector is only meant if you still want to use your old Diaspora account for some time. "] = "This connector is only meant if you still want to use your old Diaspora account for some time. ";
+$a->strings["However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead."] = "It's preferrable that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.";
+$a->strings["All aspects"] = "All aspects";
+$a->strings["Public"] = "Public";
+$a->strings["Post to aspect:"] = "Post to aspect:";
+$a->strings["Connected with your Diaspora account <strong>%s</strong>"] = "Connected with your Diaspora account <strong>%s</strong>";
+$a->strings["Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."] = "Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.";
 $a->strings["Diaspora Export"] = "Diaspora Export";
+$a->strings["Information"] = "Information";
+$a->strings["Error"] = "Error";
+$a->strings["Save Settings"] = "Save settings";
 $a->strings["Enable Diaspora Post Addon"] = "Enable Diaspora export";
-$a->strings["Diaspora username"] = "Diaspora username";
+$a->strings["Diaspora handle"] = "Diaspora handle";
 $a->strings["Diaspora password"] = "Diaspora password";
-$a->strings["Diaspora site URL"] = "Diaspora site URL";
+$a->strings["Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it."] = "Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.";
 $a->strings["Post to Diaspora by default"] = "Post to Diaspora by default";
-$a->strings["Save Settings"] = "Save settings";
-$a->strings["Diaspora post failed. Queued for retry."] = "Diaspora post failed. Queued for retry.";
+$a->strings["Diaspora settings updated."] = "Diaspora settings updated.";
+$a->strings["Diaspora connector disabled."] = "Diaspora connector disabled.";