From d26fc63a5cb617e075ca4d74b99a1c102fa0e888 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Fri, 9 Mar 2018 09:10:32 +0100
Subject: [PATCH 1/3] Fix DuckDuckGo t parameter value on start page

---
 src/lib/data/html/start.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/data/html/start.html b/src/lib/data/html/start.html
index 89552d028..db3f4b576 100644
--- a/src/lib/data/html/start.html
+++ b/src/lib/data/html/start.html
@@ -20,7 +20,7 @@ img {margin-bottom:15px;}
 <img src="%ABOUT-IMG%" width="250">
 %PRIVATE-BROWSING%
 <form action="https://duckduckgo.com/" method="GET">
-    <input type="hidden" name="t" value="falkon" />
+    <input type="hidden" name="t" value="qupzilla" />
     <input class="line" id="inp" class="question" name="q"/> <br/>
     <input class="submit" type="submit" value="%BUTTON-LABEL%">
 </form>

From b17af37230cb0f43b987075bf2b1b07d84118c04 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Fri, 9 Mar 2018 09:13:10 +0100
Subject: [PATCH 2/3] Also skip scripts in src/Messages.sh

---
 src/Messages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Messages.sh b/src/Messages.sh
index 474eb2432..0c019b162 100644
--- a/src/Messages.sh
+++ b/src/Messages.sh
@@ -1,2 +1,2 @@
 #! /bin/sh
-$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui' | grep -v '/plugins/'` -o $podir/falkon_qt.pot
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui' | grep -v -e '/plugins/' -e '/scripts/'` -o $podir/falkon_qt.pot

From 3c8fcd5f70a0c2dbc7bfd0c264380d122b6dcfd3 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Fri, 9 Mar 2018 18:09:53 +0100
Subject: [PATCH 3/3] Use separate Messages.sh for each Python extension

---
 src/scripts/CMakeLists.txt                | 6 +++++-
 src/scripts/{ => hellopython}/Messages.sh | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename src/scripts/{ => hellopython}/Messages.sh (63%)

diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
index 4f9526c83..7be406ecc 100644
--- a/src/scripts/CMakeLists.txt
+++ b/src/scripts/CMakeLists.txt
@@ -1,6 +1,10 @@
 function(install_python_script name)
     if (ENABLE_PYTHON_PLUGINS)
-        install(DIRECTORY ${name} DESTINATION "${FALKON_INSTALL_PLUGINDIR}/python")
+        install(
+            DIRECTORY ${name}
+            DESTINATION "${FALKON_INSTALL_PLUGINDIR}/python"
+            FILES_MATCHING PATTERN "*" PATTERN "Messages.sh" EXCLUDE
+        )
         install(FILES i18n.py DESTINATION "${FALKON_INSTALL_PLUGINDIR}/python/${name}")
     endif()
 endfunction()
diff --git a/src/scripts/Messages.sh b/src/scripts/hellopython/Messages.sh
similarity index 63%
rename from src/scripts/Messages.sh
rename to src/scripts/hellopython/Messages.sh
index 38a0dcb6c..29b907a43 100644
--- a/src/scripts/Messages.sh
+++ b/src/scripts/hellopython/Messages.sh
@@ -8,4 +8,4 @@ XGETTEXT_FLAGS_PYTHON="\
 -ki18n:1 -ki18np:1,2 \
 "
 
-$XGETTEXT_PROGRAM $XGETTEXT_FLAGS_PYTHON `find hellopython -name '*.py'` -o $podir/falkon_hellopython.pot
+$XGETTEXT_PROGRAM $XGETTEXT_FLAGS_PYTHON `find . -name '*.py'` -o $podir/falkon_hellopython.pot