Browse Source

Merge 2020.03 into develop

pull/972/head
Tobias Diekershoff 2 years ago
parent
commit
96925a3a75
  1. 4
      advancedcontentfilter/advancedcontentfilter.php
  2. 176
      advancedcontentfilter/lang/ru/messages.po
  3. 41
      advancedcontentfilter/lang/ru/strings.php
  4. 64
      advancedcontentfilter/lang/zh-cn/messages.po
  5. 60
      advancedcontentfilter/lang/zh-cn/strings.php
  6. 2
      advancedcontentfilter/src/middlewares.php
  7. 43
      blockbot/lang/ru/messages.po
  8. 13
      blockbot/lang/ru/strings.php
  9. 37
      geonames/lang/fr/messages.po
  10. 18
      geonames/lang/fr/strings.php
  11. 48
      gnot/lang/fr/messages.po
  12. 22
      gnot/lang/fr/strings.php
  13. 68
      irc/lang/fr/messages.po
  14. 27
      irc/lang/fr/strings.php
  15. 57
      js_upload/lang/fr/messages.po
  16. 28
      js_upload/lang/fr/strings.php
  17. 6
      pumpio/pumpio.php
  18. 21
      smileybutton/lang/fr/messages.po
  19. 12
      smileybutton/lang/fr/strings.php
  20. 44
      superblock/lang/fr/messages.po
  21. 24
      superblock/lang/fr/strings.php
  22. 74
      tictac/lang/fr/messages.po
  23. 34
      tictac/lang/fr/strings.php
  24. 3
      twitter/twitter.php

4
advancedcontentfilter/advancedcontentfilter.php

