diff --git a/blackout/lang/fi-fi/messages.po b/blackout/lang/fi-fi/messages.po
index 3721fb1c..09f2e976 100644
--- a/blackout/lang/fi-fi/messages.po
+++ b/blackout/lang/fi-fi/messages.po
@@ -6,13 +6,14 @@
 # Translators:
 # Kris, 2018
 # Kris, 2018
+# Samuli Valavuo <svalavuo@gmail.com>, 2018
 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-04-17 19:15+0000\n"
-"Last-Translator: Kris\n"
+"PO-Revision-Date: 2018-05-04 06:49+0000\n"
+"Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +31,7 @@ msgstr "Uudelleenohjaus URL-osoite"
 
 #: blackout.php:100
 msgid "all your visitors from the web will be redirected to this URL"
-msgstr ""
+msgstr "kaikki kävijät uudelleenohjataan tähän URL-osoitteeseen"
 
 #: blackout.php:101
 msgid "Begin of the Blackout"
@@ -50,4 +51,4 @@ msgstr "Blackout loppuu"
 msgid ""
 "The end-date is prior to the start-date of the blackout, you should fix "
 "this."
-msgstr ""
+msgstr "Blackoutin päättymispäivä on ennen alkamispäivää, korjaa tämä."
diff --git a/blackout/lang/fi-fi/strings.php b/blackout/lang/fi-fi/strings.php
index 834b295d..898e730f 100644
--- a/blackout/lang/fi-fi/strings.php
+++ b/blackout/lang/fi-fi/strings.php
@@ -7,8 +7,8 @@ function string_plural_select_fi_fi($n){
 ;
 $a->strings["Save Settings"] = "Tallenna asetukset";
 $a->strings["Redirect URL"] = "Uudelleenohjaus URL-osoite";
-$a->strings["all your visitors from the web will be redirected to this URL"] = "";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "kaikki kävijät uudelleenohjataan tähän URL-osoitteeseen";
 $a->strings["Begin of the Blackout"] = "Blackout alkaa";
 $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"] = "formaati on <em>VVVV</em> vuosi, <em>KK</em> kuukausi, <em>PP</em> päivä, <em>tt</em> tunti ja <em>mm</em> minuutti";
 $a->strings["End of the Blackout"] = "Blackout loppuu";
-$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "Blackoutin päättymispäivä on ennen alkamispäivää, korjaa tämä.";
diff --git a/diaspora/lang/zh-cn/messages.po b/diaspora/lang/zh-cn/messages.po
index c0a4978e..30a08e05 100644
--- a/diaspora/lang/zh-cn/messages.po
+++ b/diaspora/lang/zh-cn/messages.po
@@ -5,13 +5,14 @@
 # 
 # Translators:
 # mytbk <mytbk920423@gmail.com>, 2017
+# 朱陈锬 <tangenters@outlook.com>, 2018
 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-09-26 07:02+0000\n"
-"Last-Translator: mytbk <mytbk920423@gmail.com>\n"
+"PO-Revision-Date: 2018-05-04 13:01+0000\n"
+"Last-Translator: 朱陈锬 <tangenters@outlook.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"
diff --git a/xmpp/lang/zh-cn/messages.po b/xmpp/lang/zh-cn/messages.po
new file mode 100644
index 00000000..c9710f50
--- /dev/null
+++ b/xmpp/lang/zh-cn/messages.po
@@ -0,0 +1,58 @@
+# ADDON xmpp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: 朱陈锬 <tangenters@outlook.com>, 2018\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/Friendica/teams/12172/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"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr "XMPP 设置已更新。"
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr "XMPP-聊天 (Jabber)"
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr "启用网页聊天"
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr "个人凭证"
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH 主机"
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr "保存设置"
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr "使用中央用户库"
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr "设置已更新。"
diff --git a/xmpp/lang/zh-cn/strings.php b/xmpp/lang/zh-cn/strings.php
new file mode 100644
index 00000000..971b8470
--- /dev/null
+++ b/xmpp/lang/zh-cn/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_zh_cn")) {
+function string_plural_select_zh_cn($n){
+	return 0;;
+}}
+;
+$a->strings["XMPP settings updated."] = "XMPP 设置已更新。";
+$a->strings["XMPP-Chat (Jabber)"] = "XMPP-聊天 (Jabber)";
+$a->strings["Enable Webchat"] = "启用网页聊天";
+$a->strings["Individual Credentials"] = "个人凭证";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH 主机";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["Use central userbase"] = "使用中央用户库";
+$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "";
+$a->strings["Settings updated."] = "设置已更新。";