recovered [mailstream] various modernisations

These changes where made on github as #1354 but got lost due mirroring issued from the development branch. Original author is mexon. #1354
friendica · Apr 27, 2023 · b34c913 · b34c913
1 parent dac297b
commit b34c913
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 143 deletions.
diff --git a/mailstream/lang/C/messages.po b/mailstream/lang/C/messages.po
@@ -29,68 +29,72 @@ msgstr ""
 msgid "Save Settings"
 msgstr ""
 
-#: mailstream.php:301
+#: mailstream.php:311
 msgid "Re:"
 msgstr ""
 
-#: mailstream.php:314 mailstream.php:317
+#: mailstream.php:324 mailstream.php:327
 msgid "Friendica post"
 msgstr ""
 
-#: mailstream.php:320
+#: mailstream.php:330
 msgid "Diaspora post"
 msgstr ""
 
-#: mailstream.php:330
+#: mailstream.php:340
 msgid "Feed item"
 msgstr ""
 
-#: mailstream.php:333
+#: mailstream.php:343
 msgid "Email"
 msgstr ""
 
-#: mailstream.php:335
+#: mailstream.php:345
 msgid "Friendica Item"
 msgstr ""
 
-#: mailstream.php:404
+#: mailstream.php:419
 msgid "Upstream"
 msgstr ""
 
-#: mailstream.php:405
+#: mailstream.php:420
+msgid "URI"
+msgstr ""
+
+#: mailstream.php:421
 msgid "Local"
 msgstr ""
 
-#: mailstream.php:481
+#: mailstream.php:499
 msgid "Enabled"
 msgstr ""
 
-#: mailstream.php:486
+#: mailstream.php:504
 msgid "Email Address"
 msgstr ""
 
-#: mailstream.php:488
+#: mailstream.php:506
 msgid "Leave blank to use your account email address"
 msgstr ""
 
-#: mailstream.php:492
+#: mailstream.php:510
 msgid "Exclude Likes"
 msgstr ""
 
-#: mailstream.php:494
+#: mailstream.php:512
 msgid "Check this to omit mailing \"Like\" notifications"
 msgstr ""
 
-#: mailstream.php:498
+#: mailstream.php:516
 msgid "Attach Images"
 msgstr ""
 
-#: mailstream.php:500
+#: mailstream.php:518
 msgid ""
 "Download images in posts and attach them to the email.  Useful for reading "
 "email while offline."
 msgstr ""
 
-#: mailstream.php:507
+#: mailstream.php:525
 msgid "Mail Stream Settings"
 msgstr ""
diff --git a/mailstream/lang/cs/messages.po b/mailstream/lang/cs/messages.po
@@ -4,96 +4,77 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <[email protected]>, 2014
+# Michal Šupler <[email protected]>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:54+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-07 19:19+0000\n"
+"Last-Translator: Michal Šupler <[email protected]>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: mailstream.php:77
+#: mailstream.php:55
 msgid "From Address"
 msgstr "Adresa odesílatele"
 
-#: mailstream.php:79
+#: mailstream.php:57
 msgid "Email address that stream items will appear to be from."
 msgstr "Adresa, která vysílá položky, se objeví jako odesílatel."
 
-#: mailstream.php:82
+#: mailstream.php:60 mailstream.php:282
 msgid "Save Settings"
-msgstr "Uložit nastavení"
+msgstr "Uložit Nastavení"
 
-#: mailstream.php:301
+#: mailstream.php:165
 msgid "Re:"
 msgstr "Re:"
 
-#: mailstream.php:314 mailstream.php:317
+#: mailstream.php:173
 msgid "Friendica post"
-msgstr "Příspěvek z Friendica"
+msgstr "Friendica příspěvky"
 
-#: mailstream.php:320
+#: mailstream.php:176
 msgid "Diaspora post"
-msgstr "Příspěvek z Diaspora"
+msgstr "Diaspora příspvěvky"
 
-#: mailstream.php:330
+#: mailstream.php:183
 msgid "Feed item"
-msgstr "Položka kanálu"
+msgstr "Zdrojová položka"
 
-#: mailstream.php:333
+#: mailstream.php:186
 msgid "Email"
 msgstr "E-mail"
 
