From 9f1686bc800eca179fe1415c9d18fc94ec747fa7 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 07:37:15 +0200
Subject: [PATCH 01/21] gravatar NL translation update THX Casper

---
 gravatar/lang/nl/messages.po | 7 ++++---
 gravatar/lang/nl/strings.php | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gravatar/lang/nl/messages.po b/gravatar/lang/nl/messages.po
index 95b06ecd2..da18b107e 100644
--- a/gravatar/lang/nl/messages.po
+++ b/gravatar/lang/nl/messages.po
@@ -4,14 +4,15 @@
 # 
 # 
 # Translators:
+# Casper <casper@vrije-mens.org>, 2020
 # Jeroen De Meerleer <me@jeroened.be>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2018-08-24 13:49+0000\n"
-"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"PO-Revision-Date: 2020-03-27 08:59+0000\n"
+"Last-Translator: Casper <casper@vrije-mens.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +42,7 @@ msgstr ""
 
 #: gravatar.php:89
 msgid "Information"
-msgstr ""
+msgstr "Informatie"
 
 #: gravatar.php:89
 msgid ""
diff --git a/gravatar/lang/nl/strings.php b/gravatar/lang/nl/strings.php
index 4b930a53e..9883c8c78 100644
--- a/gravatar/lang/nl/strings.php
+++ b/gravatar/lang/nl/strings.php
@@ -11,7 +11,7 @@ $a->strings["random geometric pattern"] = "Willekeurige geometrische figuur";
 $a->strings["monster face"] = "";
 $a->strings["computer generated face"] = "";
 $a->strings["retro arcade style face"] = "";
-$a->strings["Information"] = "";
+$a->strings["Information"] = "Informatie";
 $a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
 $a->strings["Submit"] = "";
 $a->strings["Default avatar image"] = "";

From 89c85f6df2e2d2b51b8242845150b1da63087450 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 07:41:57 +0200
Subject: [PATCH 02/21] PL translation update blackout addon THX waldis

---
 blackout/lang/pl/messages.po | 10 +++++-----
 blackout/lang/pl/strings.php |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/blackout/lang/pl/messages.po b/blackout/lang/pl/messages.po
index 5cb661d8a..811e7388c 100644
--- a/blackout/lang/pl/messages.po
+++ b/blackout/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018-2019
+# Waldemar Stoczkowski, 2018-2020
 # Waldemar Stoczkowski, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-03-12 09:26+0100\n"
-"PO-Revision-Date: 2019-03-14 19:55+0000\n"
+"PO-Revision-Date: 2020-04-09 11:01+0000\n"
 "Last-Translator: Waldemar Stoczkowski\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr "Data zakończenia jest przed datą rozpoczęcia, powinieneś to naprawi
 msgid ""
 "Please double check that the current settings for the blackout. Begin will "
 "be <strong>%s</strong> and it will end <strong>%s</strong>."
-msgstr ""
+msgstr "Sprawdź dokładnie, czy aktualne ustawienia zaciemnienia. Rozpocznie się <strong>%s</strong> i zakończy się <strong>%s</strong>."
 
 #: blackout.php:106
 msgid "Save Settings"
@@ -52,7 +52,7 @@ msgstr "Rozpocznij Blackout"
 msgid ""
 "Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
 "<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr ""
+msgstr "Format to <tt>RRRR-MM-DD gg:mm</tt>; <em>RRRR</em> rok, <em>MM</em> miesiąc, <em>DD</em> dzień, <em>gg</em> godzina i <em>mm</em> minuta."
 
 #: blackout.php:109
 msgid "End of the Blackout"
@@ -64,4 +64,4 @@ msgid ""
 " the submit button. Users currently logged in will <strong>not</strong> be "
 "thrown out but can't login again after logging out should the blackout is "
 "still in place."
-msgstr ""
+msgstr "<strong>Uwaga</strong>: Przekierowanie będzie aktywne od momentu naciśnięcia przycisku przesyłania. Użytkownicy aktualnie zalogowani <strong>nie</strong> zostaną wyrzuceni, ale nie będą mogli zalogować się ponownie po wylogowaniu, jeśli zaciemnienie będzie nadal obowiązywać."
diff --git a/blackout/lang/pl/strings.php b/blackout/lang/pl/strings.php
index bcfdb7db4..7b1c3daed 100644
--- a/blackout/lang/pl/strings.php
+++ b/blackout/lang/pl/strings.php
@@ -7,11 +7,11 @@ function string_plural_select_pl($n){
 }}
 ;
 $a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "Data zakończenia jest przed datą rozpoczęcia, powinieneś to naprawić";
-$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "";
+$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "Sprawdź dokładnie, czy aktualne ustawienia zaciemnienia. Rozpocznie się <strong>%s</strong> i zakończy się <strong>%s</strong>.";
 $a->strings["Save Settings"] = "Zapisz ustawienia";
 $a->strings["Redirect URL"] = "Przekierowanie URL";
 $a->strings["all your visitors from the web will be redirected to this URL"] = "wszyscy Twoi goście z internetu zostaną przekierowani na ten adres URL";
 $a->strings["Begin of the Blackout"] = "Rozpocznij Blackout";
-$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "";
+$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "Format to <tt>RRRR-MM-DD gg:mm</tt>; <em>RRRR</em> rok, <em>MM</em> miesiąc, <em>DD</em> dzień, <em>gg</em> godzina i <em>mm</em> minuta.";
 $a->strings["End of the Blackout"] = "Koniec Blackout";
-$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "";
+$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>Uwaga</strong>: Przekierowanie będzie aktywne od momentu naciśnięcia przycisku przesyłania. Użytkownicy aktualnie zalogowani <strong>nie</strong> zostaną wyrzuceni, ale nie będą mogli zalogować się ponownie po wylogowaniu, jeśli zaciemnienie będzie nadal obowiązywać.";

From ccf999aaea72255e0b64f486afd9ab978d33b322 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 07:43:53 +0200
Subject: [PATCH 03/21] added RU translation for markdown addon THX Alexander
 An

---
 markdown/lang/ru/messages.po | 41 ++++++++++++++++++++++++++++++++++++
 markdown/lang/ru/strings.php | 12 +++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 markdown/lang/ru/messages.po
 create mode 100644 markdown/lang/ru/strings.php

diff --git a/markdown/lang/ru/messages.po b/markdown/lang/ru/messages.po
new file mode 100644
index 000000000..17d243b6a
--- /dev/null
+++ b/markdown/lang/ru/messages.po
@@ -0,0 +1,41 @@
+# ADDON markdown
+# Copyright (C)
+# This file is distributed under the same license as the Friendica markdown addon package.
+# 
+# 
+# Translators:
+# Alexander An <ravnina@gmail.com>, 2020
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-12-26 10:04+0000\n"
+"PO-Revision-Date: 2019-12-27 06:41+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>, 2020\n"
+"Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: markdown.php:32
+msgid "Markdown"
+msgstr "Markdown"
+
+#: markdown.php:33
+msgid "Enable Markdown parsing"
+msgstr "Включить форматирование Markdown"
+
+#: markdown.php:33
+msgid ""
+"If enabled, self created items will additionally be parsed via Markdown."
+msgstr ""
+"Если включено, то созданные вами записи будут дополнительно форматироваться "
+"в соответствии с разметкой Markdown."
+
+#: markdown.php:34
+msgid "Save Settings"
+msgstr "Сохранить настройки"
diff --git a/markdown/lang/ru/strings.php b/markdown/lang/ru/strings.php
new file mode 100644
index 000000000..95c6c82e9
--- /dev/null
+++ b/markdown/lang/ru/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["Markdown"] = "Markdown";
+$a->strings["Enable Markdown parsing"] = "Включить форматирование Markdown";
+$a->strings["If enabled, self created items will additionally be parsed via Markdown."] = "Если включено, то созданные вами записи будут дополнительно форматироваться в соответствии с разметкой Markdown.";
+$a->strings["Save Settings"] = "Сохранить настройки";

From c1dcd905d453e64bab4339bbbf48b4be31e22000 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 07:46:14 +0200
Subject: [PATCH 04/21] RU translation langfilter addon THX Alexander An

---
 langfilter/lang/ru/messages.po | 11 ++++++-----
 langfilter/lang/ru/strings.php |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/langfilter/lang/ru/messages.po b/langfilter/lang/ru/messages.po
index 22a9f9f84..e62366251 100644
--- a/langfilter/lang/ru/messages.po
+++ b/langfilter/lang/ru/messages.po
@@ -4,14 +4,15 @@
 # 
 # 
 # Translators:
+# Alexander An <ravnina@gmail.com>, 2020
 # Stanislav N. <pztrn@pztrn.name>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-04-01 11:11-0400\n"