@ -330,7 +330,7 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request)
try {
$fields = advancedcontentfilter_build_fields($data);
} catch (Exception $e) {
throw new HTTPException\BadRequestException($e->getMessage(), 0, $e);
throw new HTTPException\BadRequestException($e->getMessage(), $e);
}
if (empty($fields['name']) || empty($fields['expression'])) {
@ -368,7 +368,7 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
try {
$fields = advancedcontentfilter_build_fields($data);
} catch (Exception $e) {
throw new HTTPException\BadRequestException($e->getMessage(), 0, $e);
throw new HTTPException\BadRequestException($e->getMessage(), $e);
}
if (!DBA::update('advancedcontentfilter_rules', $fields, ['id' => $args['id']])) {

176
advancedcontentfilter/lang/ru/messages.po

@ -0,0 +1,176 @@
# ADDON advancedcontentfilter
# Copyright (C)
# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
#
#
# Translators:
# Alexey Adamov <2077@tutanota.com>, 2019
# Eugene Veresk <eugene.vereshchagin@gmail.com>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 04:04+0200\n"
"PO-Revision-Date: 2018-05-24 06:41+0000\n"
"Last-Translator: Eugene Veresk <eugene.vereshchagin@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"
#: advancedcontentfilter.php:134
#, php-format
msgid "Filtered by rule: %s"
msgstr "Отфильтровано по правилу: %s"
#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
msgid "Advanced Content Filter"
msgstr "Расширенный фильтр содержимого"
#: advancedcontentfilter.php:203
msgid "Back to Addon Settings"
msgstr "Вернуться к настройкам дополнений"
#: advancedcontentfilter.php:205
msgid "Add a Rule"
msgstr "Добавить правило"
#: advancedcontentfilter.php:206
msgid "Help"
msgstr "Помощь"
#: advancedcontentfilter.php:207
msgid ""
"Add and manage your personal content filter rules in this screen. Rules have"
" a name and an arbitrary expression that will be matched against post data. "
"For a complete reference of the available operations and variables, check "
"the <a href=\"advancedcontentfilter/help\">help page</a>."
msgstr ""
"Добавляйте и управляйте своими собственными фильтрами на этой странице. У "
"правил есть имя и произвольное выражение, которое будет сопоставляться с "
"данными поста. Для полной ссылки на доступные операции и переменные, "
"посмотрите <a href=\"advancedcontentfilter/help\">страницу справки</a>."
#: advancedcontentfilter.php:208
msgid "Your rules"
msgstr "Ваши правила"
#: advancedcontentfilter.php:209
msgid ""
"You have no rules yet! Start adding one by clicking on the button above next"
" to the title."
msgstr ""
"У Вас нет ни одного правила. Начните добавление первого с нажатия на кнопку "
"выше, рядом с названием."
#: advancedcontentfilter.php:210
msgid "Disabled"
msgstr "Отключено"
#: advancedcontentfilter.php:211
msgid "Enabled"
msgstr "Включено"
#: advancedcontentfilter.php:212
msgid "Disable this rule"
msgstr "Отключить это правило"
#: advancedcontentfilter.php:213
msgid "Enable this rule"
msgstr "Включить это правило"
#: advancedcontentfilter.php:214
msgid "Edit this rule"
msgstr "Изменить это правило"
#: advancedcontentfilter.php:215
msgid "Edit the rule"
msgstr "Изменить правило"
#: advancedcontentfilter.php:216
msgid "Save this rule"
msgstr "Сохранить это правило"
#: advancedcontentfilter.php:217
msgid "Delete this rule"
msgstr "Удалить это правило"
#: advancedcontentfilter.php:218
msgid "Rule"
msgstr "Правило"
#: advancedcontentfilter.php:219
msgid "Close"
msgstr "Закрыть"
#: advancedcontentfilter.php:220
msgid "Add new rule"
msgstr "Добавить новое правило"
#: advancedcontentfilter.php:221
msgid "Rule Name"
msgstr "Название правила"
#: advancedcontentfilter.php:222
msgid "Rule Expression"
msgstr "Содержание правила"
#: advancedcontentfilter.php:223
msgid ""
"<p>Examples:</p><ul><li><pre>author_link == "
"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
msgstr ""
"<p>Примеры:</p><ul><li><pre>author_link == "
"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
#: advancedcontentfilter.php:224
msgid "Cancel"
msgstr "Отмена"
#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
msgid "You must be logged in to use this method"
msgstr "Вы должны авторизоваться для использования этого метода"
#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
#: advancedcontentfilter.php:379
msgid "Invalid form security token, please refresh the page."
msgstr "Неверный ключ, пожалуйста, перезагрузите страницу"
#: advancedcontentfilter.php:328
msgid "The rule name and expression are required."
msgstr "Требуется ввести название и значение правила."
#: advancedcontentfilter.php:340
msgid "Rule successfully added"
msgstr "Правило успешно добавлено"
#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
msgid "Rule doesn't exist or doesn't belong to you."
msgstr "Правило не найдено или доступ к нему закрыт"
#: advancedcontentfilter.php:369
msgid "Rule successfully updated"
msgstr "Правило успешно обновлено"
#: advancedcontentfilter.php:390
msgid "Rule successfully deleted"
msgstr "Правило успешно удалено"
#: advancedcontentfilter.php:400
msgid "Missing argument: guid."
msgstr "Отсутствующий аргумент: guid."
#: advancedcontentfilter.php:406
#, php-format
msgid "Unknown post with guid: %s"
msgstr "Неизвестный пост в ID: %s"
#: src/middlewares.php:28
msgid "Method not found"
msgstr "Метод не найден"

41
advancedcontentfilter/lang/ru/strings.php

@ -0,0 +1,41 @@
<?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["Filtered by rule: %s"] = "Отфильтровано по правилу: %s";
$a->strings["Advanced Content Filter"] = "Расширенный фильтр содержимого";
$a->strings["Back to Addon Settings"] = "Вернуться к настройкам дополнений";
$a->strings["Add a Rule"] = "Добавить правило";
$a->strings["Help"] = "Помощь";
$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Добавляйте и управляйте своими собственными фильтрами на этой странице. У правил есть имя и произвольное выражение, которое будет сопоставляться с данными поста. Для полной ссылки на доступные операции и переменные, посмотрите <a href=\"advancedcontentfilter/help\">страницу справки</a>.";
$a->strings["Your rules"] = "Ваши правила";
$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "У Вас нет ни одного правила. Начните добавление первого с нажатия на кнопку выше, рядом с названием.";
$a->strings["Disabled"] = "Отключено";
$a->strings["Enabled"] = "Включено";
$a->strings["Disable this rule"] = "Отключить это правило";
$a->strings["Enable this rule"] = "Включить это правило";
$a->strings["Edit this rule"] = "Изменить это правило";
$a->strings["Edit the rule"] = "Изменить правило";
$a->strings["Save this rule"] = "Сохранить это правило";
$a->strings["Delete this rule"] = "Удалить это правило";
$a->strings["Rule"] = "Правило";
$a->strings["Close"] = "Закрыть";
$a->strings["Add new rule"] = "Добавить новое правило";
$a->strings["Rule Name"] = "Название правила";
$a->strings["Rule Expression"] = "Содержание правила";
$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Примеры:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
$a->strings["Cancel"] = "Отмена";
$a->strings["You must be logged in to use this method"] = "Вы должны авторизоваться для использования этого метода";
$a->strings["Invalid form security token, please refresh the page."] = "Неверный ключ, пожалуйста, перезагрузите страницу";
$a->strings["The rule name and expression are required."] = "Требуется ввести название и значение правила.";
$a->strings["Rule successfully added"] = "Правило успешно добавлено";
$a->strings["Rule doesn't exist or doesn't belong to you."] = "Правило не найдено или доступ к нему закрыт";
$a->strings["Rule successfully updated"] = "Правило успешно обновлено";
$a->strings["Rule successfully deleted"] = "Правило успешно удалено";
$a->strings["Missing argument: guid."] = "Отсутствующий аргумент: guid.";
$a->strings["Unknown post with guid: %s"] = "Неизвестный пост в ID: %s";
$a->strings["Method not found"] = "Метод не найден";

64
advancedcontentfilter/lang/zh-cn/messages.po

@ -4,7 +4,7 @@
#
#
# Translators:
# Tom, 2020
# Tom <hxxtom@gmail.com>, 2020
#
#, fuzzy
msgid ""
@ -13,7 +13,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 04:04+0200\n"
"PO-Revision-Date: 2018-05-24 06:41+0000\n"
"Last-Translator: Tom, 2020\n"
"Last-Translator: Tom <hxxtom@gmail.com>, 2020\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"
@ -24,7 +24,7 @@ msgstr ""
#: advancedcontentfilter.php:134
#, php-format
msgid "Filtered by rule: %s"
msgstr ""
msgstr "通过规则过滤:%s"
#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
msgid "Advanced Content Filter"
@ -32,7 +32,7 @@ msgstr "高级内容过滤"
#: advancedcontentfilter.php:203
msgid "Back to Addon Settings"
msgstr ""
msgstr "返回扩展设置"
#: advancedcontentfilter.php:205
msgid "Add a Rule"
@ -49,119 +49,123 @@ msgid ""
"For a complete reference of the available operations and variables, check "
"the <a href=\"advancedcontentfilter/help\">help page</a>."
msgstr ""
"在此界面上添加和管理你的个人内容过滤规则。规则要有名称和能匹配帖子内容的任意表达式。完整可用的运算符和变量,请查看<a "
"href=\"advancedcontentfilter/help\">帮助页面</a>。"
#: advancedcontentfilter.php:208
msgid "Your rules"
msgstr ""
msgstr "你的规则"
#: advancedcontentfilter.php:209
msgid ""
"You have no rules yet! Start adding one by clicking on the button above next"
" to the title."
msgstr ""
msgstr "你还没有规则!点击标题上方的按钮开始新增规则。"
#: advancedcontentfilter.php:210
msgid "Disabled"
msgstr ""
msgstr "禁用"
#: advancedcontentfilter.php:211
msgid "Enabled"
msgstr ""
msgstr "启用"
#: advancedcontentfilter.php:212
msgid "Disable this rule"
msgstr ""
msgstr "禁用此规则"
#: advancedcontentfilter.php:213
msgid "Enable this rule"
msgstr ""
msgstr "启用此规则"
#: advancedcontentfilter.php:214
msgid "Edit this rule"
msgstr ""
msgstr "编辑此规则"
#: advancedcontentfilter.php:215
msgid "Edit the rule"
msgstr ""
msgstr "编辑规则"
#: advancedcontentfilter.php:216
msgid "Save this rule"
msgstr ""
msgstr "保存规则"
#: advancedcontentfilter.php:217
msgid "Delete this rule"
msgstr ""
msgstr "删除此规则"
#: advancedcontentfilter.php:218
msgid "Rule"
msgstr ""
msgstr "规则"
#: advancedcontentfilter.php:219
msgid "Close"
msgstr ""
msgstr "关闭"
#: advancedcontentfilter.php:220
msgid "Add new rule"
msgstr ""
msgstr "新增规则"
#: advancedcontentfilter.php:221
msgid "Rule Name"
msgstr ""
msgstr "规则名"
#: advancedcontentfilter.php:222
msgid "Rule Expression"
msgstr ""
msgstr "规则表达式"
#: advancedcontentfilter.php:223
msgid ""
"<p>Examples:</p><ul><li><pre>author_link == "
"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
msgstr ""
"<p>例子:</p><ul><li><pre>author_link == "
"'https://friendica.mrpetovan.com/profile/hypolite</pre></li><li>tags</li></ul>"
#: advancedcontentfilter.php:224
msgid "Cancel"
msgstr ""
msgstr "取消"
#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
msgid "You must be logged in to use this method"
msgstr ""
msgstr "使用此模式您必须先登录。"
#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
#: advancedcontentfilter.php:379
msgid "Invalid form security token, please refresh the page."
msgstr ""
msgstr "无效的安全令牌,请刷新页面。"
#: advancedcontentfilter.php:328
msgid "The rule name and expression are required."
msgstr ""
msgstr "规则名和表达式必填。"
#: advancedcontentfilter.php:340
msgid "Rule successfully added"
msgstr ""
msgstr "规则添加成功。"
#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
msgid "Rule doesn't exist or doesn't belong to you."
msgstr ""
msgstr "规则不存在或不属于你。"
#: advancedcontentfilter.php:369
msgid "Rule successfully updated"
msgstr ""
msgstr "规则更新成功"
#: advancedcontentfilter.php:390
msgid "Rule successfully deleted"
msgstr ""
msgstr "规则删除成功"
#: advancedcontentfilter.php:400
msgid "Missing argument: guid."
msgstr ""
msgstr "缺少参数:guid。"
#: advancedcontentfilter.php:406
#, php-format
msgid "Unknown post with guid: %s"
msgstr ""
msgstr "未知帖子 guid:%s"
#: src/middlewares.php:28
msgid "Method not found"
msgstr ""
msgstr "未找到模式"

60
advancedcontentfilter/lang/zh-cn/strings.php

@ -6,36 +6,36 @@ function string_plural_select_zh_cn($n){
return 0;;
}}
;
$a->strings["Filtered by rule: %s"] = "";
$a->strings["Filtered by rule: %s"] = "通过规则过滤:%s";
$a->strings["Advanced Content Filter"] = "高级内容过滤";
$a->strings["Back to Addon Settings"] = "";
$a->strings["Back to Addon Settings"] = "返回扩展设置";
$a->strings["Add a Rule"] = "添加规则";
$a->strings["Help"] = "帮助";
$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "";
$a->strings["Your rules"] = "";
$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "";
$a->strings["Disabled"] = "";
$a->strings["Enabled"] = "";
$a->strings["Disable this rule"] = "";
$a->strings["Enable this rule"] = "";
$a->strings["Edit this rule"] = "";
$a->strings["Edit the rule"] = "";
$a->strings["Save this rule"] = "";
$a->strings["Delete this rule"] = "";
$a->strings["Rule"] = "";
$a->strings["Close"] = "";
$a->strings["Add new rule"] = "";
$a->strings["Rule Name"] = "";
$a->strings["Rule Expression"] = "";
$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "";
$a->strings["Cancel"] = "";
$a->strings["You must be logged in to use this method"] = "";
$a->strings["Invalid form security token, please refresh the page."] = "";
$a->strings["The rule name and expression are required."] = "";
$a->strings["Rule successfully added"] = "";
$a->strings["Rule doesn't exist or doesn't belong to you."] = "";
$a->strings["Rule successfully updated"] = "";
$a->strings["Rule successfully deleted"] = "";
$a->strings["Missing argument: guid."] = "";
$a->strings["Unknown post with guid: %s"] = "";
$a->strings["Method not found"] = "";
$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "在此界面上添加和管理你的个人内容过滤规则。规则要有名称和能匹配帖子内容的任意表达式。完整可用的运算符和变量,请查看<a href=\"advancedcontentfilter/help\">帮助页面</a>";
$a->strings["Your rules"] = "你的规则";
$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "你还没有规则!点击标题上方的按钮开始新增规则。";
$a->strings["Disabled"] = "禁用";
$a->strings["Enabled"] = "启用";
$a->strings["Disable this rule"] = "禁用此规则";
$a->strings["Enable this rule"] = "启用此规则";
$a->strings["Edit this rule"] = "编辑此规则";
$a->strings["Edit the rule"] = "编辑规则";
$a->strings["Save this rule"] = "保存规则";
$a->strings["Delete this rule"] = "删除此规则";
$a->strings["Rule"] = "规则";
$a->strings["Close"] = "关闭";
$a->strings["Add new rule"] = "新增规则";
$a->strings["Rule Name"] = "规则名";
$a->strings["Rule Expression"] = "规则表达式";
$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>例子:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite</pre></li><li>tags</li></ul>";
$a->strings["Cancel"] = "取消";
$a->strings["You must be logged in to use this method"] = "使用此模式您必须先登录。";
$a->strings["Invalid form security token, please refresh the page."] = "无效的安全令牌,请刷新页面。";
$a->strings["The rule name and expression are required."] = "规则名和表达式必填。";
$a->strings["Rule successfully added"] = "规则添加成功。";
$a->strings["Rule doesn't exist or doesn't belong to you."] = "规则不存在或不属于你。";
$a->strings["Rule successfully updated"] = "规则更新成功";
$a->strings["Rule successfully deleted"] = "规则删除成功";
$a->strings["Missing argument: guid."] = "缺少参数:guid。";
$a->strings["Unknown post with guid: %s"] = "未知帖子 guid:%s";
$a->strings["Method not found"] = "未找到模式";

2
advancedcontentfilter/src/middlewares.php

@ -30,7 +30,7 @@ $container['errorHandler'] = function () {
$responseCode = 500;
if (is_a($exception, 'Friendica\Network\HTTPException')) {
$responseCode = $exception->httpcode;
$responseCode = $exception->getCode();
}
$errors['message'] = $exception->getMessage();

43
blockbot/lang/ru/messages.po

@ -0,0 +1,43 @@
# ADDON blockbot
# Copyright (C)
# This file is distributed under the same license as the Friendica blockbot addon package.
#
#
# Translators:
# Alexey Adamov <2077@tutanota.com>, 2019
# Eugene Veresk <eugene.vereshchagin@gmail.com>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-08-07 09:03+0200\n"
"PO-Revision-Date: 2019-08-07 07:43+0000\n"
"Last-Translator: Eugene Veresk <eugene.vereshchagin@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"
#: blockbot.php:35
msgid "Save Settings"
msgstr "Сохранить настройки"
#: blockbot.php:36
msgid "Allow \"good\" crawlers"
msgstr "Разрешить \"хороших\" поисковых роботов"
#: blockbot.php:37
msgid "Block GabSocial"
msgstr "Блокировать GabSocial"
#: blockbot.php:38
msgid "Training mode"
msgstr "Режим обучения"
#: blockbot.php:46
msgid "Settings updated."
msgstr "Настройки изменены"

13
blockbot/lang/ru/strings.php

@ -0,0 +1,13 @@
<?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["Save Settings"] = "Сохранить настройки";
$a->strings["Allow \"good\" crawlers"] = "Разрешить \"хороших\" поисковых роботов";
$a->strings["Block GabSocial"] = "Блокировать GabSocial";
$a->strings["Training mode"] = "Режим обучения";
$a->strings["Settings updated."] = "Настройки изменены";

37
geonames/lang/fr/messages.po

@ -0,0 +1,37 @@
# ADDON geonames
# Copyright (C)
# This file is distributed under the same license as the Friendica geonames addon package.
#
#
# Translators:
# ButterflyOfFire, 2020
# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
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-03-25 19:01+0000\n"
"Last-Translator: ButterflyOfFire\n"
"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: geonames.php:143
msgid "Geonames settings updated."
msgstr "Paramètres de Geonames mis à jour."
#: geonames.php:179
msgid "Geonames Settings"
msgstr "Paramètres Geonames"
#: geonames.php:181
msgid "Enable Geonames Addon"
msgstr ""
#: geonames.php:187
msgid "Submit"
msgstr ""

18
geonames/lang/fr/strings.php

@ -1,6 +1,12 @@
<?php
$a->strings["Geonames settings updated."] = "Réglages Geonames sauvés.";
$a->strings["Geonames Settings"] = "Réglages Geonames";
$a->strings["Enable Geonames Addon"] = "Activer Geonames";
$a->strings["Submit"] = "Envoyer";
<?php
if(! function_exists("string_plural_select_fr")) {
function string_plural_select_fr($n){
$n = intval($n);
return ($n > 1);;
}}
;
$a->strings["Geonames settings updated."] = "Paramètres de Geonames mis à jour.";
$a->strings["Geonames Settings"] = "Paramètres Geonames";
$a->strings["Enable Geonames Addon"] = "";
$a->strings["Submit"] = "";

48
gnot/lang/fr/messages.po

@ -0,0 +1,48 @@
# ADDON gnot
# Copyright (C)
# This file is distributed under the same license as the Friendica gnot addon package.
#
#
# Translators:
# ButterflyOfFire, 2020
# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
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-03-25 19:01+0000\n"
"Last-Translator: ButterflyOfFire\n"
"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: gnot.php:48
msgid "Gnot settings updated."
msgstr "Paramètres de Gnot mis à jour."
#: gnot.php:79
msgid "Gnot Settings"
msgstr "Paramètres Gnot"
#: gnot.php:81
msgid ""
"Allows threading of email comment notifications on Gmail and anonymising the"
" subject line."
msgstr ""
#: gnot.php:82
msgid "Enable this addon?"
msgstr ""
#: gnot.php:88
msgid "Submit"
msgstr ""
#: gnot.php:97
#, php-format
msgid "[Friendica:Notify] Comment to conversation #%d"
msgstr ""

22
gnot/lang/fr/strings.php

@ -1,8 +1,14 @@
<?php
$a->strings["Gnot settings updated."] = "Réglages Gnot sauvés.";
$a->strings["Gnot Settings"] = "Réglages Gnot";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Autorise l'arborescence des notifications de commentaires sur GMail, et rend la ligne 'Sujet' anonyme.";
$a->strings["Enable this addon?"] = "Activer cette extension?";
$a->strings["Submit"] = "Envoyer";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notification] Commentaire sur la conversation #%d";
<?php
if(! function_exists("string_plural_select_fr")) {
function string_plural_select_fr($n){
$n = intval($n);
return ($n > 1);;
}}
;
$a->strings["Gnot settings updated."] = "Paramètres de Gnot mis à jour.";
$a->strings["Gnot Settings"] = "Paramètres Gnot";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
$a->strings["Enable this addon?"] = "";
$a->strings["Submit"] = "";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "";

68
irc/lang/fr/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:
# ButterflyOfFire, 2020
# StefOfficiel <pichard.stephane@free.fr>, 2015
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-02-27 22:17+0000\n"
"Last-Translator: ButterflyOfFire\n"
"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: irc.php:37
msgid "IRC Settings"
msgstr "Paramètres de l'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 "Sauvegarder les paramètres"
#: 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.php:62
msgid "IRC Chatroom"
msgstr ""
#: irc.php:90
msgid "Popular Channels"
msgstr ""

27
irc/lang/fr/strings.php

@ -1,9 +1,18 @@
<?php
$a->strings["IRC Settings"] = "Réglages IRC";
$a->strings["Channel(s) to auto connect (comma separated)"] = "Canaux à rejoindre automatiquement (séparés par des virgules)";
$a->strings["Popular Channels (comma separated)"] = "Canaux populaires (séparés par des virgules)";
$a->strings["Submit"] = "Envoyer";
$a->strings["IRC settings saved."] = "Réglages IRC sauvés.";
$a->strings["IRC Chatroom"] = "Salon IRC";
$a->strings["Popular Channels"] = "Canaux populaires";
<?php
if(! function_exists("string_plural_select_fr")) {
function string_plural_select_fr($n){
$n = intval($n);
return ($n > 1);;
}}
;
$a->strings["IRC Settings"] = "Paramètres de l'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"] = "Sauvegarder les paramètres";
$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."] = "";
$a->strings["IRC Chatroom"] = "";
$a->strings["Popular Channels"] = "";

