Revert "use ngettext for plurals"

1 files changed, 30 insertions, 73 deletions

diff --git a/searx/translations/ru/LC_MESSAGES/messages.po b/searx/translations/ru/LC_MESSAGES/messages.po
index 226bc90d4..2319625d5 100644
--- a/searx/translations/ru/LC_MESSAGES/messages.po
+++ b/searx/translations/ru/LC_MESSAGES/messages.po
@@ -1,24 +1,24 @@
-# Russian translations for .
+# Translations template for PROJECT.
 # Copyright (C) 2016 ORGANIZATION
-# This file is distributed under the same license as the  project.
-#
+# This file is distributed under the same license as the PROJECT project.
+# 
 # Translators:
 # dimqua <dimqua@riseup.net>, 2015
+# dimqua <dimqua@riseup.net>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version:  searx\n"
+"Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-05-11 01:59+0300\n"
+"POT-Creation-Date: 2016-01-21 16:05+0100\n"
 "PO-Revision-Date: 2016-01-21 15:06+0000\n"
 "Last-Translator: Thomas Pointhuber\n"
-"Language-Team: Russian "
-"(http://www.transifex.com/asciimoo/searx/language/ru/)\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Language-Team: Russian (http://www.transifex.com/asciimoo/searx/language/ru/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.2.0\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"
 
 #: searx/webapp.py:114
 msgid "files"
@@ -60,37 +60,31 @@ msgstr "карты"
 msgid "science"
 msgstr ""
 
-#: searx/webapp.py:414 searx/webapp.py:417
-msgid "{minutes} minute ago"
-msgid_plural "{minutes} minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: searx/webapp.py:416
-msgid "{hours} hour, "
-msgid_plural "{hours} hours, "
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: searx/engines/__init__.py:174
+#: searx/webapp.py:415
+msgid "{minutes} minute(s) ago"
+msgstr "{minutes} минут назад"
+
+#: searx/webapp.py:417
+msgid "{hours} hour(s), {minutes} minute(s) ago"
+msgstr "{hours} час, {minutes} минут назад"
+
+#: searx/engines/__init__.py:185
 msgid "Page loads (sec)"
 msgstr "Время загрузки (сек)"
 
-#: searx/engines/__init__.py:178
+#: searx/engines/__init__.py:189
 msgid "Number of results"
 msgstr "Число результатов"
 
-#: searx/engines/__init__.py:182
+#: searx/engines/__init__.py:193
 msgid "Scores"
 msgstr "Попаданий"
 
-#: searx/engines/__init__.py:186
+#: searx/engines/__init__.py:197
 msgid "Scores per result"
 msgstr "Попаданий за результат"
 
-#: searx/engines/__init__.py:190
+#: searx/engines/__init__.py:201
 msgid "Errors"
 msgstr "Ошибок"
 
@@ -98,17 +92,6 @@ msgstr "Ошибок"
 msgid "Rewrite HTTP links to HTTPS if possible"
 msgstr ""
 
-#: searx/plugins/open_results_on_new_tab.py:18
-msgid "Open result links on new browser tabs"
-msgstr ""
-
-#: searx/plugins/open_results_on_new_tab.py:19
-msgid ""
-"Results are opened in the same window by default. This plugin overwrites "
-"the default behaviour to open links on new tabs/windows. (JavaScript "
-"required)"
-msgstr ""
-
 #: searx/plugins/search_on_category_select.py:18
 msgid "Search on category select"
 msgstr ""
@@ -133,16 +116,6 @@ msgstr ""
 msgid "Remove trackers arguments from the returned URL"
 msgstr ""
 
-#: searx/plugins/vim_hotkeys.py:3
-msgid "Vim-like hotkeys"
-msgstr ""
-
-#: searx/plugins/vim_hotkeys.py:4
-msgid ""
-"Navigate search results with Vim-like hotkeys (JavaScript required). "
-"Press \"h\" key on main or result page to get help."
-msgstr ""
-
 #: searx/templates/courgette/index.html:9
 #: searx/templates/courgette/index.html:13
 #: searx/templates/courgette/results.html:5
@@ -333,11 +306,9 @@ msgstr "Блокировать"
 #: searx/templates/oscar/preferences.html:235
 #: searx/templates/pix-art/preferences.html:73
 msgid ""
-"These settings are stored in your cookies, this allows us not to store "
-"this data about you."
-msgstr ""
-"Настройки хранятся в ваших cookies-файлах, что позволяет нам не хранить "
-"эти сведения о Вас."
+"These settings are stored in your cookies, this allows us not to store this "
+"data about you."
+msgstr "Настройки хранятся в ваших cookies-файлах, что позволяет нам не хранить эти сведения о Вас."
 
 #: searx/templates/courgette/preferences.html:124
 #: searx/templates/default/preferences.html:112
@@ -346,9 +317,7 @@ msgstr ""
 msgid ""
 "These cookies serve your sole convenience, we don't use these cookies to "
 "track you."
-msgstr ""
-"Данные cookies применяются для вашего удобства, мы не используем их, "
-"чтобы отслеживать Вас."
+msgstr "Данные cookies применяются для вашего удобства, мы не используем их, чтобы отслеживать Вас."
 
 #: searx/templates/courgette/preferences.html:127
 #: searx/templates/default/preferences.html:115
@@ -515,10 +484,7 @@ msgid ""
 "Change how forms are submited, <a "
 "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\""
 " rel=\"external\">learn more about request methods</a>"
-msgstr ""
-"Изменяет способ отправки запросов (<a "
-"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\""
-" rel=\"external\">подробней о методах запросов</a>)"
+msgstr "Изменяет способ отправки запросов (<a href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">подробней о методах запросов</a>)"
 
 #: searx/templates/oscar/preferences.html:95
 msgid "Filter content"
@@ -630,9 +596,7 @@ msgstr "Сожалеем!"
 msgid ""
 "we didn't find any results. Please use another query or search in more "
 "categories."
-msgstr ""
-"результатов не найдено. Попробуйте другой запрос или выберете больше "
-"категорий."
+msgstr "результатов не найдено. Попробуйте другой запрос или выберете больше категорий."
 
 #: searx/templates/oscar/messages/save_settings_successfull.html:7
 msgid "Well done!"
@@ -721,10 +685,3 @@ msgstr "скрыть видео"
 #: searx/templates/pix-art/results.html:28
 msgid "Load more..."
 msgstr ""
-
-#~ msgid "{minutes} minute(s) ago"
-#~ msgstr "{minutes} минут назад"
-
-#~ msgid "{hours} hour(s), {minutes} minute(s) ago"
-#~ msgstr "{hours} час, {minutes} минут назад"
-