diff --git a/Messages.sh b/Messages.sh
index 0ff1a6009..d4a47052a 100644
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 $EXTRACTRC *.rc */*.rc >> rc.cpp || exit 11
-$EXTRACTRC $(find . -name "*.ui") >> rc.cpp || exit 12
-$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular.pot
+$EXTRACTRC $(find conf/ -name "*.ui") $(find core/ -name "*.ui") $(find ui/ -name "*.ui") $(ls . | grep -E '\.ui') >> rc.cpp || exit 12
+$XGETTEXT $(find conf/ -name "*.cpp" -o -name "*.h") $(find core/ -name "*.cpp" -o -name "*.h") $(find ui/ -name "*.cpp" -o -name "*.h") $(find shell/ -name "*.cpp" -o -name "*.h") $(ls . | grep -E '\.cpp$') $(ls . | grep -E '\.h$') -o $podir/okular.pot
diff --git a/generators/chm/Messages.sh b/generators/chm/Messages.sh
new file mode 100644
index 000000000..f5dfd8027
--- /dev/null
+++ b/generators/chm/Messages.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_chm.pot
diff --git a/generators/djvu/Messages.sh b/generators/djvu/Messages.sh
new file mode 100644
index 000000000..195b1091a
--- /dev/null
+++ b/generators/djvu/Messages.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_djvu.pot
diff --git a/generators/dvi/Messages.sh b/generators/dvi/Messages.sh
new file mode 100644
index 000000000..deeeb659a
--- /dev/null
+++ b/generators/dvi/Messages.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_dvi.pot
diff --git a/generators/fictionbook/Messages.sh b/generators/fictionbook/Messages.sh
new file mode 100644
index 000000000..ff45a10ee
--- /dev/null
+++ b/generators/fictionbook/Messages.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_fictionbook.pot
diff --git a/generators/ghostview/Messages.sh b/generators/ghostview/Messages.sh
new file mode 100644
index 000000000..32cc10caf
--- /dev/null
+++ b/generators/ghostview/Messages.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_ghostview.pot
diff --git a/generators/kimgio/Messages.sh b/generators/kimgio/Messages.sh
new file mode 100644
index 000000000..65356393d
--- /dev/null
+++ b/generators/kimgio/Messages.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_kimgio.pot
diff --git a/generators/ooo/Messages.sh b/generators/ooo/Messages.sh
new file mode 100644
index 000000000..792151906
--- /dev/null
+++ b/generators/ooo/Messages.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_ooo.pot
diff --git a/generators/poppler/Messages.sh b/generators/poppler/Messages.sh
new file mode 100644
index 000000000..8771151cb
--- /dev/null
+++ b/generators/poppler/Messages.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_poppler.pot
diff --git a/generators/tiff/Messages.sh b/generators/tiff/Messages.sh
new file mode 100644
index 000000000..b20a143ae
--- /dev/null
+++ b/generators/tiff/Messages.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_tiff.pot
diff --git a/generators/xps/Messages.sh b/generators/xps/Messages.sh
new file mode 100644
index 000000000..e3d4fd030
--- /dev/null
+++ b/generators/xps/Messages.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_xps.pot