57
js_upload/lang/fr/messages.po

@ -0,0 +1,57 @@
# ADDON js_upload
# Copyright (C)
# This file is distributed under the same license as the Friendica js_upload addon package.
#
#
# Translators:
# ButterflyOfFire, 2020
# StefOfficiel <pichard.stephane@free.fr>, 2015
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-02-27 22:12+0000\n"
"Last-Translator: ButterflyOfFire\n"
"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: js_upload.php:43
msgid "Upload a file"
msgstr "Téléverser un fichier"
#: js_upload.php:44
msgid "Drop files here to upload"
msgstr "Glisser les fichiers ici pour uploader"
#: js_upload.php:45
msgid "Cancel"
msgstr "Annuler"
#: 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 ""

28
js_upload/lang/fr/strings.php

@ -1,11 +1,17 @@
<?php
$a->strings["Upload a file"] = "Téléverser un fichier";
$a->strings["Drop files here to upload"] = "Déposer des fichiers ici pour les téléverser";
$a->strings["Cancel"] = "Annuler";
$a->strings["Failed"] = "Échec";
$a->strings["No files were uploaded."] = "Aucun fichier n'a été téléversé.";
$a->strings["Uploaded file is empty"] = "Le fichier téléversé est vide";
$a->strings["Image exceeds size limit of "] = "L'image dépasse la taille maximale de ";
$a->strings["File has an invalid extension, it should be one of "] = "Le fichier a une extension invalide, elle devrait être parmi ";
$a->strings["Upload was cancelled, or server error encountered"] = "Téléversement annulé, ou erreur de serveur";
<?php
if(! function_exists("string_plural_select_fr")) {
function string_plural_select_fr($n){
$n = intval($n);
return ($n > 1);;
}}
;
$a->strings["Upload a file"] = "Téléverser un fichier";
$a->strings["Drop files here to upload"] = "Glisser les fichiers ici pour uploader";
$a->strings["Cancel"] = "Annuler";
$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"] = "";

