diff --git a/src/freedombone-addcert b/src/freedombone-addcert
index 792aae04..300ce9a2 100755
--- a/src/freedombone-addcert
+++ b/src/freedombone-addcert
@@ -30,7 +30,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-addcert
 export TEXTDOMAINDIR="/usr/share/locale"
 
 HOSTNAME=
diff --git a/src/freedombone-addemail b/src/freedombone-addemail
index 4b2c7c4e..2f59ae9a 100755
--- a/src/freedombone-addemail
+++ b/src/freedombone-addemail
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-addemail
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MYUSERNAME=$USER
diff --git a/src/freedombone-addlist b/src/freedombone-addlist
index 6c6fc34e..2a37153c 100755
--- a/src/freedombone-addlist
+++ b/src/freedombone-addlist
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-addlist
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MYUSERNAME=$USER
@@ -41,7 +41,7 @@ LIST_ADDRESS=
 
 function show_help {
     echo ''
-    echo 'freedombone-addlist -u [username] -l [mailing list name] -s [subject tag] -e [list email address]'
+    echo $'freedombone-addlist -u [username] -l [mailing list name] -s [subject tag] -e [list email address]'
     echo ''
     exit 0
 }
diff --git a/src/freedombone-addsipuser b/src/freedombone-addsipuser
index 2a8e6275..ee1322d3 100755
--- a/src/freedombone-addsipuser
+++ b/src/freedombone-addsipuser
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-addsipuser
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MY_USERNAME=
diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index 6d6f920d..a5b64774 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-adduser
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MY_USERNAME=$1
diff --git a/src/freedombone-addxmpp b/src/freedombone-addxmpp
index c9ad355f..adf37094 100755
--- a/src/freedombone-addxmpp
+++ b/src/freedombone-addxmpp
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-addxmpp
 export TEXTDOMAINDIR="/usr/share/locale"
 
 EMAIL_ADDRESS=
diff --git a/src/freedombone-client b/src/freedombone-client
index b5bb2927..c48b6441 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -28,7 +28,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-client
 export TEXTDOMAINDIR="/usr/share/locale"
 
 CURR_USER=$USER
diff --git a/src/freedombone-clientcert b/src/freedombone-clientcert
index 2528c6b9..e0650ada 100755
--- a/src/freedombone-clientcert
+++ b/src/freedombone-clientcert
@@ -34,7 +34,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-clientcert
 export TEXTDOMAINDIR="/usr/share/locale"
 
 USERNAME=
diff --git a/src/freedombone-config b/src/freedombone-config
index 4944b386..178f0495 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -33,7 +33,7 @@ NO_OF_ARGS=$#
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-config
 export TEXTDOMAINDIR="/usr/share/locale"
 
 # Web site
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 8d20921c..3ab1efdd 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -30,7 +30,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-controlpanel
 export TEXTDOMAINDIR="/usr/share/locale"
 
 COMPLETION_FILE=$HOME/freedombone-completed.txt
diff --git a/src/freedombone-deploy b/src/freedombone-deploy
index 91840081..a72a3e4c 100755
--- a/src/freedombone-deploy
+++ b/src/freedombone-deploy
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-deploy
 export TEXTDOMAINDIR="/usr/share/locale"
 
 # Default username for disk images
diff --git a/src/freedombone-format b/src/freedombone-format
index 514c1da0..ef54c262 100755
--- a/src/freedombone-format
+++ b/src/freedombone-format
@@ -30,7 +30,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-format
 export TEXTDOMAINDIR="/usr/share/locale"
 
 if [ ! $1 ]; then