-"PO-Revision-Date: 2018-05-24 23:59+0000\n"
-"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
+"PO-Revision-Date: 2020-04-09 18:00+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +47,14 @@ msgstr "Список аббериватур (кодов по iso2) для язы
 
 #: langfilter.php:62
 msgid "Minimum confidence in language detection"
-msgstr "Минимальная уверенность в детектировании языка"
+msgstr "Минимальная уверенность в определении языка"
 
 #: langfilter.php:62
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts"
 " will not be filtered when the confidence of language detection is below "
 "this percent value."
-msgstr "Минимальная уверенность в правильном детектировании языка, от 0 до 100. Посты не будут скрыты, если уверенность в правильном детектировании языка в процентах ниже этого значения."
+msgstr "Минимальная уверенность в правильном определении языка, от 0 до 100. Посты не будут скрыты, если уверенность в правильном определении языка в процентах ниже этого значения."
 
 #: langfilter.php:63
 msgid "Minimum length of message body"
@@ -64,7 +65,7 @@ msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
-msgstr "Минимальное количество знаков в теле сообщения для применения фильтрации. Посты, длина которых меньше указанного значения, не будут отфильтрованы. Обратите внимание, что детектирование языка работает ненадежно для небольших постов (<200 символов)."
+msgstr "Минимальное количество знаков в теле сообщения для применения фильтрации. Посты, длина которых меньше указанного значения, не будут отфильтрованы. Обратите внимание, что определение языка работает ненадежно для небольших постов (<200 символов)."
 
 #: langfilter.php:64
 msgid "Save Settings"