6
pumpio/pumpio.php

@ -914,7 +914,7 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
}
}
Item::delete(['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
Item::markForDeletion(['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
if (DBA::isResult($r)) {
Logger::log("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
@ -1082,13 +1082,13 @@ function pumpio_dodelete(App $a, $uid, $self, $post, $own_id)
// Two queries for speed issues
$condition = ['uri' => $post->object->id, 'uid' => $uid];
if (Item::exists($condition)) {
Item::delete($condition);
Item::markForDeletion($condition);
return true;
}
$condition = ['extid' => $post->object->id, 'uid' => $uid];
if (Item::exists($condition)) {
Item::delete($condition);
Item::markForDeletion($condition);
return true;
}
return false;

21
smileybutton/lang/it/messages.po → smileybutton/lang/fr/messages.po

@ -4,33 +4,34 @@
#
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014
# ButterflyOfFire, 2020
# StefOfficiel <pichard.stephane@free.fr>, 2015
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-06-23 14:45+0200\n"
"PO-Revision-Date: 2017-09-20 06:08+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"PO-Revision-Date: 2020-02-27 22:14+0000\n"
"Last-Translator: ButterflyOfFire\n"
"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: smileybutton.php:269
msgid "Smileybutton settings"
msgstr "Impostazioni \"Bottone faccine\""
msgstr "Paramètres du bouton des Smileys"
#: smileybutton.php:272
msgid "You can hide the button and show the smilies directly."
msgstr "Puoi nascondere il bottone e mostrare le faccine direttamente."
msgstr ""
#: smileybutton.php:274
msgid "Hide the button"
msgstr "Nascondi il bottone"
msgstr "Cacher le bouton"
#: smileybutton.php:281
msgid "Save Settings"
msgstr "Salva Impostazioni"
msgstr ""

12
smileybutton/lang/fr/strings.php

@ -0,0 +1,12 @@
<?php
if(! function_exists("string_plural_select_fr")) {
function string_plural_select_fr($n){
$n = intval($n);
return ($n > 1);;
}}
;
$a->strings["Smileybutton settings"] = "Paramètres du bouton des Smileys";
$a->strings["You can hide the button and show the smilies directly."] = "";
$a->strings["Hide the button"] = "Cacher le bouton";
$a->strings["Save Settings"] = "";

44
superblock/lang/fr/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:
# ButterflyOfFire, 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-02-27 22:18+0000\n"
"Last-Translator: ButterflyOfFire\n"
"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: superblock.php:47 superblock.php:51
msgid "Superblock"
msgstr ""
#: superblock.php:54
msgid "Comma separated profile URLS to block"
msgstr ""
#: superblock.php:58
msgid "Save Settings"
msgstr "Sauvegarder les paramètres"
#: superblock.php:71
msgid "SUPERBLOCK Settings saved."
msgstr ""
#: superblock.php:144
msgid "Block Completely"
msgstr ""
#: superblock.php:165
msgid "superblock settings updated"
msgstr ""

24
superblock/lang/fr/strings.php

@ -1,10 +1,14 @@
<?php
$a->strings["\"Blockem\" Settings"] = "Réglages de Blockem";
$a->strings["Comma separated profile URLS to block"] = "Liste d'URLS de profils à bloquer, séparés par des virgules";
$a->strings["Submit"] = "Envoyer";
$a->strings["BLOCKEM Settings saved."] = "Réglages Blockem sauvés.";
$a->strings["Blocked %s - Click to open/close"] = "Bloqué %s - Cliquez pour ouvrir/fermer";
$a->strings["Unblock Author"] = "Débloquer l'auteur";
$a->strings["Block Author"] = "Bloquer l'auteur";
$a->strings["blockem settings updated"] = "Réglages blockem sauvés";
<?php
if(! function_exists("string_plural_select_fr")) {
function string_plural_select_fr($n){
$n = intval($n);
return ($n > 1);;
}}
;
$a->strings["Superblock"] = "";
$a->strings["Comma separated profile URLS to block"] = "";
$a->strings["Save Settings"] = "Sauvegarder les paramètres";
$a->strings["SUPERBLOCK Settings saved."] = "";
$a->strings["Block Completely"] = "";
$a->strings["superblock settings updated"] = "";

74
tictac/lang/fr/messages.po

@ -0,0 +1,74 @@
# ADDON tictac
# Copyright (C)
# This file is distributed under the same license as the Friendica tictac addon package.
#
#
# Translators:
# ButterflyOfFire, 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-02-27 22:16+0000\n"
"Last-Translator: ButterflyOfFire\n"
"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: tictac.php:20
msgid "Three Dimensional Tic-Tac-Toe"
msgstr ""
#: tictac.php:53
msgid "3D Tic-Tac-Toe"
msgstr ""
#: tictac.php:58
msgid "New game"
msgstr ""
#: tictac.php:59
msgid "New game with handicap"
msgstr ""
#: tictac.php:60
msgid ""
"Three dimensional tic-tac-toe is just like the traditional game except that "
"it is played on multiple levels simultaneously. "
msgstr ""
#: tictac.php:61
msgid ""
"In this case there are three levels. You win by getting three in a row on "
"any level, as well as up, down, and diagonally across the different levels."
msgstr ""
#: tictac.php:63
msgid ""
"The handicap game disables the center position on the middle level because "
"the player claiming this square often has an unfair advantage."
msgstr ""
#: tictac.php:182
msgid "You go first..."
msgstr ""
#: tictac.php:187
msgid "I'm going first this time..."
msgstr ""
#: tictac.php:193
msgid "You won!"
msgstr "Vous avez gagné !"
#: tictac.php:199 tictac.php:224
msgid "\"Cat\" game!"
msgstr ""
#: tictac.php:222
msgid "I won!"
msgstr "J’ai gagné !"

34
tictac/lang/fr/strings.php

@ -1,14 +1,20 @@
<?php
$a->strings["Three Dimensional Tic-Tac-Toe"] = "Morpion en trois dimensions";
$a->strings["3D Tic-Tac-Toe"] = "Morpion 3D";
$a->strings["New game"] = "Nouvelle partie";
$a->strings["New game with handicap"] = "Nouvelle partie avec handicap";
$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Le morpion 3D, c'est comme la version traditionnelle. Sauf qu'on joue sur plusieurs étages en même temps.";
$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "Dans le cas qui nous concerne, il y a trois étages. Vous gagnez en alignant trois coups dans n'importe quel étage, ainsi que verticalement ou en diagonale entre les étages.";
$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Le handicap interdit la position centrale de l'étage du milieu, parce que le joueur qui prend cette case obtient souvent un avantage.";
$a->strings["You go first..."] = "À vous de jouer...";
$a->strings["I'm going first this time..."] = "Je commence...";
$a->strings["You won!"] = "Vous avez gagné!";
$a->strings["\"Cat\" game!"] = "Match nul!";
$a->strings["I won!"] = "J'ai gagné!";
<?php
if(! function_exists("string_plural_select_fr")) {
function string_plural_select_fr($n){
$n = intval($n);
return ($n > 1);;
}}
;
$a->strings["Three Dimensional Tic-Tac-Toe"] = "";
$a->strings["3D Tic-Tac-Toe"] = "";
$a->strings["New game"] = "";
$a->strings["New game with handicap"] = "";
$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "";
$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "";
$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "";
$a->strings["You go first..."] = "";
$a->strings["I'm going first this time..."] = "";
$a->strings["You won!"] = "Vous avez gagné !";
$a->strings["\"Cat\" game!"] = "";
$a->strings["I won!"] = "J’ai gagné !";

3
twitter/twitter.php

@ -808,8 +808,9 @@ function twitter_expire(App $a)
return;
}
$r = Item::select(['id'], ['deleted' => true, 'network' => Protocol::TWITTER]);
$r = Item::select(['id', 'guid'], ['deleted' => true, 'network' => Protocol::TWITTER]);
while ($row = DBA::fetch($r)) {
Logger::info('[twitter] Delete expired item', ['id' => $row['id'], 'guid' => $row['guid'], 'callstack' => \Friendica\Core\System::callstack()]);
DBA::delete('item', ['id' => $row['id']]);
}
DBA::close($r);

Loading…
Cancel
Save