From bd361e60d8d5d182e9f93fbd1e7b5c118531992f Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 24 May 2016 12:49:21 +0200 Subject: [PATCH] Revert "use ngettext for plurals" --- searx/translations/bg/LC_MESSAGES/messages.po | 98 +++++---------- searx/translations/de/LC_MESSAGES/messages.po | 106 +++++------------ .../el_GR/LC_MESSAGES/messages.po | 78 ++++-------- searx/translations/en/LC_MESSAGES/messages.po | 58 +++------ searx/translations/eo/LC_MESSAGES/messages.po | 83 ++++--------- searx/translations/es/LC_MESSAGES/messages.po | 107 +++++------------ searx/translations/fr/LC_MESSAGES/messages.po | 112 +++++------------- searx/translations/he/LC_MESSAGES/messages.po | 95 +++++---------- searx/translations/hu/LC_MESSAGES/messages.po | 95 +++++---------- searx/translations/it/LC_MESSAGES/messages.po | 87 ++++---------- searx/translations/ja/LC_MESSAGES/messages.po | 81 ++++--------- searx/translations/nl/LC_MESSAGES/messages.po | 108 +++++------------ searx/translations/pt/LC_MESSAGES/messages.po | 58 +++------ .../pt_BR/LC_MESSAGES/messages.po | 107 +++++------------ searx/translations/ro/LC_MESSAGES/messages.po | 102 +++++----------- searx/translations/ru/LC_MESSAGES/messages.po | 99 +++++----------- searx/translations/tr/LC_MESSAGES/messages.po | 99 +++++----------- .../zh_CN/LC_MESSAGES/messages.po | 81 ++++--------- searx/webapp.py | 7 +- 19 files changed, 471 insertions(+), 1190 deletions(-) diff --git a/searx/translations/bg/LC_MESSAGES/messages.po b/searx/translations/bg/LC_MESSAGES/messages.po index e129110d4..b5f443001 100644 --- a/searx/translations/bg/LC_MESSAGES/messages.po +++ b/searx/translations/bg/LC_MESSAGES/messages.po @@ -1,23 +1,23 @@ -# Bulgarian 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: # poke amom , 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-02 12:56+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: Bulgarian " -"(http://www.transifex.com/asciimoo/searx/language/bg/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Bulgarian (http://www.transifex.com/asciimoo/searx/language/bg/)\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: bg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:114 msgid "files" @@ -59,35 +59,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] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "преди {minutes} минута(минути)" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "преди {hours} час(ове), {minutes} минута(минути)" -#: searx/engines/__init__.py:174 +#: 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 "Грешки" @@ -95,17 +91,6 @@ msgstr "Грешки" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Поправи HTTP връзки на HTTPS, ако е възможно" -#: 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 "Търси при избор на категория" @@ -114,9 +99,7 @@ msgstr "Търси при избор на категория" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" -"Търси веднага при избрана категория. Изключи за избор на няколко " -"категории. (Необходим е JavaScript)" +msgstr "Търси веднага при избрана категория. Изключи за избор на няколко категории. (Необходим е JavaScript)" #: searx/plugins/self_info.py:20 msgid "" @@ -132,16 +115,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 @@ -332,11 +305,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 "" -"Тези настройки се съхраняват във вашите бисквитки. Това ни позволява да " -"не съхраняваме тази информация за вас." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Тези настройки се съхраняват във вашите бисквитки. Това ни позволява да не съхраняваме тази информация за вас." #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 @@ -345,9 +316,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Тези бисквитки служат за ваше удобство. Ние не ги използваме, за да Ви " -"следим." +msgstr "Тези бисквитки служат за ваше удобство. Ние не ги използваме, за да Ви следим." #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 @@ -543,9 +512,7 @@ msgstr "Макс. време" msgid "" "This is the list of cookies and their values searx is storing on your " "computer." -msgstr "" -"Това е списък на бисквитки с техните стойности, които searx съхранява на " -"вашия компютър." +msgstr "Това е списък на бисквитки с техните стойности, които searx съхранява на вашия компютър." #: searx/templates/oscar/preferences.html:214 msgid "With that list, you can assess searx transparency." @@ -628,9 +595,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!" @@ -719,10 +684,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} минута(минути)" - diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po index 797bd5157..2ba9cc51e 100644 --- a/searx/translations/de/LC_MESSAGES/messages.po +++ b/searx/translations/de/LC_MESSAGES/messages.po @@ -1,28 +1,30 @@ -# German 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: # Thomas Pointhuber, 2014-2015 # Max , 2015 # pointhi, 2014 # rike, 2014 # stf , 2014 +# stf , 2014 # Thomas Pointhuber, 2016 +# rike, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-05-02 12:56+0300\n" +"POT-Creation-Date: 2016-01-21 16:05+0100\n" "PO-Revision-Date: 2016-01-21 15:07+0000\n" "Last-Translator: Thomas Pointhuber\n" -"Language-Team: German " -"(http://www.transifex.com/asciimoo/searx/language/de/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: German (http://www.transifex.com/asciimoo/searx/language/de/)\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: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:114 msgid "files" @@ -64,35 +66,31 @@ msgstr "Karte" msgid "science" msgstr "Wissenschaft" -#: searx/webapp.py:414 searx/webapp.py:417 -msgid "{minutes} minute ago" -msgid_plural "{minutes} minutes ago" -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "vor {minutes} Minute(n)" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "vor {hours} Stunde(n), {minutes} Minute(n)" -#: searx/engines/__init__.py:174 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Ladezeit (sek)" -#: searx/engines/__init__.py:178 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Trefferanzahl" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Punkte" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Punkte pro Treffer" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Fehler" @@ -100,17 +98,6 @@ msgstr "Fehler" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Wandelt wenn möglich HTTP Links in HTTPS Links um" -#: 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 "Starte Suche wenn Kategorie angeklickt wird" @@ -119,17 +106,13 @@ msgstr "Starte Suche wenn Kategorie angeklickt wird" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" -"Starte die Suche sofort wenn eine Kategorie ausgewählt wird. Es ist nicht" -" mehr möglich mehrere Kategorien auszuwählen. (JavaScript benötigt)" +msgstr "Starte die Suche sofort wenn eine Kategorie ausgewählt wird. Es ist nicht mehr möglich mehrere Kategorien auszuwählen. (JavaScript benötigt)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" -"Zeigt deine IP-Adresse wenn die Suche \"ip\" lautet, und deinen User-" -"Agent wenn deine Suche \"user agent\" beinhaltet." +msgstr "Zeigt deine IP-Adresse wenn die Suche \"ip\" lautet, und deinen User-Agent wenn deine Suche \"user agent\" beinhaltet." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -139,16 +122,6 @@ msgstr "Tracker-URL entferner" msgid "Remove trackers arguments from the returned URL" msgstr "Entferne Tracker Argumente von den URLs" -#: 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 @@ -339,11 +312,9 @@ msgstr "Blockieren" #: 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 "" -"Diese Informationen werden in Cookies auf Ihrem Rechner gespeichert, " -"damit wir keine Ihrer persönlichen Daten speichern müssen." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Diese Informationen werden in Cookies auf Ihrem Rechner gespeichert, damit wir keine Ihrer persönlichen Daten speichern müssen." #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 @@ -352,9 +323,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Diese Cookies dienen einzig Ihrem Komfort. Wir verwenden sie nicht, um " -"Sie zu überwachen." +msgstr "Diese Cookies dienen einzig Ihrem Komfort. Wir verwenden sie nicht, um Sie zu überwachen." #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 @@ -521,10 +490,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"ändere wie Formulare übertragen werden, lerne mehr über Anfragemethoden" +msgstr "ändere wie Formulare übertragen werden, lerne mehr über Anfragemethoden" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -636,10 +602,7 @@ msgstr "Entschuldigung!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" -"Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen " -"anderen Suchbegriff, oder suche das gewünschte in einer anderen " -"Kategorie. " +msgstr "Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen anderen Suchbegriff, oder suche das gewünschte in einer anderen Kategorie. " #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -728,10 +691,3 @@ msgstr "Video verstecken" #: searx/templates/pix-art/results.html:28 msgid "Load more..." msgstr "Lade mehr..." - -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "vor {minutes} Minute(n)" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "vor {hours} Stunde(n), {minutes} Minute(n)" - diff --git a/searx/translations/el_GR/LC_MESSAGES/messages.po b/searx/translations/el_GR/LC_MESSAGES/messages.po index f231ee0a5..73b49e27f 100644 --- a/searx/translations/el_GR/LC_MESSAGES/messages.po +++ b/searx/translations/el_GR/LC_MESSAGES/messages.po @@ -1,23 +1,23 @@ -# Greek (Greece) 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: # Dimitris T. , 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-02 12:56+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: Greek (Greece) " -"(http://www.transifex.com/asciimoo/searx/language/el_GR/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Greek (Greece) (http://www.transifex.com/asciimoo/searx/language/el_GR/)\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: el_GR\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:114 msgid "files" @@ -59,35 +59,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] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "" -#: searx/engines/__init__.py:174 +#: 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 "Λάθη" @@ -95,17 +91,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 "" @@ -130,16 +115,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 @@ -330,8 +305,8 @@ 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." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." msgstr "" #: searx/templates/courgette/preferences.html:124 @@ -709,10 +684,3 @@ msgstr "" #: searx/templates/pix-art/results.html:28 msgid "Load more..." msgstr "" - -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "" - diff --git a/searx/translations/en/LC_MESSAGES/messages.po b/searx/translations/en/LC_MESSAGES/messages.po index 31e2f7a3a..1f7f591c8 100644 --- a/searx/translations/en/LC_MESSAGES/messages.po +++ b/searx/translations/en/LC_MESSAGES/messages.po @@ -7,15 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-05-02 12:56+0300\n" +"POT-Creation-Date: 2016-01-21 16:05+0100\n" "PO-Revision-Date: 2014-01-30 15:22+0100\n" "Last-Translator: FULL NAME \n" +"Language: en\n" "Language-Team: en \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\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" #: searx/webapp.py:114 msgid "files" @@ -57,35 +58,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] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "" -#: searx/engines/__init__.py:174 +#: 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 "" @@ -93,17 +90,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 "" @@ -128,16 +114,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 @@ -717,9 +693,3 @@ msgstr "" #~ msgid "No" #~ msgstr "" -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "" - diff --git a/searx/translations/eo/LC_MESSAGES/messages.po b/searx/translations/eo/LC_MESSAGES/messages.po index ce9420540..51323c264 100644 --- a/searx/translations/eo/LC_MESSAGES/messages.po +++ b/searx/translations/eo/LC_MESSAGES/messages.po @@ -1,23 +1,23 @@ -# Esperanto 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: # juanda097 , 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-02 12:56+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: Esperanto " -"(http://www.transifex.com/asciimoo/searx/language/eo/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Esperanto (http://www.transifex.com/asciimoo/searx/language/eo/)\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: eo\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:114 msgid "files" @@ -59,35 +59,31 @@ msgstr "mapo" msgid "science" msgstr "" -#: searx/webapp.py:414 searx/webapp.py:417 -msgid "{minutes} minute ago" -msgid_plural "{minutes} minutes ago" -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "" -#: searx/engines/__init__.py:174 +#: 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 "Nombro de rezultoj" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Poentaroj" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Poentaroj por unu rezulto" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Eraroj" @@ -95,17 +91,6 @@ msgstr "Eraroj" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Reverki HTTP ligiloj HTTP se eble" -#: 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 "" @@ -130,16 +115,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 @@ -330,8 +305,8 @@ msgstr "Bloko" #: 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." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." msgstr "" #: searx/templates/courgette/preferences.html:124 @@ -508,10 +483,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -" Ŝanĝ kiel formoj estas submetiĝita, < " -"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" -" rel=\"external\"> Lerni pli pri peto metodoj " +msgstr " Ŝanĝ kiel formoj estas submetiĝita, < href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\"> Lerni pli pri peto metodoj " #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -712,10 +684,3 @@ msgstr "kaŝi videon" #: searx/templates/pix-art/results.html:28 msgid "Load more..." msgstr "Ŝarĝ pli..." - -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "" - diff --git a/searx/translations/es/LC_MESSAGES/messages.po b/searx/translations/es/LC_MESSAGES/messages.po index 45b2d6070..de6c0a438 100644 --- a/searx/translations/es/LC_MESSAGES/messages.po +++ b/searx/translations/es/LC_MESSAGES/messages.po @@ -1,7 +1,7 @@ -# Spanish 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: # Adam Tauber , 2015 # Alejandro León Aznar, 2014 @@ -10,18 +10,18 @@ # Oscar Carrero , 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-02 12:56+0300\n" +"POT-Creation-Date: 2016-01-21 16:05+0100\n" "PO-Revision-Date: 2016-02-24 23:02+0000\n" "Last-Translator: juanda097 \n" -"Language-Team: Spanish " -"(http://www.transifex.com/asciimoo/searx/language/es/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Spanish (http://www.transifex.com/asciimoo/searx/language/es/)\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: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:114 msgid "files" @@ -63,35 +63,31 @@ msgstr "mapa" msgid "science" msgstr "ciencia" -#: searx/webapp.py:414 searx/webapp.py:417 -msgid "{minutes} minute ago" -msgid_plural "{minutes} minutes ago" -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "hace {minutes} minuto(s)" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "hace {hours} hora(s) y {minutes} minuto(s)" -#: searx/engines/__init__.py:174 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Tiempo de carga (segundos)" -#: searx/engines/__init__.py:178 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Número de resultados" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Puntuaciones" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Puntuaciones por resultado" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Errores" @@ -99,17 +95,6 @@ msgstr "Errores" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Cambiar los enlaces HTTP a HTTPS si es posible" -#: 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 "Buscar en la categoría seleccionada" @@ -118,17 +103,13 @@ msgstr "Buscar en la categoría seleccionada" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" -"Realizar una búsqueda inmediatamente si se ha seleccionado una categoría." -" Desactivar para seleccionar varias categorías. (Se requiere JavaScript)" +msgstr "Realizar una búsqueda inmediatamente si se ha seleccionado una categoría. Desactivar para seleccionar varias categorías. (Se requiere JavaScript)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" -"Muestra tu dirección IP si la consulta es \"ip\" y tu Agente de Usuario " -"si la consulta contiene \"agente de usuario\"." +msgstr "Muestra tu dirección IP si la consulta es \"ip\" y tu Agente de Usuario si la consulta contiene \"agente de usuario\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -138,16 +119,6 @@ msgstr "Eliminador de URL rastreadora" msgid "Remove trackers arguments from the returned URL" msgstr "Eliminar los argumentos de los rastreadores en la URL devuelta" -#: 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 @@ -338,11 +309,9 @@ msgstr "Bloquear" #: 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 "" -"Esta configuración se guarda en sus cookies, lo que nos permite no " -"almacenar dicha información sobre usted." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Esta configuración se guarda en sus cookies, lo que nos permite no almacenar dicha información sobre usted." #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 @@ -351,9 +320,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Estas cookies son para su propia comodidad, no las utilizamos para " -"rastrearle." +msgstr "Estas cookies son para su propia comodidad, no las utilizamos para rastrearle." #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 @@ -520,10 +487,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"Modifica cómo se envian los formularios más información sobre métodos de peticiones" +msgstr "Modifica cómo se envian los formularios más información sobre métodos de peticiones" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -552,9 +516,7 @@ msgstr "Tiempo máximo" msgid "" "This is the list of cookies and their values searx is storing on your " "computer." -msgstr "" -"Esta es la lista de cookies y sus valores que searx está almacenando en " -"tu ordenador." +msgstr "Esta es la lista de cookies y sus valores que searx está almacenando en tu ordenador." #: searx/templates/oscar/preferences.html:214 msgid "With that list, you can assess searx transparency." @@ -637,9 +599,7 @@ msgstr "¡Lo siento!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" -"No encontramos nada. Por favor, formule su búsqueda de otra forma o " -"busque en más categorías." +msgstr "No encontramos nada. Por favor, formule su búsqueda de otra forma o busque en más categorías." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -728,10 +688,3 @@ msgstr "ocultar video" #: searx/templates/pix-art/results.html:28 msgid "Load more..." msgstr "Cargar más" - -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "hace {minutes} minuto(s)" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "hace {hours} hora(s) y {minutes} minuto(s)" - diff --git a/searx/translations/fr/LC_MESSAGES/messages.po b/searx/translations/fr/LC_MESSAGES/messages.po index d16f8cb26..77ccaa28e 100644 --- a/searx/translations/fr/LC_MESSAGES/messages.po +++ b/searx/translations/fr/LC_MESSAGES/messages.po @@ -1,27 +1,28 @@ -# French 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: # Benjamin Sonntag , 2014 # Cqoicebordel , 2014 # Cqoicebordel , 2014-2016 # FIRST AUTHOR , 2014 # rike, 2014 +# rike, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-05-02 12:56+0300\n" +"POT-Creation-Date: 2016-01-21 16:05+0100\n" "PO-Revision-Date: 2016-01-21 15:31+0000\n" "Last-Translator: Cqoicebordel \n" -"Language-Team: French " -"(http://www.transifex.com/asciimoo/searx/language/fr/)\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Language-Team: French (http://www.transifex.com/asciimoo/searx/language/fr/)\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: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: searx/webapp.py:114 msgid "files" @@ -63,35 +64,31 @@ msgstr "carte" msgid "science" msgstr "science" -#: searx/webapp.py:414 searx/webapp.py:417 -msgid "{minutes} minute ago" -msgid_plural "{minutes} minutes ago" -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "il y a {minutes} minute(s)" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "il y a {hours} heure(s), {minutes} minute(s)" -#: searx/engines/__init__.py:174 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Chargement de la page (sec)" -#: searx/engines/__init__.py:178 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Nombre de résultats" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Score" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Score par résultat" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Erreurs" @@ -99,17 +96,6 @@ msgstr "Erreurs" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Réécrire les liens HTTP en HTTPS si possible" -#: 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 "Lancer la recherche lors du choix d'une catégorie" @@ -118,17 +104,13 @@ msgstr "Lancer la recherche lors du choix d'une catégorie" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" -"Exécute la recherche immédiatement si une catégorie est sélectionnée. " -"Désactiver pour sélectionner plusieurs catégories (nécessite JavaScript)." +msgstr "Exécute la recherche immédiatement si une catégorie est sélectionnée. Désactiver pour sélectionner plusieurs catégories (nécessite JavaScript)." #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" -"Affiche votre adresse IP si la requête est \"ip\", et affiche votre user-" -"agent si la requete contient \"user agent\"." +msgstr "Affiche votre adresse IP si la requête est \"ip\", et affiche votre user-agent si la requete contient \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -138,16 +120,6 @@ msgstr "Nettoyeur d'URL de suivis" msgid "Remove trackers arguments from the returned URL" msgstr "Retire les arguments utilisés pour vous pister des URL retournées" -#: 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 @@ -338,11 +310,9 @@ msgstr "Bloquer" #: 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 "" -"Ces paramètres sont stockés dans vos cookies ; ceci nous permet de ne pas" -" collecter vos données." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Ces paramètres sont stockés dans vos cookies ; ceci nous permet de ne pas collecter vos données." #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 @@ -351,9 +321,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Ces cookies existent pour votre confort d'utilisation, nous ne les " -"utilisons pas pour vous espionner." +msgstr "Ces cookies existent pour votre confort d'utilisation, nous ne les utilisons pas pour vous espionner." #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 @@ -520,10 +488,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"Permet de choisir comment la recherche est envoyée, en savoir plus sur les méthodes HTTP" +msgstr "Permet de choisir comment la recherche est envoyée, en savoir plus sur les méthodes HTTP" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -552,9 +517,7 @@ msgstr "Temps max" msgid "" "This is the list of cookies and their values searx is storing on your " "computer." -msgstr "" -"C'est une liste de cookies et de leurs valeurs que searx enregistre sur " -"votre ordinateur." +msgstr "C'est une liste de cookies et de leurs valeurs que searx enregistre sur votre ordinateur." #: searx/templates/oscar/preferences.html:214 msgid "With that list, you can assess searx transparency." @@ -615,9 +578,7 @@ msgstr "Attention !" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" -"Merci d'activer JavaScript pour utiliser toutes les fonctionnalités de ce" -" site." +msgstr "Merci d'activer JavaScript pour utiliser toutes les fonctionnalités de ce site." #: searx/templates/oscar/messages/no_cookies.html:3 msgid "Information!" @@ -639,9 +600,7 @@ msgstr "Désolé !" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" -"nous n'avons trouvé aucun résultat. Effectuez une autre recherche ou " -"changez de catégorie." +msgstr "nous n'avons trouvé aucun résultat. Effectuez une autre recherche ou changez de catégorie." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -730,10 +689,3 @@ msgstr "cacher la vidéo" #: searx/templates/pix-art/results.html:28 msgid "Load more..." msgstr "Afficher plus..." - -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "il y a {minutes} minute(s)" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "il y a {hours} heure(s), {minutes} minute(s)" - diff --git a/searx/translations/he/LC_MESSAGES/messages.po b/searx/translations/he/LC_MESSAGES/messages.po index e22a666ac..753d25dfa 100644 --- a/searx/translations/he/LC_MESSAGES/messages.po +++ b/searx/translations/he/LC_MESSAGES/messages.po @@ -1,7 +1,7 @@ -# Hebrew 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: # GenghisKhan , 2015 # GenghisKhan , 2015-2016 @@ -10,18 +10,18 @@ # stf , 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-05-02 12:56+0300\n" +"POT-Creation-Date: 2016-01-21 16:05+0100\n" "PO-Revision-Date: 2016-03-01 15:21+0000\n" "Last-Translator: GenghisKhan \n" -"Language-Team: Hebrew " -"(http://www.transifex.com/asciimoo/searx/language/he/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Hebrew (http://www.transifex.com/asciimoo/searx/language/he/)\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: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:114 msgid "files" @@ -63,35 +63,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] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "לפני {minutes} דקות" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "לפני {hours} שעות, {minutes} דקות" -#: searx/engines/__init__.py:174 +#: 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 "שגיאות" @@ -99,17 +95,6 @@ msgstr "שגיאות" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "שכתב קישורי HTTP לקישורי HTTPS כאשר אפשר" -#: 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 "חפש בעת בחירת קטגוריה" @@ -118,17 +103,13 @@ msgstr "חפש בעת בחירת קטגוריה" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" -"בצע חיפוש כאשר קטגוריה נבחרת. נטרל כדי לבחור קטגוריות מרובות. (מצריך " -"JavaScript)" +msgstr "בצע חיפוש כאשר קטגוריה נבחרת. נטרל כדי לבחור קטגוריות מרובות. (מצריך JavaScript)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" -"מציגה כתובת IP המשוייכת לך אם השאילתא היא \"ip\" וגם סוכן משתמש אם שאילתא" -" מכילה \"user agent\"." +msgstr "מציגה כתובת IP המשוייכת לך אם השאילתא היא \"ip\" וגם סוכן משתמש אם שאילתא מכילה \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -138,16 +119,6 @@ msgstr "מסיר URL גשש" msgid "Remove trackers arguments from the returned URL" msgstr "הסר ארגומנטים מאתרים מתוך URL מוחזר" -#: 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 @@ -338,11 +309,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 "" -"הגדרות אלו מאוחסנות בתוך העוגיות שלך, אלו מאפשרות לנו לא לאחסן את מידע זה" -" אודותייך." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "הגדרות אלו מאוחסנות בתוך העוגיות שלך, אלו מאפשרות לנו לא לאחסן את מידע זה אודותייך." #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 @@ -518,10 +487,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"שינוי האופן בו טפסים נשלחים, למדו עוד אודות שיטות בקשה (request methods)" +msgstr "שינוי האופן בו טפסים נשלחים, למדו עוד אודות שיטות בקשה (request methods)" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -722,10 +688,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} דקות" - diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po index 9f0b1841f..ba2978e42 100644 --- a/searx/translations/hu/LC_MESSAGES/messages.po +++ b/searx/translations/hu/LC_MESSAGES/messages.po @@ -1,24 +1,24 @@ -# Hungarian 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: # Adam Tauber , 2014-2016 # FIRST AUTHOR , 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-05-02 12:56+0300\n" +"POT-Creation-Date: 2016-01-21 16:05+0100\n" "PO-Revision-Date: 2016-02-06 08:36+0000\n" "Last-Translator: Adam Tauber \n" -"Language-Team: Hungarian " -"(http://www.transifex.com/asciimoo/searx/language/hu/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Hungarian (http://www.transifex.com/asciimoo/searx/language/hu/)\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: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:114 msgid "files" @@ -60,35 +60,31 @@ msgstr "térkép" msgid "science" msgstr "tudomány" -#: searx/webapp.py:414 searx/webapp.py:417 -msgid "{minutes} minute ago" -msgid_plural "{minutes} minutes ago" -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} perce" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} óra, {minutes} perce" -#: searx/engines/__init__.py:174 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Válaszidők (sec)" -#: searx/engines/__init__.py:178 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Találatok száma" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Pontszámok" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Pontszámok találatonként" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Hibák" @@ -96,17 +92,6 @@ msgstr "Hibák" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "HTTP linkek lecserélése HTTPS-re" -#: 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 "Azonnal keresés kategória választással" @@ -115,17 +100,13 @@ msgstr "Azonnal keresés kategória választással" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" -"Keresés megkezdése kategória kiválasztáskor. Több kategória " -"kiválasztásához deaktiválás szükséges. (Javascript szükséges)" +msgstr "Keresés megkezdése kategória kiválasztáskor. Több kategória kiválasztásához deaktiválás szükséges. (Javascript szükséges)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" -"Saját IP cím, user agent megjelenítés az \"ip\", \"user agent\" szavakra " -"keresve." +msgstr "Saját IP cím, user agent megjelenítés az \"ip\", \"user agent\" szavakra keresve." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -135,16 +116,6 @@ msgstr "Tracker URL eltávolítás" msgid "Remove trackers arguments from the returned URL" msgstr "Felhasználó követéshez használt találati URL paraméterek eltávolítása" -#: 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 @@ -335,8 +306,8 @@ msgstr "Tiltás" #: 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." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." msgstr "Ezek a beállítások csak a böngésző cookie-jaiban tárolódnak." #: searx/templates/courgette/preferences.html:124 @@ -346,9 +317,7 @@ msgstr "Ezek a beállítások csak a böngésző cookie-jaiban tárolódnak." msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a " -"felhasználók követésére." +msgstr "Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a felhasználók követésére." #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 @@ -515,10 +484,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"Keresés metódusa (bővebben)" +msgstr "Keresés metódusa (bővebben)" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -719,10 +685,3 @@ msgstr "video elrejtése" #: searx/templates/pix-art/results.html:28 msgid "Load more..." msgstr "További találatok betöltése" - -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "{minutes} perce" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "{hours} óra, {minutes} perce" - diff --git a/searx/translations/it/LC_MESSAGES/messages.po b/searx/translations/it/LC_MESSAGES/messages.po index 8577ded2e..672d1e054 100644 --- a/searx/translations/it/LC_MESSAGES/messages.po +++ b/searx/translations/it/LC_MESSAGES/messages.po @@ -1,24 +1,25 @@ -# Italian 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: # dp , 2014 +# dp , 2014 # Luc , 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-02 12:56+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: Italian " -"(http://www.transifex.com/asciimoo/searx/language/it/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Italian (http://www.transifex.com/asciimoo/searx/language/it/)\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: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:114 msgid "files" @@ -60,35 +61,31 @@ msgstr "mappe" msgid "science" msgstr "" -#: searx/webapp.py:414 searx/webapp.py:417 -msgid "{minutes} minute ago" -msgid_plural "{minutes} minutes ago" -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "di {minutes} minuti fa" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "di {ore} h e {minutes} minuti fa" -#: searx/engines/__init__.py:174 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr " Caricamento della pagina (secondi)" -#: searx/engines/__init__.py:178 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Risultati ottenuti" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Punteggio" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Punteggio per risultato" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Errori" @@ -96,17 +93,6 @@ msgstr "Errori" 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 "" @@ -131,16 +117,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 @@ -331,11 +307,9 @@ msgstr "Blocca" #: 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 "" -"Queste impostazioni sono salvate nei tuoi cookie, consentendoci di non " -"conservare dati su di te." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Queste impostazioni sono salvate nei tuoi cookie, consentendoci di non conservare dati su di te." #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 @@ -344,9 +318,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"I cookie sono funzionali ad un servizio migliore. Non usiamo i cookie per" -" sorvegliarti." +msgstr "I cookie sono funzionali ad un servizio migliore. Non usiamo i cookie per sorvegliarti." #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 @@ -714,10 +686,3 @@ msgstr "" #: searx/templates/pix-art/results.html:28 msgid "Load more..." msgstr "" - -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "di {minutes} minuti fa" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "di {ore} h e {minutes} minuti fa" - diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po index 87c214491..00158358f 100644 --- a/searx/translations/ja/LC_MESSAGES/messages.po +++ b/searx/translations/ja/LC_MESSAGES/messages.po @@ -1,7 +1,7 @@ -# Japanese 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: # Thomas Pointhuber, 2014-2015 # FIRST AUTHOR , 2014,2016 @@ -11,18 +11,18 @@ # Thomas Pointhuber, 2015-2016 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-05-02 12:56+0300\n" +"POT-Creation-Date: 2016-01-21 16:05+0100\n" "PO-Revision-Date: 2016-02-14 00:11+0000\n" "Last-Translator: Akio Nishimura \n" -"Language-Team: Japanese " -"(http://www.transifex.com/asciimoo/searx/language/ja/)\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Language-Team: Japanese (http://www.transifex.com/asciimoo/searx/language/ja/)\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: ja\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: searx/webapp.py:114 msgid "files" @@ -64,33 +64,31 @@ msgstr "地図" msgid "science" msgstr "学問" -#: searx/webapp.py:414 searx/webapp.py:417 -msgid "{minutes} minute ago" -msgid_plural "{minutes} minutes ago" -msgstr[0] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "{minutes}分前" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours}時間と{minutes}分前" -#: searx/engines/__init__.py:174 +#: 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 +96,6 @@ msgstr "エラー" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "可能ならばHTTPリンクをHTTPSリンクに書き換える" -#: 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 +120,6 @@ msgstr "トラッカーURLリムーバー" msgid "Remove trackers arguments from the returned URL" msgstr "返されたURLからトラッカー引数を消去します。" -#: 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,8 +310,8 @@ 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." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." msgstr "これらの設定はあなたのクッキーに保存されますが、これはサーバーがあなたの情報の保存するわけではありません。" #: searx/templates/courgette/preferences.html:124 @@ -511,10 +488,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"フォームがどの方法で送信されるかを変更できます。リクエストメソッドについて詳しく知るにはここをクリック。" +msgstr "フォームがどの方法で送信されるかを変更できます。リクエストメソッドについて詳しく知るにはここをクリック。" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -715,10 +689,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}分前" - diff --git a/searx/translations/nl/LC_MESSAGES/messages.po b/searx/translations/nl/LC_MESSAGES/messages.po index df4888a2c..b04ede24b 100644 --- a/searx/translations/nl/LC_MESSAGES/messages.po +++ b/searx/translations/nl/LC_MESSAGES/messages.po @@ -1,24 +1,24 @@ -# Dutch 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: # André Koot , 2014-2015 # Nathan Follens, 2015-2016 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-05-02 12:56+0300\n" +"POT-Creation-Date: 2016-01-21 16:05+0100\n" "PO-Revision-Date: 2016-01-31 11:35+0000\n" "Last-Translator: Nathan Follens\n" -"Language-Team: Dutch " -"(http://www.transifex.com/asciimoo/searx/language/nl/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Dutch (http://www.transifex.com/asciimoo/searx/language/nl/)\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: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:114 msgid "files" @@ -60,35 +60,31 @@ msgstr "kaart" msgid "science" msgstr "wetenschap" -#: searx/webapp.py:414 searx/webapp.py:417 -msgid "{minutes} minute ago" -msgid_plural "{minutes} minutes ago" -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} min geleden" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} uur, {minutes} min geleden" -#: searx/engines/__init__.py:174 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Pagina laadt (sec)" -#: searx/engines/__init__.py:178 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Aantal zoekresultaten" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Scores" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Scores per zoekresultaat" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Fouten" @@ -96,17 +92,6 @@ msgstr "Fouten" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Herschrijf HTTP-koppelingen naar HTTPS, indien mogelijk" -#: 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 "Zoeken bij selecteren van categorie" @@ -115,18 +100,13 @@ msgstr "Zoeken bij selecteren van categorie" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" -"Zoekopdracht onmiddellijk uitvoeren wanneer een categorie geselecteerd " -"wordt. Zet dit uit om meerdere categorieën te selecteren. (JavaScript " -"vereist)" +msgstr "Zoekopdracht onmiddellijk uitvoeren wanneer een categorie geselecteerd wordt. Zet dit uit om meerdere categorieën te selecteren. (JavaScript vereist)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" -"Geeft je IP-adres weer als de zoekopdracht \"ip\" is en je " -"gebruikersagent als de zoekopdracht \"user agent\" bevat." +msgstr "Geeft je IP-adres weer als de zoekopdracht \"ip\" is en je gebruikersagent als de zoekopdracht \"user agent\" bevat." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -136,16 +116,6 @@ msgstr "Tracker-URL verwijderaar" msgid "Remove trackers arguments from the returned URL" msgstr "Verwijdert trackerargumenten van de gekregen URL" -#: 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 @@ -336,11 +306,9 @@ msgstr "Blokkeren" #: 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 "" -"Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets" -" over jou te bewaren." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets over jou te bewaren." #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 @@ -349,9 +317,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies " -"niet om je te volgen." +msgstr "Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies niet om je te volgen." #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 @@ -518,10 +484,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"Bepaal hoe de formulieren worden ingestuurd, lees meer over request methodes" +msgstr "Bepaal hoe de formulieren worden ingestuurd, lees meer over request methodes" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -550,9 +513,7 @@ msgstr "Max. duur" msgid "" "This is the list of cookies and their values searx is storing on your " "computer." -msgstr "" -"Dit is de lijst van cookies en hun waarden die searx op je computer " -"opslaat." +msgstr "Dit is de lijst van cookies en hun waarden die searx op je computer opslaat." #: searx/templates/oscar/preferences.html:214 msgid "With that list, you can assess searx transparency." @@ -635,9 +596,7 @@ msgstr "Sorry!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" -"we kregen geen resultaat. Probeer een andere opvraag of zoek in meer " -"categorieën." +msgstr "we kregen geen resultaat. Probeer een andere opvraag of zoek in meer categorieën." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -726,10 +685,3 @@ msgstr "verberg video" #: searx/templates/pix-art/results.html:28 msgid "Load more..." msgstr "Meer laden..." - -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "{minutes} min geleden" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "{hours} uur, {minutes} min geleden" - diff --git a/searx/translations/pt/LC_MESSAGES/messages.po b/searx/translations/pt/LC_MESSAGES/messages.po index 888779b67..2899a65e0 100644 --- a/searx/translations/pt/LC_MESSAGES/messages.po +++ b/searx/translations/pt/LC_MESSAGES/messages.po @@ -7,15 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-05-02 12:56+0300\n" +"POT-Creation-Date: 2016-01-21 16:05+0100\n" "PO-Revision-Date: 2014-01-30 15:22+0100\n" "Last-Translator: FULL NAME \n" +"Language: pt\n" "Language-Team: en \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\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" #: searx/webapp.py:114 msgid "files" @@ -57,35 +58,31 @@ msgstr "mapa" msgid "science" msgstr "" -#: searx/webapp.py:414 searx/webapp.py:417 -msgid "{minutes} minute ago" -msgid_plural "{minutes} minutes ago" -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "Há {minutes} minutos" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "Há {hours} e {minutes} minutos" -#: searx/engines/__init__.py:174 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Tempo de carregamento (seg)" -#: searx/engines/__init__.py:178 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Número de resultados" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Pontuações" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Pontuações por resultado" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Erros" @@ -93,17 +90,6 @@ msgstr "Erros" 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 "" @@ -128,16 +114,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 @@ -728,9 +704,3 @@ msgstr "" #~ msgid "No" #~ msgstr "Não" -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "Há {minutes} minutos" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "Há {hours} e {minutes} minutos" - diff --git a/searx/translations/pt_BR/LC_MESSAGES/messages.po b/searx/translations/pt_BR/LC_MESSAGES/messages.po index 3f66324d9..8580ff528 100644 --- a/searx/translations/pt_BR/LC_MESSAGES/messages.po +++ b/searx/translations/pt_BR/LC_MESSAGES/messages.po @@ -1,23 +1,23 @@ -# Portuguese (Brazil) 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: # Neton Brício , 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-02 12:56+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: Portuguese (Brazil) " -"(http://www.transifex.com/asciimoo/searx/language/pt_BR/)\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/asciimoo/searx/language/pt_BR/)\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: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: searx/webapp.py:114 msgid "files" @@ -59,35 +59,31 @@ msgstr "mapas" msgid "science" msgstr "" -#: searx/webapp.py:414 searx/webapp.py:417 -msgid "{minutes} minute ago" -msgid_plural "{minutes} minutes ago" -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "{minutos} minuto(s) atrás" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{horas} hora(s), {minutos} minuto(s) atrás" -#: searx/engines/__init__.py:174 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Carregamento da página (sec)" -#: searx/engines/__init__.py:178 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Número de resultados" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Pontuações" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Pontuações por resultado" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Erros" @@ -95,17 +91,6 @@ msgstr "Erros" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Redirecionar conexões HTTP para HTTPS, se possível" -#: 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 "Pesquisar na categoria selecionada" @@ -114,17 +99,13 @@ msgstr "Pesquisar na categoria selecionada" msgid "" "Perform search immediately if a category selected. Disable to select " "multiple categories. (JavaScript required)" -msgstr "" -"Executar a busca imediatamente se a categoria está selecionada. Desativar" -" para selecionar várias categorias. (Necessário JavaScript)" +msgstr "Executar a busca imediatamente se a categoria está selecionada. Desativar para selecionar várias categorias. (Necessário JavaScript)" #: searx/plugins/self_info.py:20 msgid "" "Displays your IP if the query is \"ip\" and your user agent if the query " "contains \"user agent\"." -msgstr "" -"Exibe o seu IP se a consulta é \"ip\" e seu agente de usuário, se a " -"consulta contém \"user agent\"." +msgstr "Exibe o seu IP se a consulta é \"ip\" e seu agente de usuário, se a consulta contém \"user agent\"." #: searx/plugins/tracker_url_remover.py:26 msgid "Tracker URL remover" @@ -134,16 +115,6 @@ msgstr "Remover Tracker da url" msgid "Remove trackers arguments from the returned URL" msgstr "Remover argumentos de url retornáveis" -#: 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 @@ -334,11 +305,9 @@ msgstr "Bloqueado" #: 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 "" -"Essas configurações são armazenadas em seus cookies, nos não armazenamos " -"nenhum dado a seu respeito." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Essas configurações são armazenadas em seus cookies, nos não armazenamos nenhum dado a seu respeito." #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 @@ -347,9 +316,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Estes cookies servem ao seu único propósito, nós não usamos esses cookies" -" para rastreá-lo." +msgstr "Estes cookies servem ao seu único propósito, nós não usamos esses cookies para rastreá-lo." #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 @@ -516,10 +483,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"Alterar o modo como os formulários são submetidosganhar desempenho sobre métodos de solicitação" +msgstr "Alterar o modo como os formulários são submetidosganhar desempenho sobre métodos de solicitação" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -609,9 +573,7 @@ msgstr "Aviso!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" -"Você deve ativar o JavaScript para usar todas as funcionalidades deste " -"site." +msgstr "Você deve ativar o JavaScript para usar todas as funcionalidades deste site." #: searx/templates/oscar/messages/no_cookies.html:3 msgid "Information!" @@ -633,9 +595,7 @@ msgstr "Desculpe!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" -"Não encontramos nenhum resultado. Utilize outra consulta ou pesquisa em " -"mais categorias." +msgstr "Não encontramos nenhum resultado. Utilize outra consulta ou pesquisa em mais categorias." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -724,10 +684,3 @@ msgstr "ocultar vídeo" #: searx/templates/pix-art/results.html:28 msgid "Load more..." msgstr "Mostrar mais ..." - -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "{minutos} minuto(s) atrás" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "{horas} hora(s), {minutos} minuto(s) atrás" - diff --git a/searx/translations/ro/LC_MESSAGES/messages.po b/searx/translations/ro/LC_MESSAGES/messages.po index f1921dd4c..9abe0fb9f 100644 --- a/searx/translations/ro/LC_MESSAGES/messages.po +++ b/searx/translations/ro/LC_MESSAGES/messages.po @@ -1,24 +1,23 @@ -# Romanian 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: # adrian.fita , 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-02 12:56+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: Romanian " -"(http://www.transifex.com/asciimoo/searx/language/ro/)\n" -"Plural-Forms: nplurals=3; " -"plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n" +"Language-Team: Romanian (http://www.transifex.com/asciimoo/searx/language/ro/)\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: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" #: searx/webapp.py:114 msgid "files" @@ -60,37 +59,31 @@ msgstr "hartă" 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:415 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} minut(e) în urmă" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} oră(e), {minutes} minut(e) în urmă" -#: searx/engines/__init__.py:174 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Încărcarea paginilor (sec)" -#: searx/engines/__init__.py:178 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Numărul de rezultate" -#: searx/engines/__init__.py:182 +#: searx/engines/__init__.py:193 msgid "Scores" msgstr "Scoruri" -#: searx/engines/__init__.py:186 +#: searx/engines/__init__.py:197 msgid "Scores per result" msgstr "Scoruri per rezultat" -#: searx/engines/__init__.py:190 +#: searx/engines/__init__.py:201 msgid "Errors" msgstr "Erori" @@ -98,17 +91,6 @@ msgstr "Erori" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Rescrie legăturile HTTP cu HTTPS dacă e posibil" -#: 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 "Căutare în categoria selectată" @@ -133,16 +115,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 +305,9 @@ msgstr "Blochează" #: 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 "" -"Aceste setări sunt stocate în cookie-urile d-voastră, aceasta ne permite " -"să nu stocăm aceste date despre d-voastră." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Aceste setări sunt stocate în cookie-urile d-voastră, aceasta ne permite să nu stocăm aceste date despre d-voastră." #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 @@ -346,9 +316,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Aceste cookie-uri servesc doar pentru confortul d-voastră, noi nu stocăm " -"aceste cookie-uri pentru a vă urmări." +msgstr "Aceste cookie-uri servesc doar pentru confortul d-voastră, noi nu stocăm aceste cookie-uri pentru a vă urmări." #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 @@ -515,10 +483,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"Modificați cum sunt trimise formularele, învățați mai multe despre metodele de transfer" +msgstr "Modificați cum sunt trimise formularele, învățați mai multe despre metodele de transfer" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -608,9 +573,7 @@ msgstr "Avertizare!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" -"Vă rog activați JavaScript pentru a utiliza funcționalitatea completă a " -"acestui site." +msgstr "Vă rog activați JavaScript pentru a utiliza funcționalitatea completă a acestui site." #: searx/templates/oscar/messages/no_cookies.html:3 msgid "Information!" @@ -632,9 +595,7 @@ msgstr "Îmi pare rău!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" -"n-am găsit nici un rezultat. Vă rog folosiți o altă interogare sau " -"căutați în mai multe categorii." +msgstr "n-am găsit nici un rezultat. Vă rog folosiți o altă interogare sau căutați în mai multe categorii." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -723,10 +684,3 @@ msgstr "ascunde video" #: searx/templates/pix-art/results.html:28 msgid "Load more..." msgstr "Încarcă mai multe..." - -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "{minutes} minut(e) în urmă" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "{hours} oră(e), {minutes} minut(e) în urmă" - 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 , 2015 +# dimqua , 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:415 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} минут назад" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} час, {minutes} минут назад" -#: searx/engines/__init__.py:174 +#: 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, learn more about request methods" -msgstr "" -"Изменяет способ отправки запросов (подробней о методах запросов)" +msgstr "Изменяет способ отправки запросов (подробней о методах запросов)" #: 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} минут назад" - diff --git a/searx/translations/tr/LC_MESSAGES/messages.po b/searx/translations/tr/LC_MESSAGES/messages.po index 74a7557a9..eb9fe8fa4 100644 --- a/searx/translations/tr/LC_MESSAGES/messages.po +++ b/searx/translations/tr/LC_MESSAGES/messages.po @@ -1,24 +1,24 @@ -# Turkish 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: # Caner Başaran , 2014-2015 # FIRST AUTHOR , 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-05-02 12:56+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: Turkish " -"(http://www.transifex.com/asciimoo/searx/language/tr/)\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Language-Team: Turkish (http://www.transifex.com/asciimoo/searx/language/tr/)\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: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: searx/webapp.py:114 msgid "files" @@ -60,35 +60,31 @@ msgstr "harita" msgid "science" msgstr "" -#: searx/webapp.py:414 searx/webapp.py:417 -msgid "{minutes} minute ago" -msgid_plural "{minutes} minutes ago" -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "{minutes} dakika() önce" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" -msgstr[1] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours} saat(), {minutes} dakika() önce" -#: searx/engines/__init__.py:174 +#: searx/engines/__init__.py:185 msgid "Page loads (sec)" msgstr "Yüklenen sayfa (sn)" -#: searx/engines/__init__.py:178 +#: searx/engines/__init__.py:189 msgid "Number of results" msgstr "Sonuç sayısı" -#: 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 "Hatalar" @@ -96,17 +92,6 @@ msgstr "Hatalar" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "Mümkünse HTTP bağlantıları HTTPS olarak düzelt" -#: 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 "" @@ -131,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 @@ -331,11 +306,9 @@ msgstr "Engelle" #: 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 "" -"Ayarlar çerezlerinizde saklanır. Verdiğiniz izinler, sizin hakkınızda " -"veri saklamak için değildir." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Ayarlar çerezlerinizde saklanır. Verdiğiniz izinler, sizin hakkınızda veri saklamak için değildir." #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 @@ -460,9 +433,7 @@ msgstr "Gücümün kaynağı" #: searx/templates/oscar/base.html:78 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "" -"kişisel gizliliğe saygılı ve merak edenlerin kurcalayabildiği bir meta " -"arama motoru" +msgstr "kişisel gizliliğe saygılı ve merak edenlerin kurcalayabildiği bir meta arama motoru" #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" @@ -513,10 +484,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"Aramaların nasıl gönderildiğini değiştir, istek yöntemleri hakkında daha fazla bilgi" +msgstr "Aramaların nasıl gönderildiğini değiştir, istek yöntemleri hakkında daha fazla bilgi" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -606,9 +574,7 @@ msgstr "Uyarı!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" -"Lütfen, bu sitenin tüm işlevlerini kullanmak için JavaScript'i " -"etkinleştirin." +msgstr "Lütfen, bu sitenin tüm işlevlerini kullanmak için JavaScript'i etkinleştirin." #: searx/templates/oscar/messages/no_cookies.html:3 msgid "Information!" @@ -630,9 +596,7 @@ msgstr "Üzgünüz!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" -"herhangi bir sonuç bulamadık. Lütfen, başka sorgu kullanın veya daha " -"fazla kategoride arama yapın." +msgstr "herhangi bir sonuç bulamadık. Lütfen, başka sorgu kullanın veya daha fazla kategoride arama yapın." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -721,10 +685,3 @@ msgstr "video gizle" #: searx/templates/pix-art/results.html:28 msgid "Load more..." msgstr "Daha fazlasını getir..." - -#~ msgid "{minutes} minute(s) ago" -#~ msgstr "{minutes} dakika() önce" - -#~ msgid "{hours} hour(s), {minutes} minute(s) ago" -#~ msgstr "{hours} saat(), {minutes} dakika() önce" - diff --git a/searx/translations/zh_CN/LC_MESSAGES/messages.po b/searx/translations/zh_CN/LC_MESSAGES/messages.po index dfcb97d1a..c7903563c 100644 --- a/searx/translations/zh_CN/LC_MESSAGES/messages.po +++ b/searx/translations/zh_CN/LC_MESSAGES/messages.po @@ -1,24 +1,24 @@ -# Chinese (Simplified, China) 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: # wenke, 2015 # wenke, 2015-2016 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2016-05-02 12:56+0300\n" +"POT-Creation-Date: 2016-01-21 16:05+0100\n" "PO-Revision-Date: 2016-01-21 16:25+0000\n" "Last-Translator: wenke\n" -"Language-Team: Chinese (China) " -"(http://www.transifex.com/asciimoo/searx/language/zh_CN/)\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Language-Team: Chinese (China) (http://www.transifex.com/asciimoo/searx/language/zh_CN/)\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: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: searx/webapp.py:114 msgid "files" @@ -60,33 +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] "" +#: searx/webapp.py:415 +msgid "{minutes} minute(s) ago" +msgstr "{minutes}分钟之前" -#: searx/webapp.py:416 -msgid "{hours} hour, " -msgid_plural "{hours} hours, " -msgstr[0] "" +#: searx/webapp.py:417 +msgid "{hours} hour(s), {minutes} minute(s) ago" +msgstr "{hours}小时{minutes}分钟之前" -#: searx/engines/__init__.py:174 +#: 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 "错误" @@ -94,17 +92,6 @@ msgstr "错误" msgid "Rewrite HTTP links to HTTPS if possible" msgstr "如果可能的话重定向HTTP链接到HTTPS" -#: 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 "搜索类别选择" @@ -129,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 @@ -329,8 +306,8 @@ 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." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." msgstr "这些设置保存你的cookie，这代表我们不能储存你的数据。" #: searx/templates/courgette/preferences.html:124 @@ -507,10 +484,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"更改请求方法，了解更多请求方法相关" +msgstr "更改请求方法，了解更多请求方法相关" #: searx/templates/oscar/preferences.html:95 msgid "Filter content" @@ -711,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}分钟之前" - diff --git a/searx/webapp.py b/searx/webapp.py index b995e1fec..ed8ff1bd9 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -48,7 +48,7 @@ from flask import ( Flask, request, render_template, url_for, Response, make_response, redirect, send_from_directory ) -from flask.ext.babel import Babel, gettext, ngettext, format_date +from flask.ext.babel import Babel, gettext, format_date from searx import settings, searx_dir from searx.engines import ( categories, engines, get_engines_stats, engine_shortcuts @@ -411,10 +411,9 @@ def index(): minutes = int((timedifference.seconds / 60) % 60) hours = int(timedifference.seconds / 60 / 60) if hours == 0: - result['publishedDate'] = ngettext(u'{minutes} minute ago', u'{minutes} minutes ago', minutes).format(minutes=minutes) # noqa + result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes) else: - result['publishedDate'] = ngettext(u'{hours} hour, ', u'{hours} hours, ', hours).format(hours=hours) # noqa - result['publishedDate'] += ngettext(u'{minutes} minute ago', u'{minutes} minutes ago', minutes).format(minutes=minutes) # noqa + result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes) # noqa else: result['publishedDate'] = format_date(result['publishedDate'])