diff --git a/src/freedombone-ignore b/src/freedombone-ignore
index b2079e21..ec6fb5aa 100755
--- a/src/freedombone-ignore
+++ b/src/freedombone-ignore
@@ -32,7 +32,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-ignore
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MYUSERNAME=$USER
diff --git a/src/freedombone-image b/src/freedombone-image
index 6e1bedb7..a154a3f1 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -30,7 +30,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-image
 export TEXTDOMAINDIR="/usr/share/locale"
 
 IMAGE_TYPE='beaglebone'
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index b1344c8b..a298e645 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -31,7 +31,7 @@ set -x
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-image-customise
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MY_USERNAME='debian'
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index 16418b1b..68332b7f 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -28,7 +28,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-image-hardware-setup
 export TEXTDOMAINDIR="/usr/share/locale"
 
 enable_serial_console() {
diff --git a/src/freedombone-image-make b/src/freedombone-image-make
index f2e5a996..cc322fee 100755
--- a/src/freedombone-image-make
+++ b/src/freedombone-image-make
@@ -31,7 +31,7 @@ set -e # Exit on first error
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-image-make
 export TEXTDOMAINDIR="/usr/share/locale"
 
 #set -x # Enable debugging
diff --git a/src/freedombone-image-vmdebootstrap b/src/freedombone-image-vmdebootstrap
index c9462254..2ccdf3ae 100755
--- a/src/freedombone-image-vmdebootstrap
+++ b/src/freedombone-image-vmdebootstrap
@@ -28,7 +28,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-image-vmdebootstrap
 export TEXTDOMAINDIR="/usr/share/locale"
 
 mkdir -p vendor
diff --git a/src/freedombone-keydrive b/src/freedombone-keydrive
index a21bf723..23896d29 100755
--- a/src/freedombone-keydrive
+++ b/src/freedombone-keydrive
@@ -30,7 +30,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-keydrive
 export TEXTDOMAINDIR="/usr/share/locale"
 
 USB_DRIVE=/dev/sdb1
diff --git a/src/freedombone-logging b/src/freedombone-logging
index b37eb79c..b6bb6d8a 100755
--- a/src/freedombone-logging
+++ b/src/freedombone-logging
@@ -30,7 +30,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-logging
 export TEXTDOMAINDIR="/usr/share/locale"
 
 WEBSERVER_LOG_LEVEL='warn'
diff --git a/src/freedombone-mesh b/src/freedombone-mesh
index a4b1174d..95683006 100755
--- a/src/freedombone-mesh
+++ b/src/freedombone-mesh
@@ -30,7 +30,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-mesh
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MUMBLE_PATH=/usr/bin/mumble
diff --git a/src/freedombone-meshweb b/src/freedombone-meshweb
index 95c983fb..8d207342 100755
--- a/src/freedombone-meshweb
+++ b/src/freedombone-meshweb
@@ -2,7 +2,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-meshweb
 export TEXTDOMAINDIR="/usr/share/locale"
 
 # client or server installations sounds odd for a mesh, but this
diff --git a/src/freedombone-prep b/src/freedombone-prep
index 6d0a6560..002121c3 100755
--- a/src/freedombone-prep
+++ b/src/freedombone-prep
@@ -34,7 +34,7 @@ NO_OF_ARGS=$#
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-prep
 export TEXTDOMAINDIR="/usr/share/locale"
 
 # Version number of this script
diff --git a/src/freedombone-recoverkey b/src/freedombone-recoverkey
index 77a77497..3e965ecb 100755
--- a/src/freedombone-recoverkey
+++ b/src/freedombone-recoverkey
@@ -30,7 +30,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-recoverkey
 export TEXTDOMAINDIR="/usr/share/locale"
 
 FRIENDS_SERVERS_LIST=
diff --git a/src/freedombone-remote b/src/freedombone-remote
index 3c02e63a..ca1e1753 100755
--- a/src/freedombone-remote
+++ b/src/freedombone-remote
@@ -32,7 +32,7 @@ NO_OF_ARGS=$#
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-remote
 export TEXTDOMAINDIR="/usr/share/locale"
 
 # User to create the list for
diff --git a/src/freedombone-renew-cert b/src/freedombone-renew-cert
index cd104310..7972b329 100755
--- a/src/freedombone-renew-cert
+++ b/src/freedombone-renew-cert
@@ -30,7 +30,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-renew-cert
 export TEXTDOMAINDIR="/usr/share/locale"
 
 HOSTNAME=
diff --git a/src/freedombone-rmemail b/src/freedombone-rmemail
index d9a23a20..ea26b671 100755
--- a/src/freedombone-rmemail
+++ b/src/freedombone-rmemail
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-rmemail
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MYUSERNAME=$USER
diff --git a/src/freedombone-rmlist b/src/freedombone-rmlist
index abccda60..cf3e731e 100755
--- a/src/freedombone-rmlist
+++ b/src/freedombone-rmlist
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-rmlist
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MYUSERNAME=$USER
diff --git a/src/freedombone-rmsipuser b/src/freedombone-rmsipuser
index f0aef026..43349076 100755
--- a/src/freedombone-rmsipuser
+++ b/src/freedombone-rmsipuser
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-rmsipuser
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MY_USERNAME=$1
diff --git a/src/freedombone-rmuser b/src/freedombone-rmuser
index c411136c..5ca3a9f5 100755
--- a/src/freedombone-rmuser
+++ b/src/freedombone-rmuser
@@ -2,7 +2,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-rmuser
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MY_USERNAME=$1
diff --git a/src/freedombone-rmxmpp b/src/freedombone-rmxmpp
index 4f424f05..d240e946 100755
--- a/src/freedombone-rmxmpp
+++ b/src/freedombone-rmxmpp
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-rmxmpp
 export TEXTDOMAINDIR="/usr/share/locale"
 
 EMAIL_ADDRESS=
diff --git a/src/freedombone-sec b/src/freedombone-sec
index 28e0665e..d7f2e62a 100755
--- a/src/freedombone-sec
+++ b/src/freedombone-sec
@@ -30,7 +30,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-sec
 export TEXTDOMAINDIR="/usr/share/locale"
 
 SSL_PROTOCOLS=
diff --git a/src/freedombone-sipfreeext b/src/freedombone-sipfreeext
index 7b4bbdff..6716ab14 100755
--- a/src/freedombone-sipfreeext
+++ b/src/freedombone-sipfreeext
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-sipfreeext
 export TEXTDOMAINDIR="/usr/share/locale"
 
 CONFIG_FILE=/etc/sipwitch.conf
diff --git a/src/freedombone-splitkey b/src/freedombone-splitkey
index 248af402..3c655971 100755
--- a/src/freedombone-splitkey
+++ b/src/freedombone-splitkey
@@ -36,7 +36,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-splitkey
 export TEXTDOMAINDIR="/usr/share/locale"
 
 KEY_FRAGMENTS=3
diff --git a/src/freedombone-unignore b/src/freedombone-unignore
index 4dfc59e6..574a519d 100755
--- a/src/freedombone-unignore
+++ b/src/freedombone-unignore
@@ -32,7 +32,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-unignore
 export TEXTDOMAINDIR="/usr/share/locale"
 
 MYUSERNAME=$USER
diff --git a/src/freedombone-xmpp-pass b/src/freedombone-xmpp-pass
index dd1b326f..ea351fc5 100755
--- a/src/freedombone-xmpp-pass
+++ b/src/freedombone-xmpp-pass
@@ -31,7 +31,7 @@
 
 PROJECT_NAME='freedombone'
 
-export TEXTDOMAIN=$PROJECT_NAME
+export TEXTDOMAIN=${PROJECT_NAME}-xmpp-pass
 export TEXTDOMAINDIR="/usr/share/locale"
 
 EMAIL_ADDRESS=