-#: mailstream.php:335
+#: mailstream.php:188
 msgid "Friendica Item"
-msgstr "Položka z Friendica"
+msgstr "Friendica položka"
 
-#: mailstream.php:404
+#: mailstream.php:229
 msgid "Upstream"
 msgstr "Upstream"
 
-#: mailstream.php:405
+#: mailstream.php:230
 msgid "Local"
-msgstr "Místní"
+msgstr "Lokální"
 
-#: mailstream.php:481
-msgid "Enabled"
-msgstr "Povoleno"
-
-#: mailstream.php:486
+#: mailstream.php:274
 msgid "Email Address"
 msgstr "E-mailová adresa"
 
-#: mailstream.php:488
+#: mailstream.php:276
 msgid "Leave blank to use your account email address"
 msgstr "Ponechte prázdné pro použití vaší e-mailové adresy"
 
-#: mailstream.php:492
-msgid "Exclude Likes"
-msgstr "Vynechávat \"lajky\""
-
-#: mailstream.php:494
-msgid "Check this to omit mailing \"Like\" notifications"
-msgstr "Zaškrtnutím vypnete posílání oznámení o \"To se mi líbí\""
-
-#: mailstream.php:498
-msgid "Attach Images"
-msgstr "Připojit obrázky"
-
-#: mailstream.php:500
-msgid ""
-"Download images in posts and attach them to the email.  Useful for reading "
-"email while offline."
-msgstr "Stahovat obrázky v příspěvcích a připojovat je k e-mailu. Užitečné pro čtení e-mailu, když jste offline."
+#: mailstream.php:279
+msgid "Enabled"
+msgstr "Povoleno"
 
-#: mailstream.php:507
+#: mailstream.php:281
 msgid "Mail Stream Settings"
-msgstr "Nastavení Mail Stream"
+msgstr "Mail Stream nastavení"
diff --git a/mailstream/lang/cs/strings.php b/mailstream/lang/cs/strings.php
@@ -3,24 +3,20 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
 }}
 $a->strings['From Address'] = 'Adresa odesílatele';
 $a->strings['Email address that stream items will appear to be from.'] = 'Adresa, která vysílá položky, se objeví jako odesílatel.';
-$a->strings['Save Settings'] = 'Uložit nastavení';
+$a->strings['Save Settings'] = 'Uložit Nastavení';
 $a->strings['Re:'] = 'Re:';
-$a->strings['Friendica post'] = 'Příspěvek z Friendica';
-$a->strings['Diaspora post'] = 'Příspěvek z Diaspora';
-$a->strings['Feed item'] = 'Položka kanálu';
+$a->strings['Friendica post'] = 'Friendica příspěvky';
+$a->strings['Diaspora post'] = 'Diaspora příspvěvky';
+$a->strings['Feed item'] = 'Zdrojová položka';
 $a->strings['Email'] = 'E-mail';
-$a->strings['Friendica Item'] = 'Položka z Friendica';
+$a->strings['Friendica Item'] = 'Friendica položka';
 $a->strings['Upstream'] = 'Upstream';
-$a->strings['Local'] = 'Místní';
-$a->strings['Enabled'] = 'Povoleno';
+$a->strings['Local'] = 'Lokální';
 $a->strings['Email Address'] = 'E-mailová adresa';
 $a->strings['Leave blank to use your account email address'] = 'Ponechte prázdné pro použití vaší e-mailové adresy';
-$a->strings['Exclude Likes'] = 'Vynechávat "lajky"';
-$a->strings['Check this to omit mailing "Like" notifications'] = 'Zaškrtnutím vypnete posílání oznámení o "To se mi líbí"';
-$a->strings['Attach Images'] = 'Připojit obrázky';
-$a->strings['Download images in posts and attach them to the email.  Useful for reading email while offline.'] = 'Stahovat obrázky v příspěvcích a připojovat je k e-mailu. Užitečné pro čtení e-mailu, když jste offline.';
-$a->strings['Mail Stream Settings'] = 'Nastavení Mail Stream';
+$a->strings['Enabled'] = 'Povoleno';
+$a->strings['Mail Stream Settings'] = 'Mail Stream nastavení';
diff --git a/mailstream/lang/de/messages.po b/mailstream/lang/de/messages.po
@@ -5,17 +5,16 @@
 # 
 # Translators:
 # Andreas H., 2014
