Merge branch 'Cqoicebordel-integrated-videos'

2 files changed, 25 insertions, 15 deletions

diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.mo
index d44ee77a7..0b25be7a6 100644
--- a/searx/translations/ja/LC_MESSAGES/messages.mo
+++ b/searx/translations/ja/LC_MESSAGES/messages.mo
diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po
index 0a329ca09..c91fd1f8f 100644
--- a/searx/translations/ja/LC_MESSAGES/messages.po
+++ b/searx/translations/ja/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-27 14:39+0100\n"
+"POT-Creation-Date: 2015-01-05 20:54+0100\n"
 "PO-Revision-Date: 2014-11-26 20:38+0000\n"
 "Last-Translator: Adam Tauber <asciimoo@gmail.com>\n"
 "Language-Team: Japanese "
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: searx/webapp.py:247
+#: searx/webapp.py:263
 msgid "{minutes} minute(s) ago"
 msgstr "{minutes}分前"
 
-#: searx/webapp.py:249
+#: searx/webapp.py:265
 msgid "{hours} hour(s), {minutes} minute(s) ago"
 msgstr "{hours}時間と{minutes}分前"
 
@@ -168,31 +168,31 @@ msgstr "バック"
 
 #: searx/templates/courgette/results.html:12
 #: searx/templates/default/results.html:12
-#: searx/templates/oscar/results.html:83
+#: searx/templates/oscar/results.html:87
 msgid "Search URL"
 msgstr ""
 
 #: searx/templates/courgette/results.html:16
 #: searx/templates/default/results.html:16
-#: searx/templates/oscar/results.html:88
+#: searx/templates/oscar/results.html:92
 msgid "Download results"
 msgstr "ダウンロードの結果"
 
 #: searx/templates/courgette/results.html:34
 #: searx/templates/default/results.html:42
-#: searx/templates/oscar/results.html:63
+#: searx/templates/oscar/results.html:67
 msgid "Suggestions"
 msgstr "提案"
 
 #: searx/templates/courgette/results.html:62
 #: searx/templates/default/results.html:78
-#: searx/templates/oscar/results.html:37
+#: searx/templates/oscar/results.html:41
 msgid "previous page"
 msgstr "前のページ"
 
 #: searx/templates/courgette/results.html:73
 #: searx/templates/default/results.html:89
-#: searx/templates/oscar/results.html:45
+#: searx/templates/oscar/results.html:49
 msgid "next page"
 msgstr "次のページ"
 
@@ -268,7 +268,7 @@ msgstr ""
 msgid "Search results"
 msgstr ""
 
-#: searx/templates/oscar/results.html:78
+#: searx/templates/oscar/results.html:82
 msgid "Links"
 msgstr ""
 
@@ -349,6 +349,14 @@ msgstr ""
 msgid "cached"
 msgstr ""
 
+#: searx/templates/oscar/result_templates/default.html:9
+msgid "show media"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/default.html:9
+msgid "hide media"
+msgstr ""
+
 #: searx/templates/oscar/result_templates/images.html:21
 msgid "Get image"
 msgstr ""
@@ -381,6 +389,14 @@ msgstr ""
 msgid "Leecher"
 msgstr ""
 
+#: searx/templates/oscar/result_templates/videos.html:9
+msgid "show video"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/videos.html:9
+msgid "hide video"
+msgstr ""
+
 msgid "Localization"
 msgstr ""
 
@@ -401,15 +417,9 @@ msgstr "ウェブ"
 msgid "music"
 msgstr "音楽"
 
-msgid "social media"
-msgstr "ソーシャルメディア"
-
 msgid "images"
 msgstr "画像"
 
-msgid "videos"
-msgstr "動画"
-
 msgid "it"
 msgstr "情報技術"