diff --git a/Messages.sh b/Messages.sh
deleted file mode 100644
index 5a5dff2c..00000000
--- a/Messages.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-mkdir locale
-a2po export --android KdeConnect/src/main/res/ --gettext locale
-mv locale/template.pot $podir/kdeconnect-android.pot
-rm -rf locale
diff --git a/StaticMessages.sh b/StaticMessages.sh
new file mode 100644
index 00000000..df7e27e4
--- /dev/null
+++ b/StaticMessages.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# The name of catalog we create (without the.pot extension), sourced from the scripty scripts
+FILENAME="kdeconnect-android"
+
+function export_pot_file # First parameter will be the path of the pot file we have to create, includes $FILENAME
+{
+	potfile=$1
+	mkdir outdir
+	a2po export --android KdeConnect/src/main/res/ --gettext outdir
+	mv outdir/template.pot $potfile
+	rm -rf outdir
+}
+
+function import_po_files # First parameter will be a path that will contain several .po files with the format LANG.po
+{
+	podir=$1
+	a2po import --android KdeConnect/src/main/res/ --gettext $podir
+}
+
+