diff --git a/langfilter/lang/ru/strings.php b/langfilter/lang/ru/strings.php
index 33c34e54d..fa3ee90ff 100644
--- a/langfilter/lang/ru/strings.php
+++ b/langfilter/lang/ru/strings.php
@@ -11,10 +11,10 @@ $a->strings["This addon tries to identify the language posts are writen in. If i
 $a->strings["Use the language filter"] = "Использовать языковой фильтр";
 $a->strings["Able to read"] = "Возможность читать";
 $a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Список аббериватур (кодов по iso2) для языков, на которых вы говорите. Например, \"ru,en\".";
-$a->strings["Minimum confidence in language detection"] = "Минимальная уверенность в детектировании языка";
-$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Минимальная уверенность в правильном детектировании языка, от 0 до 100. Посты не будут скрыты, если уверенность в правильном детектировании языка в процентах ниже этого значения.";
+$a->strings["Minimum confidence in language detection"] = "Минимальная уверенность в определении языка";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Минимальная уверенность в правильном определении языка, от 0 до 100. Посты не будут скрыты, если уверенность в правильном определении языка в процентах ниже этого значения.";
 $a->strings["Minimum length of message body"] = "Минимальная длина тела сообщения";
-$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Минимальное количество знаков в теле сообщения для применения фильтрации. Посты, длина которых меньше указанного значения, не будут отфильтрованы. Обратите внимание, что детектирование языка работает ненадежно для небольших постов (<200 символов).";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Минимальное количество знаков в теле сообщения для применения фильтрации. Посты, длина которых меньше указанного значения, не будут отфильтрованы. Обратите внимание, что определение языка работает ненадежно для небольших постов (<200 символов).";
 $a->strings["Save Settings"] = "Сохранить настройки";
 $a->strings["Language Filter Settings saved."] = "Настройки фильтрации языков сохранены.";
 $a->strings["Filtered language: %s"] = "Отфильтрованный язык: %s";

From 88bcdb4919b342799bf783d1a8424b54d69ff8cc Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 07:49:04 +0200
Subject: [PATCH 05/21] added RU translation for newmemberwidget THX Alexander
 An

---
 newmemberwidget/lang/ru/messages.po | 76 +++++++++++++++++++++++++++++
 newmemberwidget/lang/ru/strings.php | 21 ++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 newmemberwidget/lang/ru/messages.po
 create mode 100644 newmemberwidget/lang/ru/strings.php

diff --git a/newmemberwidget/lang/ru/messages.po b/newmemberwidget/lang/ru/messages.po
new file mode 100644
index 000000000..94d61e3f9
--- /dev/null
+++ b/newmemberwidget/lang/ru/messages.po
@@ -0,0 +1,76 @@
+# ADDON newmemberwidget
+# Copyright (C)
+# This file is distributed under the same license as the Friendica newmemberwidget addon package.
+# 
+# 
+# Translators:
+# Alexander An <ravnina@gmail.com>, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-01 14:12+0200\n"
+"PO-Revision-Date: 2020-04-23 14:23+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: newmemberwidget.php:21
+msgid "New Member"
+msgstr "Новичок"
+
+#: newmemberwidget.php:22
+msgid "Tips for New Members"
+msgstr "Советы новичкам"
+
+#: newmemberwidget.php:24
+msgid "Global Support Forum"
+msgstr "Общий форум поддержки"
+
+#: newmemberwidget.php:26
+msgid "Local Support Forum"
+msgstr "Местный форум поддержки"
+
+#: newmemberwidget.php:49
+msgid "Save Settings"
+msgstr "Сохранить настройки"
+
+#: newmemberwidget.php:50
+msgid "Message"
+msgstr "Сообщение"
+
+#: newmemberwidget.php:50
+msgid "Your message for new members. You can use bbcode here."
+msgstr "Ваше сообщение новичкам. Вы можете использовать BBCode."
+
+#: newmemberwidget.php:51
+msgid "Add a link to global support forum"
+msgstr "Добавить ссылку на общий форум поддержки"
+
+#: newmemberwidget.php:51
+msgid "Should a link to the global support forum be displayed?"
+msgstr "Показывать ссылку на общий форум поддержки?"
+
+#: newmemberwidget.php:52
+msgid "Add a link to the local support forum"
+msgstr "Добавить ссылку на местный форум поддержки"
+
+#: newmemberwidget.php:52
+msgid ""
+"If you have a local support forum and wand to have a link displayed in the "
+"widget, check this box."
+msgstr "Если у вас есть местный форум поддержки и вы хотите добавить ссылку на него, включите это."
+
+#: newmemberwidget.php:53
+msgid "Name of the local support group"
+msgstr "Название местной группы поддержки"
+
+#: newmemberwidget.php:53
+msgid ""
+"If you checked the above, specify the <em>nickname</em> of the local support"
+" group here (i.e. helpers)"
+msgstr "Если вы включили настройку выше, укажите <em>ник</em>местной группы поддержки пользователей."
diff --git a/newmemberwidget/lang/ru/strings.php b/newmemberwidget/lang/ru/strings.php
new file mode 100644
index 000000000..6ef208522
--- /dev/null
+++ b/newmemberwidget/lang/ru/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["New Member"] = "Новичок";
+$a->strings["Tips for New Members"] = "Советы новичкам";
+$a->strings["Global Support Forum"] = "Общий форум поддержки";
+$a->strings["Local Support Forum"] = "Местный форум поддержки";
+$a->strings["Save Settings"] = "Сохранить настройки";
+$a->strings["Message"] = "Сообщение";
+$a->strings["Your message for new members. You can use bbcode here."] = "Ваше сообщение новичкам. Вы можете использовать BBCode.";
+$a->strings["Add a link to global support forum"] = "Добавить ссылку на общий форум поддержки";
+$a->strings["Should a link to the global support forum be displayed?"] = "Показывать ссылку на общий форум поддержки?";
+$a->strings["Add a link to the local support forum"] = "Добавить ссылку на местный форум поддержки";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Если у вас есть местный форум поддержки и вы хотите добавить ссылку на него, включите это.";
+$a->strings["Name of the local support group"] = "Название местной группы поддержки";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "Если вы включили настройку выше, укажите <em>ник</em>местной группы поддержки пользователей.";

From 47b204e511489f05b6acbe61b1dfac1e52375b76 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 07:49:59 +0200
Subject: [PATCH 06/21] RU translation of blackout addon THX Alexander An

---
 blackout/lang/ru/messages.po | 48 ++++++++++++++++++++++++------------
 blackout/lang/ru/strings.php |  7 ++++--
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/blackout/lang/ru/messages.po b/blackout/lang/ru/messages.po
index 560ed5d7e..4fa48cccf 100644
--- a/blackout/lang/ru/messages.po
+++ b/blackout/lang/ru/messages.po
@@ -4,14 +4,16 @@
 # 
 # 
 # Translators:
+# Alexander An <ravnina@gmail.com>, 2020
+# Eugene Veresk <eugene.vereshchagin@gmail.com>, 2020
 # Stanislav N. <pztrn@pztrn.name>, 2017
 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: 2017-04-08 05:34+0000\n"
-"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
+"POT-Creation-Date: 2019-03-12 09:26+0100\n"
+"PO-Revision-Date: 2020-04-23 14:36+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,34 +21,48 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: blackout.php:99
+#: blackout.php:101
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix this"
+msgstr "Дата начала позже даты окончания, исправьте это"
+
+#: blackout.php:103
+#, php-format
+msgid ""
+"Please double check that the current settings for the blackout. Begin will "
+"be <strong>%s</strong> and it will end <strong>%s</strong>."
+msgstr " Пожалуйста, проверьте настройки блэкаута ещё раз. Он начнётся <strong>%s</strong> и закончится <strong>%s</strong>."
+
+#: blackout.php:106
 msgid "Save Settings"
 msgstr "Сохранить настройки"
 
-#: blackout.php:100
+#: blackout.php:107
 msgid "Redirect URL"
 msgstr "Ссылка для перенаправления"
 
-#: blackout.php:100
+#: blackout.php:107
 msgid "all your visitors from the web will be redirected to this URL"
 msgstr "все посетители будут перенаправлены на этот URL"
 
-#: blackout.php:101
+#: blackout.php:108
 msgid "Begin of the Blackout"
 msgstr "Начало блэкаута"
 
-#: blackout.php:101
+#: blackout.php:108
 msgid ""
-"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
-"<em>hh</em> hour and <em>mm</em> minute"
-msgstr "формат: <em>YYYY</em> год, <em>MM</em> месяц, <em>DD</em> день, <em>hh</em> час и <em>mm</em> минута"
+"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
+"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
+msgstr "Формат: <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> год, <em>MM</em> месяц, <em>DD</em> день, <em>hh</em> час и <em>mm</em> минуты."
 
-#: blackout.php:102
+#: blackout.php:109
 msgid "End of the Blackout"
 msgstr "Конец блэкаута"
 
-#: blackout.php:108
+#: blackout.php:111
 msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr "Указана более ранняя дата окончания, чем дата начала. Это надо исправить."
+"<strong>Note</strong>: The redirect will be active from the moment you press"
+" the submit button. Users currently logged in will <strong>not</strong> be "
+"thrown out but can't login again after logging out should the blackout is "
+"still in place."
+msgstr "<strong>Внимание</strong>: Переадресация будет включена после нажатия вами кнопки. Уже вошедшие пользователи <strong>не</strong> будут выброшены, но не смогут зайти снова, пока блэкаут не закончится."
diff --git a/blackout/lang/ru/strings.php b/blackout/lang/ru/strings.php
index aae8b350b..9dc1ddf1b 100644
--- a/blackout/lang/ru/strings.php
+++ b/blackout/lang/ru/strings.php
@@ -2,13 +2,16 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
+	$n = intval($n);
 	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
 ;
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "Дата начала позже даты окончания, исправьте это";
+$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = " Пожалуйста, проверьте настройки блэкаута ещё раз. Он начнётся <strong>%s</strong> и закончится <strong>%s</strong>.";
 $a->strings["Save Settings"] = "Сохранить настройки";
 $a->strings["Redirect URL"] = "Ссылка для перенаправления";
 $a->strings["all your visitors from the web will be redirected to this URL"] = "все посетители будут перенаправлены на этот URL";
 $a->strings["Begin of the Blackout"] = "Начало блэкаута";
-$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "формат: <em>YYYY</em> год, <em>MM</em> месяц, <em>DD</em> день, <em>hh</em> час и <em>mm</em> минута";
+$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "Формат: <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> год, <em>MM</em> месяц, <em>DD</em> день, <em>hh</em> час и <em>mm</em> минуты.";
 $a->strings["End of the Blackout"] = "Конец блэкаута";
-$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "Указана более ранняя дата окончания, чем дата начала. Это надо исправить.";
+$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>Внимание</strong>: Переадресация будет включена после нажатия вами кнопки. Уже вошедшие пользователи <strong>не</strong> будут выброшены, но не смогут зайти снова, пока блэкаут не закончится.";

From 1651dd418e0f096b245d51f850ea8aacb3991bc1 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 07:55:34 +0200
Subject: [PATCH 07/21] qcomment RU translation update THX Alexander An

---
 qcomment/lang/ru/messages.po | 54 ++++++++++++++++++++++++++++++++++++
 qcomment/lang/ru/strings.php | 26 ++++++++++-------
 2 files changed, 70 insertions(+), 10 deletions(-)
 create mode 100644 qcomment/lang/ru/messages.po

diff --git a/qcomment/lang/ru/messages.po b/qcomment/lang/ru/messages.po
new file mode 100644
index 000000000..53e086df2
--- /dev/null
+++ b/qcomment/lang/ru/messages.po
@@ -0,0 +1,54 @@
+# ADDON qcomment
+# Copyright (C)
+# This file is distributed under the same license as the Friendica qcomment addon package.
+# 
+# 
+# Translators:
+# Alexander An <ravnina@gmail.com>, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2020-04-23 14:31+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: qcomment.php:51
+msgid ":-)"
+msgstr ":-)"
+
+#: qcomment.php:51
+msgid ":-("
+msgstr ":-("
+
+#: qcomment.php:51
+msgid "lol"
+msgstr "lol"
+
+#: qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Настройки быстрых комментариев"
+
+#: qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to"
+" provide simple replies."
+msgstr "Быстрые комментарии находятся рядом с полями комментариев, иногда они скрыты. Нажмите на них, чтобы использовать готовые ответы."
+
+#: qcomment.php:57
+msgid "Enter quick comments, one per line"
+msgstr "Введите быстрые комментарии, по одному на строку"
+
+#: qcomment.php:61
+msgid "Submit"
+msgstr "Добавить"
+
+#: qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Настройки сохранены."
diff --git a/qcomment/lang/ru/strings.php b/qcomment/lang/ru/strings.php
index 5ccbcd7d6..5bc45e559 100644
--- a/qcomment/lang/ru/strings.php
+++ b/qcomment/lang/ru/strings.php
@@ -1,10 +1,16 @@
-<?php
-
-$a->strings[":-)"] = ":-)";
-$a->strings[":-("] = ":-(";
-$a->strings["lol"] = "lol";
-$a->strings["Quick Comment Settings"] = "";
-$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "";
-$a->strings["Enter quick comments, one per line"] = "Введите короткие комментарии, по одному в строке:";
-$a->strings["Submit"] = "Подтвердить";
-$a->strings["Quick Comment settings saved."] = "";
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Настройки быстрых комментариев";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Быстрые комментарии находятся рядом с полями комментариев, иногда они скрыты. Нажмите на них, чтобы использовать готовые ответы.";
+$a->strings["Enter quick comments, one per line"] = "Введите быстрые комментарии, по одному на строку";
+$a->strings["Submit"] = "Добавить";
+$a->strings["Quick Comment settings saved."] = "Настройки сохранены.";

From 9ce4d716b26fe2924aa49886b78a83a193312918 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 07:57:18 +0200
Subject: [PATCH 08/21] infiniteimprobabilitydrive addon update RU translation
 THX Alexander An

---
 .../lang/ru/messages.po                       | 24 +++++++++++++++++++
 .../lang/ru/strings.php                       | 12 +++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 infiniteimprobabilitydrive/lang/ru/messages.po

diff --git a/infiniteimprobabilitydrive/lang/ru/messages.po b/infiniteimprobabilitydrive/lang/ru/messages.po
new file mode 100644
index 000000000..4e99e2dbd
--- /dev/null
+++ b/infiniteimprobabilitydrive/lang/ru/messages.po
@@ -0,0 +1,24 @@
+# ADDON infiniteimprobabilitydrive
+# Copyright (C)
+# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
+# 
+# 
+# Translators:
+# Alexander An <ravnina@gmail.com>, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2020-04-23 14:28+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: infiniteimprobabilitydrive.php:19
+msgid "Infinite Improbability Drive"
+msgstr "Infinite Improbability Drive"
diff --git a/infiniteimprobabilitydrive/lang/ru/strings.php b/infiniteimprobabilitydrive/lang/ru/strings.php
index 8f1e62def..2852e0658 100644
--- a/infiniteimprobabilitydrive/lang/ru/strings.php
+++ b/infiniteimprobabilitydrive/lang/ru/strings.php
@@ -1,3 +1,9 @@
-<?php
-
-$a->strings["Infinite Improbability Drive"] = "";
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";

From fc5a4de53c66f219c6ddc903f44b0b0ca5f3a9e3 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 08:21:38 +0200
Subject: [PATCH 09/21] RU translation update numfriends addon THX Alexander An

---
 numfriends/lang/ru/messages.po | 36 ++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 numfriends/lang/ru/messages.po

diff --git a/numfriends/lang/ru/messages.po b/numfriends/lang/ru/messages.po
new file mode 100644
index 000000000..c85c364b0
--- /dev/null
+++ b/numfriends/lang/ru/messages.po
@@ -0,0 +1,36 @@
+# ADDON numfriends
+# Copyright (C)
+# This file is distributed under the same license as the Friendica numfriends addon package.
+# 
+# 
+# Translators:
+# Alexander An <ravnina@gmail.com>, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2020-04-23 14:26+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Настройки Numfriends обновлены."
+
+#: numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Настройки Numfriends"
+
+#: numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr "Сколько контактов показывать на боковой панели профиля"
+
+#: numfriends.php:85
+msgid "Submit"
+msgstr "Добавить"

From fdc75fb73c484ceef3b9525970b43dce957011d2 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 08:21:55 +0200
Subject: [PATCH 10/21] RU translation update numfriends addon THX Alexander An

---
 numfriends/lang/ru/strings.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/numfriends/lang/ru/strings.php b/numfriends/lang/ru/strings.php
index 4674a1b45..0b92ac938 100644
--- a/numfriends/lang/ru/strings.php
+++ b/numfriends/lang/ru/strings.php
@@ -1,6 +1,12 @@
-<?php
-
-$a->strings["Numfriends settings updated."] = "";
-$a->strings["Numfriends Settings"] = "";
-$a->strings["How many contacts to display on profile sidebar"] = "";
-$a->strings["Submit"] = "Подтвердить";
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["Numfriends settings updated."] = "Настройки Numfriends обновлены.";
+$a->strings["Numfriends Settings"] = "Настройки Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Сколько контактов показывать на боковой панели профиля";
+$a->strings["Submit"] = "Добавить";

From abf61cd93f1e91ce627d4a71b213a5dfe8a72aba Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 08:23:22 +0200
Subject: [PATCH 11/21] showmore RU translation update THX Alexander An

---
 showmore/lang/ru/messages.po | 44 ++++++++++++++++++++++++++++++++++++
 showmore/lang/ru/strings.php | 22 +++++++++++-------
 2 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 showmore/lang/ru/messages.po

diff --git a/showmore/lang/ru/messages.po b/showmore/lang/ru/messages.po
new file mode 100644
index 000000000..2b4c74131
--- /dev/null
+++ b/showmore/lang/ru/messages.po
@@ -0,0 +1,44 @@
+# ADDON showmore
+# Copyright (C)
+# This file is distributed under the same license as the Friendica showmore addon package.
+# 
+# 
+# Translators:
+# Alexander An <ravnina@gmail.com>, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2020-04-23 14:25+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: showmore.php:41 showmore.php:45
+msgid "\"Show more\" Settings"
+msgstr "Настройки \"показать ещё\""
+
+#: showmore.php:50
+msgid "Enable Show More"
+msgstr "Включить \"показать ещё\""
+
+#: showmore.php:53
+msgid "Cutting posts after how much characters"
+msgstr "Обрезать записи после превышения этого числа символов"
+
+#: showmore.php:57
+msgid "Save Settings"
+msgstr "Сохранить настройки"
+
+#: showmore.php:74
+msgid "Show More Settings saved."
+msgstr "Настройки сохранены."
+
+#: showmore.php:134
+msgid "show more"
+msgstr "показать ещё"
diff --git a/showmore/lang/ru/strings.php b/showmore/lang/ru/strings.php
index 0111afedf..a643b0289 100644
--- a/showmore/lang/ru/strings.php
+++ b/showmore/lang/ru/strings.php
@@ -1,8 +1,14 @@
-<?php
-
-$a->strings["\"Show more\" Settings"] = "";
-$a->strings["Enable Show More"] = "Включить Показать больше";
-$a->strings["Cutting posts after how much characters"] = "Обрезание сообщения после превывения числа символов";
-$a->strings["Submit"] = "Подтвердить";
-$a->strings["Show More Settings saved."] = "";
-$a->strings["show more"] = "показать больше";
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["\"Show more\" Settings"] = "Настройки \"показать ещё\"";
+$a->strings["Enable Show More"] = "Включить \"показать ещё\"";
+$a->strings["Cutting posts after how much characters"] = "Обрезать записи после превышения этого числа символов";
+$a->strings["Save Settings"] = "Сохранить настройки";
+$a->strings["Show More Settings saved."] = "Настройки сохранены.";
+$a->strings["show more"] = "показать ещё";

From c081a7a336cdd3d21995e9c722311e48cd8498b1 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 08:27:08 +0200
Subject: [PATCH 12/21] RU translation blockem addon THX Alexander An

---
 blockem/lang/ru/messages.po | 29 +++++++++++++++--------------
 blockem/lang/ru/strings.php |  2 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/blockem/lang/ru/messages.po b/blockem/lang/ru/messages.po
index 86d536c95..22427327d 100644
--- a/blockem/lang/ru/messages.po
+++ b/blockem/lang/ru/messages.po
@@ -4,14 +4,15 @@
 # 
 # 
 # Translators:
+# Alexander An <ravnina@gmail.com>, 2020
 # Stanislav N. <pztrn@pztrn.name>, 2017-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-01 11:11-0400\n"
-"PO-Revision-Date: 2018-05-25 00:00+0000\n"
-"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
+"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"PO-Revision-Date: 2020-04-23 14:13+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,41 +20,41 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: blockem.php:52 blockem.php:56
-msgid "\"Blockem\""
-msgstr "\"Blockem\""
+#: blockem.php:54 blockem.php:58
+msgid "Blockem"
+msgstr "Blockem"
 
-#: blockem.php:60
+#: blockem.php:62
 msgid ""
 "Hides user's content by collapsing posts. Also replaces their avatar with "
 "generic image."
 msgstr "Скрыть контент пользователя. Также заменяет его аватар изображением по-умолчанию."
 
-#: blockem.php:61
+#: blockem.php:63
 msgid "Comma separated profile URLS:"
 msgstr "URL профилей, разделенные запятыми:"
 
-#: blockem.php:65
+#: blockem.php:67
 msgid "Save Settings"
 msgstr "Сохранить настройки"
 
-#: blockem.php:78
+#: blockem.php:81
 msgid "BLOCKEM Settings saved."
 msgstr "BLOCKEM Настройки сохранены."
 
-#: blockem.php:136
+#: blockem.php:143
 #, php-format
 msgid "Filtered user: %s"
 msgstr "Отфильтрованный пользователь: %s"
 
-#: blockem.php:189
+#: blockem.php:202
 msgid "Unblock Author"
 msgstr "Разблокировать автора"
 
-#: blockem.php:191
+#: blockem.php:204
 msgid "Block Author"
 msgstr "Блокировать автора"
 
-#: blockem.php:223
+#: blockem.php:244
 msgid "blockem settings updated"
 msgstr "Настройки Blockem обновлены"
diff --git a/blockem/lang/ru/strings.php b/blockem/lang/ru/strings.php
index 2a1b14985..9510f68e4 100644
--- a/blockem/lang/ru/strings.php
+++ b/blockem/lang/ru/strings.php
@@ -6,7 +6,7 @@ function string_plural_select_ru($n){
 	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
 ;
-$a->strings["\"Blockem\""] = "\"Blockem\"";
+$a->strings["Blockem"] = "Blockem";
 $a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Скрыть контент пользователя. Также заменяет его аватар изображением по-умолчанию.";
 $a->strings["Comma separated profile URLS:"] = "URL профилей, разделенные запятыми:";
 $a->strings["Save Settings"] = "Сохранить настройки";

From 2ec0eb67458a5744428240881fb0f640a095076b Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 09:12:09 +0200
Subject: [PATCH 13/21] added RU translation of catavatar addon THX Alexander
 An

---
 catavatar/lang/ru/messages.po | 54 +++++++++++++++++++++++++++++++++++
 catavatar/lang/ru/strings.php | 16 +++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 catavatar/lang/ru/messages.po
 create mode 100644 catavatar/lang/ru/strings.php

diff --git a/catavatar/lang/ru/messages.po b/catavatar/lang/ru/messages.po
new file mode 100644
index 000000000..8a53c1828
--- /dev/null
+++ b/catavatar/lang/ru/messages.po
@@ -0,0 +1,54 @@
+# ADDON catavatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica catavatar addon package.
+# 
+# 
+# Translators:
+# Alexander An <ravnina@gmail.com>, 2020
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-04-13 09:35+0000\n"
+"PO-Revision-Date: 2018-04-07 05:23+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>, 2020\n"
+"Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: catavatar.php:60
+msgid "Use Cat as Avatar"
+msgstr "Поставить кота на аватар"
+
+#: catavatar.php:61
+msgid "More Random Cat!"
+msgstr "Сгенерировать ещё котов!"
+
+#: catavatar.php:62
+msgid "Reset to email Cat"
+msgstr "Сбросить на кота по-умолчанию"
+
+#: catavatar.php:64
+msgid "Cat Avatar Settings"
+msgstr "Настройки Cat Avatar"
+
+#: catavatar.php:100
+msgid "The cat hadn't found itself."
+msgstr "Кот не нашёл сам себя."
+
+#: catavatar.php:109
+msgid "There was an error, the cat ran away."
+msgstr "Возникла ошибка, кот убежал."
+
+#: catavatar.php:115
+msgid "Profile Photos"
+msgstr "Фото профиля"
+
+#: catavatar.php:130
+msgid "Meow!"
+msgstr "Мяу!"
diff --git a/catavatar/lang/ru/strings.php b/catavatar/lang/ru/strings.php
new file mode 100644
index 000000000..2dd756cac
--- /dev/null
+++ b/catavatar/lang/ru/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["Use Cat as Avatar"] = "Поставить кота на аватар";
+$a->strings["More Random Cat!"] = "Сгенерировать ещё котов!";
+$a->strings["Reset to email Cat"] = "Сбросить на кота по-умолчанию";
+$a->strings["Cat Avatar Settings"] = "Настройки Cat Avatar";
+$a->strings["The cat hadn't found itself."] = "Кот не нашёл сам себя.";
+$a->strings["There was an error, the cat ran away."] = "Возникла ошибка, кот убежал.";
+$a->strings["Profile Photos"] = "Фото профиля";
+$a->strings["Meow!"] = "Мяу!";

From 0734b5620d59a1def43e27cd8d0e733a2a683a9a Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 09:14:40 +0200
Subject: [PATCH 14/21] superblock addon RU translation update THX Alexander An

---
 superblock/lang/ru/messages.po | 44 ++++++++++++++++++++++++++++++++++
 superblock/lang/ru/strings.php | 24 +++++++++++--------
 2 files changed, 58 insertions(+), 10 deletions(-)
 create mode 100644 superblock/lang/ru/messages.po

diff --git a/superblock/lang/ru/messages.po b/superblock/lang/ru/messages.po
new file mode 100644
index 000000000..c57686bca
--- /dev/null
+++ b/superblock/lang/ru/messages.po
@@ -0,0 +1,44 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+# Alexander An <ravnina@gmail.com>, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:25+0200\n"
+"PO-Revision-Date: 2020-04-23 14:10+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: superblock.php:47 superblock.php:51
+msgid "Superblock"
+msgstr "Superblock"
+
+#: superblock.php:54
+msgid "Comma separated profile URLS to block"
+msgstr "Ссылки на блокируемые профили через запятую"
+
+#: superblock.php:58
+msgid "Save Settings"
+msgstr "Сохранить настройки"
+
+#: superblock.php:71
+msgid "SUPERBLOCK Settings saved."
+msgstr "Настройки Superblock сохранены"
+
+#: superblock.php:144
+msgid "Block Completely"
+msgstr "Заблокировать совсем"
+
+#: superblock.php:165
+msgid "superblock settings updated"
+msgstr "настройки superblock обновлены"
diff --git a/superblock/lang/ru/strings.php b/superblock/lang/ru/strings.php
index 7617b865e..4e3b90797 100644
--- a/superblock/lang/ru/strings.php
+++ b/superblock/lang/ru/strings.php
@@ -1,10 +1,14 @@
-<?php
-
-$a->strings["\"Blockem\" Settings"] = "\"Blockem\" настройки";
-$a->strings["Comma separated profile URLS to block"] = "URLS, которые заблокировать (список через запятую)";
-$a->strings["Submit"] = "Подтвердить";
-$a->strings["BLOCKEM Settings saved."] = "BLOCKEM-Настройки сохранены.";
-$a->strings["Blocked %s - Click to open/close"] = "Заблокированные %s - Нажмите, чтобы открыть/закрыть";
-$a->strings["Unblock Author"] = "";
-$a->strings["Block Author"] = "Блокировать Автора";
-$a->strings["blockem settings updated"] = "\"Blockem\" настройки обновлены";
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["Superblock"] = "Superblock";
+$a->strings["Comma separated profile URLS to block"] = "Ссылки на блокируемые профили через запятую";
+$a->strings["Save Settings"] = "Сохранить настройки";
+$a->strings["SUPERBLOCK Settings saved."] = "Настройки Superblock сохранены";
+$a->strings["Block Completely"] = "Заблокировать совсем";
+$a->strings["superblock settings updated"] = "настройки superblock обновлены";

From d6221acb53051f2feb80a7044a8b7a3507406a36 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 09:16:07 +0200
Subject: [PATCH 15/21] js_upload RU translation update THX Alexander An

---
 js_upload/lang/ru/messages.po | 56 +++++++++++++++++++++++++++++++++++
 js_upload/lang/ru/strings.php | 28 +++++++++++-------
 2 files changed, 73 insertions(+), 11 deletions(-)
 create mode 100644 js_upload/lang/ru/messages.po

diff --git a/js_upload/lang/ru/messages.po b/js_upload/lang/ru/messages.po
new file mode 100644
index 000000000..bb5be3e0d
--- /dev/null
+++ b/js_upload/lang/ru/messages.po
@@ -0,0 +1,56 @@
+# ADDON js_upload
+# Copyright (C)
+# This file is distributed under the same license as the Friendica js_upload addon package.
+# 
+# 
+# Translators:
+# Alexander An <ravnina@gmail.com>, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2020-04-23 13:59+0000\n"
+"Last-Translator: Alexander An <ravnina@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: js_upload.php:43
+msgid "Upload a file"
+msgstr "Загрузить файл"
+
+#: js_upload.php:44
+msgid "Drop files here to upload"
+msgstr "Перетащите сюда файлы для загрузки"
+
+#: js_upload.php:45
+msgid "Cancel"
+msgstr "Отмена"
+
+#: js_upload.php:46
+msgid "Failed"
+msgstr "Ошибка"
+
+#: js_upload.php:303
+msgid "No files were uploaded."
+msgstr "Файлы не были загружены."
+
+#: js_upload.php:309
+msgid "Uploaded file is empty"
+msgstr "Загруженный файл пустой."
+
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
+msgstr "Изображение превышает ограничение в"
+
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr "У файла недопустимое расширение, оно должно быть"
+
+#: js_upload.php:343
+msgid "Upload was cancelled, or server error encountered"
+msgstr "Закачка отменена, либо возникла ошибка на сервере"
diff --git a/js_upload/lang/ru/strings.php b/js_upload/lang/ru/strings.php
index b30fa7b54..c2071cf31 100644
--- a/js_upload/lang/ru/strings.php
+++ b/js_upload/lang/ru/strings.php
@@ -1,11 +1,17 @@
-<?php
-
-$a->strings["Upload a file"] = "Загрузить файл";
-$a->strings["Drop files here to upload"] = "Перетащите файлы сюда для загрузки";
-$a->strings["Cancel"] = "Отмена";
-$a->strings["Failed"] = "Ошибка";
-$a->strings["No files were uploaded."] = "Нет загруженных файлов.";
-$a->strings["Uploaded file is empty"] = "Загруженный файл пустой";
-$a->strings["Image exceeds size limit of "] = "Размер фото превышает лимит ";
-$a->strings["File has an invalid extension, it should be one of "] = "Файл имеет недопустимое расширение, оно должно быть одним из следующих ";
-$a->strings["Upload was cancelled, or server error encountered"] = "Загрузка была отменена, или произошла ошибка сервера";
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["Upload a file"] = "Загрузить файл";
+$a->strings["Drop files here to upload"] = "Перетащите сюда файлы для загрузки";
+$a->strings["Cancel"] = "Отмена";
+$a->strings["Failed"] = "Ошибка";
+$a->strings["No files were uploaded."] = "Файлы не были загружены.";
+$a->strings["Uploaded file is empty"] = "Загруженный файл пустой.";
+$a->strings["Image exceeds size limit of "] = "Изображение превышает ограничение в";
+$a->strings["File has an invalid extension, it should be one of "] = "У файла недопустимое расширение, оно должно быть";
+$a->strings["Upload was cancelled, or server error encountered"] = "Закачка отменена, либо возникла ошибка на сервере";

From 032d61bf74360dedd3c3481eaab5a4f2ef8caf63 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 09:17:59 +0200
Subject: [PATCH 16/21] PL translation diaspora THX waldis

---
 diaspora/lang/pl/messages.po | 116 +++++++++++++++++++++++++----------
 diaspora/lang/pl/strings.php |  24 +++++---
 2 files changed, 101 insertions(+), 39 deletions(-)

diff --git a/diaspora/lang/pl/messages.po b/diaspora/lang/pl/messages.po
index 086155b09..b315858f8 100644
--- a/diaspora/lang/pl/messages.po
+++ b/diaspora/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+# Waldemar Stoczkowski, 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-08-04 10:21+0000\n"
-"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"POT-Creation-Date: 2020-05-07 00:15-0400\n"
+"PO-Revision-Date: 2020-06-02 14:07+0000\n"
+"Last-Translator: Waldemar Stoczkowski\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,44 +19,96 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: diaspora.php:37
+#: diaspora.php:53
 msgid "Post to Diaspora"
 msgstr "Napisz do Diaspory"
 
-#: 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 "Nie możesz zalogować się na swoje konto Diaspora. Sprawdź nazwę użytkownika i hasło i upewnij się, że użyłeś pełnego adresu (w tym http ...)"
+"Please remember: You can always be reached from Diaspora with your Friendica"
+" handle <strong>%s</strong>. "
+msgstr ""
 
-#: 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 "Ten łącznik jest przeznaczony do tego, gdy nadal chcesz korzystać ze starego konta Diaspora przez jakiś czas."
+
+#: diaspora.php:80
+#, php-format
+msgid ""
+"However, it is preferred that you tell your Diaspora contacts the new handle"
+" <strong>%s</strong> instead."
+msgstr ""
+
+#: diaspora.php:90
+msgid "All aspects"
+msgstr "Wszystkie aspekty"
+
+#: diaspora.php:91
+msgid "Public"
+msgstr "Publiczny"
+
+#: diaspora.php:97
+msgid "Post to aspect:"
+msgstr ""
+
+#: diaspora.php:98
+#, php-format
+msgid "Connected with your Diaspora account <strong>%s</strong>"
+msgstr ""
+
+#: diaspora.php:101
+msgid ""
+"Can't login to your Diaspora account. Please check handle (in the format "
+"user@domain.tld) and password."
+msgstr ""
+
+#: diaspora.php:109
 msgid "Diaspora Export"
 msgstr "Eksportuj do Diaspory"
 
-#: diaspora.php:163
-msgid "Enable Diaspora Post Addon"
-msgstr "Włącz dodatek Diaspora"
+#: diaspora.php:110
+msgid "Information"
+msgstr ""
 
-#: diaspora.php:168
-msgid "Diaspora username"
-msgstr "Nazwa użytkownika Diaspora"
+#: diaspora.php:111
+msgid "Error"
+msgstr "Błąd"
 
-#: diaspora.php:173
-msgid "Diaspora password"
-msgstr "Hasło Diaspora"
-
-#: diaspora.php:178
-msgid "Diaspora site URL"
-msgstr "Adres URL witryny Diaspora"
-
-#: diaspora.php:183
-msgid "Post to Diaspora by default"
-msgstr "Wyślij domyślnie do Diaspory"
-
-#: diaspora.php:189
+#: diaspora.php:112
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: diaspora.php:324
-msgid "Diaspora post failed. Queued for retry."
-msgstr "Post do Diaspora nie powiódł się. W kolejce do ponowienia."
+#: diaspora.php:116
+msgid "Enable Diaspora Post Addon"
+msgstr "Włącz dodatek Diaspora"
+
+#: diaspora.php:117
+msgid "Diaspora handle"
+msgstr ""
+
+#: diaspora.php:118
+msgid "Diaspora password"
+msgstr "Hasło Diaspora"
+
+#: 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 ""
+
+#: diaspora.php:120
+msgid "Post to Diaspora by default"
+msgstr "Wyślij domyślnie do Diaspory"
+
+#: diaspora.php:138
+msgid "Diaspora settings updated."
+msgstr ""
+
+#: diaspora.php:141
+msgid "Diaspora connector disabled."
+msgstr ""
diff --git a/diaspora/lang/pl/strings.php b/diaspora/lang/pl/strings.php
index fd9158da0..8efa58b07 100644
--- a/diaspora/lang/pl/strings.php
+++ b/diaspora/lang/pl/strings.php
@@ -7,12 +7,22 @@ function string_plural_select_pl($n){
 }}
 ;
 $a->strings["Post to Diaspora"] = "Napisz do Diaspory";
-$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Nie możesz zalogować się na swoje konto Diaspora. Sprawdź nazwę użytkownika i hasło i upewnij się, że użyłeś pełnego adresu (w tym http ...)";
+$a->strings["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. "] = "Ten łącznik jest przeznaczony do tego, gdy nadal chcesz korzystać ze starego konta Diaspora przez jakiś czas.";
+$a->strings["However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead."] = "";
+$a->strings["All aspects"] = "Wszystkie aspekty";
+$a->strings["Public"] = "Publiczny";
+$a->strings["Post to aspect:"] = "";
+$a->strings["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."] = "";
 $a->strings["Diaspora Export"] = "Eksportuj do Diaspory";
-$a->strings["Enable Diaspora Post Addon"] = "Włącz dodatek Diaspora";
-$a->strings["Diaspora username"] = "Nazwa użytkownika Diaspora";
-$a->strings["Diaspora password"] = "Hasło Diaspora";
-$a->strings["Diaspora site URL"] = "Adres URL witryny Diaspora";
-$a->strings["Post to Diaspora by default"] = "Wyślij domyślnie do Diaspory";
+$a->strings["Information"] = "";
+$a->strings["Error"] = "Błąd";
 $a->strings["Save Settings"] = "Zapisz ustawienia";
-$a->strings["Diaspora post failed. Queued for retry."] = "Post do Diaspora nie powiódł się. W kolejce do ponowienia.";
+$a->strings["Enable Diaspora Post Addon"] = "Włącz dodatek Diaspora";
+$a->strings["Diaspora handle"] = "";
+$a->strings["Diaspora password"] = "Hasło Diaspora";
+$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."] = "";
+$a->strings["Post to Diaspora by default"] = "Wyślij domyślnie do Diaspory";
+$a->strings["Diaspora settings updated."] = "";
+$a->strings["Diaspora connector disabled."] = "";

From 9318cb8583ae967f26baa5b93f60a63a9a8571ca Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 09:24:39 +0200
Subject: [PATCH 17/21] buglink addon NB NO translation update

---
 buglink/lang/nb-no/messages.po | 24 ++++++++++++++++++++++++
 buglink/lang/nb-no/strings.php | 12 +++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 buglink/lang/nb-no/messages.po

diff --git a/buglink/lang/nb-no/messages.po b/buglink/lang/nb-no/messages.po
new file mode 100644
index 000000000..c9e10ed90
--- /dev/null
+++ b/buglink/lang/nb-no/messages.po
@@ -0,0 +1,24 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+# 9d7045af8ca83a89b1b4bf48a2c67786_a2524de <552015d9a2e1abe6fabe3394a3652575_905986>, 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: 2020-06-06 21:45+0000\n"
+"Last-Translator: 9d7045af8ca83a89b1b4bf48a2c67786_a2524de <552015d9a2e1abe6fabe3394a3652575_905986>\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/Friendica/friendica/language/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buglink.php:15
+msgid "Report Bug"
+msgstr "Rapporter feil"
diff --git a/buglink/lang/nb-no/strings.php b/buglink/lang/nb-no/strings.php
index ec212e9a3..9de93361d 100644
--- a/buglink/lang/nb-no/strings.php
+++ b/buglink/lang/nb-no/strings.php
@@ -1,3 +1,9 @@
-<?php
-
-$a->strings["Report Bug"] = "";
+<?php
+
+if(! function_exists("string_plural_select_nb_no")) {
+function string_plural_select_nb_no($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Report Bug"] = "Rapporter feil";

From df1669493caa6094552c20d0760bba0d2e7c0f21 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 09:26:12 +0200
Subject: [PATCH 18/21] viewsrv addon NB NO translation update

---
 viewsrc/lang/nb-no/messages.po | 26 ++++++++++++++++++++++++++
 viewsrc/lang/nb-no/strings.php | 12 +++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 viewsrc/lang/nb-no/messages.po

diff --git a/viewsrc/lang/nb-no/messages.po b/viewsrc/lang/nb-no/messages.po
new file mode 100644
index 000000000..b3a64ef33
--- /dev/null
+++ b/viewsrc/lang/nb-no/messages.po
@@ -0,0 +1,26 @@
+# ADDON viewsrc
+# Copyright (C)
+# This file is distributed under the same license as the Friendica viewsrc addon package.
+# 
+# 
+# Translators:
+# 9d7045af8ca83a89b1b4bf48a2c67786_a2524de <552015d9a2e1abe6fabe3394a3652575_905986>, 2020
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-20 07:26+0000\n"
+"Last-Translator: 9d7045af8ca83a89b1b4bf48a2c67786_a2524de <552015d9a2e1abe6fabe3394a3652575_905986>, 2020\n"
+"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/Friendica/teams/12172/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: viewsrc.php:39
+msgid "View Source"
+msgstr "Se kilde"
diff --git a/viewsrc/lang/nb-no/strings.php b/viewsrc/lang/nb-no/strings.php
index cbd2bfd56..4528985f9 100644
--- a/viewsrc/lang/nb-no/strings.php
+++ b/viewsrc/lang/nb-no/strings.php
@@ -1,3 +1,9 @@
-<?php
-
-$a->strings["View Source"] = "";
+<?php
+
+if(! function_exists("string_plural_select_nb_no")) {
+function string_plural_select_nb_no($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["View Source"] = "Se kilde";

From 30515aa8aa935e4d03ddff6b43daa825e883a61e Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 09:28:34 +0200
Subject: [PATCH 19/21] added buglink addon ZH-CN translation THX steve jobs

---
 buglink/lang/zh-cn/messages.po | 24 ++++++++++++++++++++++++
 buglink/lang/zh-cn/strings.php | 12 +++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 buglink/lang/zh-cn/messages.po

diff --git a/buglink/lang/zh-cn/messages.po b/buglink/lang/zh-cn/messages.po
new file mode 100644
index 000000000..bc3c9e1a1
--- /dev/null
+++ b/buglink/lang/zh-cn/messages.po
@@ -0,0 +1,24 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+# steve jobs <vicdorke@gmail.com>, 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: 2020-06-10 12:31+0000\n"
+"Last-Translator: steve jobs <vicdorke@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: buglink.php:15
+msgid "Report Bug"
+msgstr "报告错误"
diff --git a/buglink/lang/zh-cn/strings.php b/buglink/lang/zh-cn/strings.php
index e70c02236..520c0d091 100644
--- a/buglink/lang/zh-cn/strings.php
+++ b/buglink/lang/zh-cn/strings.php
@@ -1,3 +1,9 @@
-<?php
-
-$a->strings["Report Bug"] = "报案程序错误";
+<?php
+
+if(! function_exists("string_plural_select_zh_cn")) {
+function string_plural_select_zh_cn($n){
+	$n = intval($n);
+	return 0;;
+}}
+;
+$a->strings["Report Bug"] = "报告错误";

From 177b45d83c85681bd15aeda590a527ce170af83f Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 09:30:17 +0200
Subject: [PATCH 20/21] irc addon ZH CN translation update THX steve jobs

---
 irc/lang/zh-cn/messages.po | 68 ++++++++++++++++++++++++++++++++++++++
 irc/lang/zh-cn/strings.php | 27 ++++++++++-----
 2 files changed, 86 insertions(+), 9 deletions(-)
 create mode 100644 irc/lang/zh-cn/messages.po

diff --git a/irc/lang/zh-cn/messages.po b/irc/lang/zh-cn/messages.po
new file mode 100644
index 000000000..46714652d
--- /dev/null
+++ b/irc/lang/zh-cn/messages.po
@@ -0,0 +1,68 @@
+# ADDON irc
+# Copyright (C)
+# This file is distributed under the same license as the Friendica irc addon package.
+# 
+# 
+# Translators:
+# steve jobs <vicdorke@gmail.com>, 2020
+# 朱陈锬 <tangenters@outlook.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-08 13:17+0200\n"
+"PO-Revision-Date: 2020-06-10 12:33+0000\n"
+"Last-Translator: steve jobs <vicdorke@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: irc.php:37
+msgid "IRC Settings"
+msgstr "IRC 设置"
+
+#: irc.php:38
+msgid ""
+"Here you can change the system wide settings for the channels to "
+"automatically join and access via the side bar. Note the changes you do "
+"here, only effect the channel selection if you are logged in."
+msgstr "在这里，您可以更改系统范围内的设置，以便通过侧栏自动连接和访问频道。请注意此处所做的更改，仅当您登录时才影响频道选择。"
+
+#: irc.php:39 irc.php:136
+msgid "Save Settings"
+msgstr "保存设置"
+
+#: irc.php:40 irc.php:137
+msgid "Channel(s) to auto connect (comma separated)"
+msgstr "要自动连接的通道（逗号分隔）"
+
+#: irc.php:40 irc.php:137
+msgid ""
+"List of channels that shall automatically connected to when the app is "
+"launched."
+msgstr "应用程序启动时应自动连接的频道列表。"
+
+#: irc.php:41 irc.php:138
+msgid "Popular Channels (comma separated)"
+msgstr "热门频道 (逗号分隔)"
+
+#: irc.php:41 irc.php:138
+msgid ""
+"List of popular channels, will be displayed at the side and hotlinked for "
+"easy joining."
+msgstr "热门频道列表将显示在侧边，并提供链接以方便加入。"
+
+#: irc.php:57 irc.php:128
+msgid "IRC settings saved."
+msgstr "IRC 设置已保存。"
+
+#: irc.php:62
+msgid "IRC Chatroom"
+msgstr "IRC 聊天室"
+
+#: irc.php:90
+msgid "Popular Channels"
+msgstr "热门频道"
diff --git a/irc/lang/zh-cn/strings.php b/irc/lang/zh-cn/strings.php
index e526182f5..4268cd1e7 100644
--- a/irc/lang/zh-cn/strings.php
+++ b/irc/lang/zh-cn/strings.php
@@ -1,9 +1,18 @@
-<?php
-
-$a->strings["IRC Settings"] = "IRC设置";
-$a->strings["Channel(s) to auto connect (comma separated)"] = "频道要自动地连接（逗号分隔）";
-$a->strings["Popular Channels (comma separated)"] = "流行频道（逗号分隔）";
-$a->strings["Submit"] = "提交";
-$a->strings["IRC settings saved."] = "IRC设置保存了。";
-$a->strings["IRC Chatroom"] = "IRC聊间";
-$a->strings["Popular Channels"] = "流行频道";
+<?php
+
+if(! function_exists("string_plural_select_zh_cn")) {
+function string_plural_select_zh_cn($n){
+	$n = intval($n);
+	return 0;;
+}}
+;
+$a->strings["IRC Settings"] = "IRC 设置";
+$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "在这里，您可以更改系统范围内的设置，以便通过侧栏自动连接和访问频道。请注意此处所做的更改，仅当您登录时才影响频道选择。";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "要自动连接的通道（逗号分隔）";
+$a->strings["List of channels that shall automatically connected to when the app is launched."] = "应用程序启动时应自动连接的频道列表。";
+$a->strings["Popular Channels (comma separated)"] = "热门频道 (逗号分隔)";
+$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "热门频道列表将显示在侧边，并提供链接以方便加入。";
+$a->strings["IRC settings saved."] = "IRC 设置已保存。";
+$a->strings["IRC Chatroom"] = "IRC 聊天室";
+$a->strings["Popular Channels"] = "热门频道";

From 67053496a738a7df6b28236eae7ba2c1b2a2ced8 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 15 Jun 2020 09:31:51 +0200
Subject: [PATCH 21/21] twiter addon ZH CN translation update THX steve jobs

---
 twitter/lang/zh-cn/messages.po | 134 +++++++++++++++++++++++++++++++++
 twitter/lang/zh-cn/strings.php |  55 ++++++++------
 2 files changed, 165 insertions(+), 24 deletions(-)
 create mode 100644 twitter/lang/zh-cn/messages.po

diff --git a/twitter/lang/zh-cn/messages.po b/twitter/lang/zh-cn/messages.po
new file mode 100644
index 000000000..b6757faf2
--- /dev/null
+++ b/twitter/lang/zh-cn/messages.po
@@ -0,0 +1,134 @@
+# ADDON twitter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica twitter addon package.
+# 
+# 
+# Translators:
+# steve jobs <vicdorke@gmail.com>, 2020
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-06-02 10:25+0700\n"
+"PO-Revision-Date: 2020-06-10 14:20+0000\n"
+"Last-Translator: steve jobs <vicdorke@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: twitter.php:195
+msgid "Post to Twitter"
+msgstr "发帖到Twitter"
+
+#: twitter.php:236
+msgid ""
+"You submitted an empty PIN, please Sign In with Twitter again to get a new "
+"one."
+msgstr "您提交的PIN为空，请重新登录Twitter获取新PIN。"
+
+#: twitter.php:263
+msgid "Twitter settings updated."
+msgstr "已更新Twitter设置。"
+
+#: twitter.php:293 twitter.php:297
+msgid "Twitter Import/Export/Mirror"
+msgstr "Twitter导入/导出/镜像"
+
+#: twitter.php:304
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "找不到Twitter的使用者密钥。请与您的站点管理员联系。"
+
+#: twitter.php:316
+msgid ""
+"At this Friendica instance the Twitter addon was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "在此Friendica实例中，Twitter插件已启用，但您尚未将您的帐户连接到您的Twitter帐户。要执行此操作，请单击下面的按钮从Twitter获取PIN，您必须将其复制到下面的输入框中并提交表单。只有您的公共帖子才会发布到Twitter上。"
+
+#: twitter.php:317
+msgid "Log in with Twitter"
+msgstr "使用Twitter登录"
+
+#: twitter.php:319
+msgid "Copy the PIN from Twitter here"
+msgstr "将Twitter上的PIN复制到此处"
+
+#: twitter.php:324 twitter.php:366 twitter.php:636
+msgid "Save Settings"
+msgstr "保存设置"
+
+#: twitter.php:336
+msgid "Currently connected to: "
+msgstr "当前连接到："
+
+#: twitter.php:337
+msgid "Disconnect"
+msgstr "断开连接"
+
+#: twitter.php:347
+msgid "Allow posting to Twitter"
+msgstr "允許發佈到Twitter"
+
+#: twitter.php:347
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated Twitter account. You can choose to do so by default (here) or for"
+" every posting separately in the posting options when writing the entry."
+msgstr "如果启用，您所有的公开帖子都可以发布到关联的Twitter帐户。在写入条目时，您可以选择默认(此处)，也可以在过帐选项中分别为每个过帐选择这样做。"
+
+#: twitter.php:350
+msgid ""
+"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "注意：由于您的隐私设置(向未知观众隐藏您的个人资料详细信息？)。转发到Twitter的公共帖子中可能包含的链接将把访问者引导到一个空白页面，通知访问者访问您的个人资料已受到限制。"
+
+#: twitter.php:353
+msgid "Send public postings to Twitter by default"
+msgstr "默认情况下将公共帖子发送到Twitter"
+
+#: twitter.php:356
+msgid "Mirror all posts from twitter that are no replies"
+msgstr "镜像来自Twitter的所有未回复的帖子"
+
+#: twitter.php:359
+msgid "Import the remote timeline"
+msgstr "导入远程时间线"
+
+#: twitter.php:362
+msgid "Automatically create contacts"
+msgstr "自动创建联系人"
+
+#: twitter.php:362
+msgid ""
+"This will automatically create a contact in Friendica as soon as you receive"
+" a message from an existing contact via the Twitter network. If you do not "
+"enable this, you need to manually add those Twitter contacts in Friendica "
+"from whom you would like to see posts here. However if enabled, you cannot "
+"merely remove a twitter contact from the Friendica contact list, as it will "
+"recreate this contact when they post again."
+msgstr "一旦您通过Twitter网络收到来自现有联系人的消息，这将在Friendica中自动创建一个联系人。如果您不启用此功能，则需要在Friendica中手动添加您希望在此处查看其帖子的Twitter联系人。但是，如果启用，您不能仅将Twitter联系人从Friendica联系人列表中删除，因为它会在他们再次发帖时重新创建此联系人。"
+
+#: twitter.php:614
+msgid "Twitter post failed. Queued for retry."
+msgstr "推特发帖失败。已排队等待重试。"
+
+#: twitter.php:628
+msgid "Settings updated."
+msgstr "设置已更新。"
+
+#: twitter.php:638
+msgid "Consumer key"
+msgstr "使用者密钥"
+
+#: twitter.php:639
+msgid "Consumer secret"
+msgstr "使用者机密"
diff --git a/twitter/lang/zh-cn/strings.php b/twitter/lang/zh-cn/strings.php
index 402534c1e..142679526 100644
--- a/twitter/lang/zh-cn/strings.php
+++ b/twitter/lang/zh-cn/strings.php
@@ -1,24 +1,31 @@
-<?php
-
-$a->strings["Post to Twitter"] = "发送到在Twitter";
-$a->strings["Twitter settings updated."] = "Twitter设置更新了。";
-$a->strings["Twitter Posting Settings"] = "Twitter发送设置";
-$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "找不到Twitter的消费钥匙双。请联系您的网页行政人员。";
-$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的<strong>公开</strong>文章被发送到Twitter。";
-$a->strings["Log in with Twitter"] = "用Twitter登记";
-$a->strings["Copy the PIN from Twitter here"] = "复制Twitter密码这儿";
-$a->strings["Submit"] = "提交";
-$a->strings["Currently connected to: "] = "现在连接到：";
-$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "如果使可用的都您<strong>公开的</strong>文章会被发送到有关的Twitter账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>注意</strong>：由于您的隐私设置（<em>隐藏您的简介内容为生人？</em>）环节包括在转播到Twitter的条文可能通空白页通知看者看您的简介有限。";
-$a->strings["Allow posting to Twitter"] = "允许发送到Twitter";
-$a->strings["Send public postings to Twitter by default"] = "默认地发送公开文章到Twitter";
-$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "复制所有文章从twitter除了回答或复准文以外";
-$a->strings["Shortening method that optimizes the tweet"] = "缩短方法优化缩短方法优化准文";
-$a->strings["Send linked #-tags and @-names to Twitter"] = "转播连接的#标签盒@名到Twitter";
-$a->strings["Clear OAuth configuration"] = "清理出OAuth设置";
-$a->strings["Settings updated."] = "设置跟新了";
-$a->strings["Consumer key"] = "钥匙(Consumer key)";
-$a->strings["Consumer secret"] = "密码(Consumer secret)";
-$a->strings["Name of the Twitter Application"] = "Twitter应用名";
-$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "选择这个为避免复制文章从~friendica回归~friendica";
+<?php
+
+if(! function_exists("string_plural_select_zh_cn")) {
+function string_plural_select_zh_cn($n){
+	$n = intval($n);
+	return 0;;
+}}
+;
+$a->strings["Post to Twitter"] = "发帖到Twitter";
+$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "您提交的PIN为空，请重新登录Twitter获取新PIN。";
+$a->strings["Twitter settings updated."] = "已更新Twitter设置。";
+$a->strings["Twitter Import/Export/Mirror"] = "Twitter导入/导出/镜像";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "找不到Twitter的使用者密钥。请与您的站点管理员联系。";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "在此Friendica实例中，Twitter插件已启用，但您尚未将您的帐户连接到您的Twitter帐户。要执行此操作，请单击下面的按钮从Twitter获取PIN，您必须将其复制到下面的输入框中并提交表单。只有您的公共帖子才会发布到Twitter上。";
+$a->strings["Log in with Twitter"] = "使用Twitter登录";
+$a->strings["Copy the PIN from Twitter here"] = "将Twitter上的PIN复制到此处";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["Currently connected to: "] = "当前连接到：";
+$a->strings["Disconnect"] = "断开连接";
+$a->strings["Allow posting to Twitter"] = "允許發佈到Twitter";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "如果启用，您所有的公开帖子都可以发布到关联的Twitter帐户。在写入条目时，您可以选择默认(此处)，也可以在过帐选项中分别为每个过帐选择这样做。";
+$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "注意：由于您的隐私设置(向未知观众隐藏您的个人资料详细信息？)。转发到Twitter的公共帖子中可能包含的链接将把访问者引导到一个空白页面，通知访问者访问您的个人资料已受到限制。";
+$a->strings["Send public postings to Twitter by default"] = "默认情况下将公共帖子发送到Twitter";
+$a->strings["Mirror all posts from twitter that are no replies"] = "镜像来自Twitter的所有未回复的帖子";
+$a->strings["Import the remote timeline"] = "导入远程时间线";
+$a->strings["Automatically create contacts"] = "自动创建联系人";
+$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "一旦您通过Twitter网络收到来自现有联系人的消息，这将在Friendica中自动创建一个联系人。如果您不启用此功能，则需要在Friendica中手动添加您希望在此处查看其帖子的Twitter联系人。但是，如果启用，您不能仅将Twitter联系人从Friendica联系人列表中删除，因为它会在他们再次发帖时重新创建此联系人。";
+$a->strings["Twitter post failed. Queued for retry."] = "推特发帖失败。已排队等待重试。";
+$a->strings["Settings updated."] = "设置已更新。";
+$a->strings["Consumer key"] = "使用者密钥";
+$a->strings["Consumer secret"] = "使用者机密";