-# foss <[email protected]>, 2022
 # Tobias Diekershoff <[email protected]>, 2018
 # Ulf Rompe <[email protected]>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:54+0000\n"
-"Last-Translator: foss <[email protected]>, 2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2018-03-11 19:13+0100\n"
+"PO-Revision-Date: 2019-02-18 15:05+0000\n"
+"Last-Translator: Ulf Rompe <[email protected]>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,72 +29,72 @@ msgstr "Absender"
 msgid "Email address that stream items will appear to be from."
 msgstr "E-Mail-Adresse, die in hochgeladenen Artikeln erscheint."
 
-#: mailstream.php:82
+#: mailstream.php:82 mailstream.php:380
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: mailstream.php:301
+#: mailstream.php:223
 msgid "Re:"
 msgstr "Re:"
 
-#: mailstream.php:314 mailstream.php:317
+#: mailstream.php:231
 msgid "Friendica post"
 msgstr "Friendica-Veröffentlichung"
 
-#: mailstream.php:320
+#: mailstream.php:234
 msgid "Diaspora post"
 msgstr "Diaspora-Veröffentlichung"
 
-#: mailstream.php:330
+#: mailstream.php:244
 msgid "Feed item"
 msgstr "Artikel-Feed"
 
-#: mailstream.php:333
+#: mailstream.php:247
 msgid "Email"
 msgstr "E-Mail"
 
-#: mailstream.php:335
+#: mailstream.php:249
 msgid "Friendica Item"
 msgstr "Friendica-Artikel"
 
-#: mailstream.php:404
+#: mailstream.php:293
 msgid "Upstream"
 msgstr "Upstream"
 
-#: mailstream.php:405
+#: mailstream.php:294
 msgid "Local"
 msgstr "Lokal"
 
-#: mailstream.php:481
+#: mailstream.php:362
 msgid "Enabled"
-msgstr "Aktiv"
+msgstr "eingeschaltet"
 
-#: mailstream.php:486
+#: mailstream.php:366
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-#: mailstream.php:488
+#: mailstream.php:368
 msgid "Leave blank to use your account email address"
 msgstr "Leer lassen für deine Konto-E-Mail-Addresse"
 
-#: mailstream.php:492
+#: mailstream.php:371
 msgid "Exclude Likes"
 msgstr "Likes ignorieren"
 
-#: mailstream.php:494
+#: mailstream.php:373
 msgid "Check this to omit mailing \"Like\" notifications"
 msgstr "Diese Option verhindert das Versenden von \"Like\"-Benachrichtigungen per E-Mail."
 
-#: mailstream.php:498
+#: mailstream.php:376
 msgid "Attach Images"
 msgstr "Bilder anhängen"
 
-#: mailstream.php:500
+#: mailstream.php:378
 msgid ""
 "Download images in posts and attach them to the email.  Useful for reading "
 "email while offline."
 msgstr "Sollen Bilder, die im Beitrag eingebettet sind, als Dateianhang in den E-Mails verschickt werden?"
 
-#: mailstream.php:507
+#: mailstream.php:379
 msgid "Mail Stream Settings"
 msgstr "Mail-Nachrichten-Einstellungen"
diff --git a/mailstream/lang/de/strings.php b/mailstream/lang/de/strings.php
@@ -16,7 +16,7 @@ function string_plural_select_de($n){
 $a->strings['Friendica Item'] = 'Friendica-Artikel';
 $a->strings['Upstream'] = 'Upstream';
 $a->strings['Local'] = 'Lokal';
-$a->strings['Enabled'] = 'Aktiv';
+$a->strings['Enabled'] = 'eingeschaltet';
 $a->strings['Email Address'] = 'E-Mail-Adresse';
 $a->strings['Leave blank to use your account email address'] = 'Leer lassen für deine Konto-E-Mail-Addresse';
 $a->strings['Exclude Likes'] = 'Likes ignorieren';