diff --git a/diaspora/lang/zh-cn/messages.po b/diaspora/lang/zh-cn/messages.po deleted file mode 100644 index beb0d17a..00000000 --- a/diaspora/lang/zh-cn/messages.po +++ /dev/null @@ -1,62 +0,0 @@ -# ADDON diaspora -# Copyright (C) -# This file is distributed under the same license as the Friendica diaspora addon package. -# -# -# Translators: -# mytbk , 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-09-26 07:02+0000\n" -"Last-Translator: mytbk \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" - -#: diaspora.php:37 -msgid "Post to Diaspora" -msgstr "发到 Diaspora" - -#: diaspora.php:142 -msgid "" -"Can't login to your Diaspora account. Please check username and password and" -" ensure you used the complete address (including http...)" -msgstr "无法登录到你的 Diaspora 账户。请检查用户名和密码并确保你用了完整的地址（包括http...）" - -#: diaspora.php:149 diaspora.php:153 -msgid "Diaspora Export" -msgstr "Diaspora 导出" - -#: diaspora.php:163 -msgid "Enable Diaspora Post Plugin" -msgstr "启用 Diaspora 发文插件" - -#: diaspora.php:168 -msgid "Diaspora username" -msgstr "Diaspora 用户名" - -#: diaspora.php:173 -msgid "Diaspora password" -msgstr "Diaspora 密码" - -#: diaspora.php:178 -msgid "Diaspora site URL" -msgstr "Diaspora 站点 URL" - -#: diaspora.php:183 -msgid "Post to Diaspora by default" -msgstr "默认发文到 Diaspora" - -#: diaspora.php:189 -msgid "Save Settings" -msgstr "保存设置" - -#: diaspora.php:324 -msgid "Diaspora post failed. Queued for retry." -msgstr "Diaspora 发文失败。已经放入队列以重试。" diff --git a/diaspora/lang/zh-cn/strings.php b/diaspora/lang/zh-cn/strings.php deleted file mode 100644 index 47c0f556..00000000 --- a/diaspora/lang/zh-cn/strings.php +++ /dev/null @@ -1,17 +0,0 @@ -strings["Post to Diaspora"] = "发到 Diaspora"; -$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "无法登录到你的 Diaspora 账户。请检查用户名和密码并确保你用了完整的地址（包括http...）"; -$a->strings["Diaspora Export"] = "Diaspora 导出"; -$a->strings["Enable Diaspora Post Plugin"] = "启用 Diaspora 发文插件"; -$a->strings["Diaspora username"] = "Diaspora 用户名"; -$a->strings["Diaspora password"] = "Diaspora 密码"; -$a->strings["Diaspora site URL"] = "Diaspora 站点 URL"; -$a->strings["Post to Diaspora by default"] = "默认发文到 Diaspora"; -$a->strings["Save Settings"] = "保存设置"; -$a->strings["Diaspora post failed. Queued for retry."] = "Diaspora 发文失败。已经放入队列以重试。"; diff --git a/securemail/securemail.php b/securemail/securemail.php index b20eab9c..79f5e2da 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -60,7 +60,7 @@ function securemail_settings(App &$a, &$s){ $t = get_markup_template('admin.tpl', 'addon/securemail/'); - $s .= replace_macros($t, array( + $s = replace_macros($t, array( '$title' => t('"Secure Mail" Settings'), '$submit' => t('Save Settings'), '$test' => t('Save and send test'), //NOTE: update also in 'post' diff --git a/unicode_smilies/README.md b/unicode_smilies/README.md deleted file mode 100644 index 6b659d97..00000000 --- a/unicode_smilies/README.md +++ /dev/null @@ -1,9 +0,0 @@ -Unicode Smilies -=============== - -This addon changes the display of the default smilies supported by Friendica. -Instead of the images included, it uses the unicode representations instead. - -* On Linux use e.g. the [https://github.com/eosrei/emojione-color-font](Emojione-Color-font) to see them in color. -* For Windows 7 see [https://superuser.com/questions/1094188/how-do-i-display-the-latest-unicode-characters-esp-emoji-in-windows-browsers](this guide) how to enable these emoticons in Chrome. - diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php index ec1561ab..583f6c97 100644 --- a/unicode_smilies/unicode_smilies.php +++ b/unicode_smilies/unicode_smilies.php @@ -25,7 +25,7 @@ function unicode_smilies_smilies(&$a,&$b) { Smilies::add($b, ':-D', '😁'); Smilies::add($b, ':D', '😁'); Smilies::add($b, ';-)', '😉'); - Smilies::add($b, ';)', '😉'); + // Smilies::add($b, ';)', '😉'); // Deactivated since this leads to disturbed html entities Smilies::add($b, ':-P', '😛'); Smilies::add($b, ':-p', '😛'); Smilies::add($b, ':-O', '😮');