diff --git a/CliClient/app/build-translation.js b/CliClient/app/build-translation.js
index a4d8c2ca0..c0d834f4f 100644
--- a/CliClient/app/build-translation.js
+++ b/CliClient/app/build-translation.js
@@ -67,6 +67,11 @@ function buildLocale(inputFile, outputFile) {
 	saveToFile(outputFile, translation);
 }
 
+async function removePoHeaderDate(filePath) {
+	await execCommand('sed -i -e\'/POT-Creation-Date:/d\' "' + filePath + '"');
+	await execCommand('sed -i -e\'/PO-Revision-Date:/d\' "' + filePath + '"');
+}
+
 async function createPotFile(potFilePath, sources) {
 	let baseArgs = [];
 	baseArgs.push('--from-code=utf-8');
@@ -82,6 +87,7 @@ async function createPotFile(potFilePath, sources) {
 		args.push(sources[i]);
 		const result = await execCommand('xgettext ' + args.join(' '));
 		if (result) console.error(result);
+		await removePoHeaderDate(potFilePath);
 	}
 }
 
@@ -89,6 +95,7 @@ async function mergePotToPo(potFilePath, poFilePath) {
 	const command = 'msgmerge -U "' + poFilePath + '" "' + potFilePath + '"';
 	const result = await execCommand(command);
 	if (result) console.error(result);
+	await removePoHeaderDate(poFilePath);
 }
 
 async function main() {
diff --git a/CliClient/locales/en_GB.po b/CliClient/locales/en_GB.po
index 61499ce22..7b480fd9e 100644
--- a/CliClient/locales/en_GB.po
+++ b/CliClient/locales/en_GB.po
@@ -8,8 +8,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-19 20:00+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -287,40 +285,40 @@ msgstr ""
 msgid "Displays summary about the notes and notebooks."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:26
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:25
 msgid "Synchronizes with remote storage."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:31
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:30
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:32
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:31
 msgid "For \"filesystem\" target only: Path to sync to."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:69
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:68
 msgid "Synchronisation is already in progress."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:96
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:93
 #, javascript-format
 msgid "Synchronization target: %s"
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:98
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:95
 msgid "Cannot initialize synchronizer."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:100
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:97
 msgid "Starting synchronization..."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:112
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:109
 msgid "Done."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:127
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:124
 #: /mnt/d/Web/www/joplin/ReactNativeClient/lib/synchronizer.js:60
 msgid "Cancelling..."
 msgstr ""
diff --git a/CliClient/locales/fr_FR.po b/CliClient/locales/fr_FR.po
index 6c8132399..7b248a81b 100644
--- a/CliClient/locales/fr_FR.po
+++ b/CliClient/locales/fr_FR.po
@@ -7,8 +7,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-19 19:53+0100\n"
-"PO-Revision-Date: 2017-07-18 13:27+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -310,42 +308,42 @@ msgstr "Assigner la valeur [value] à la propriété <name> de la <note> donnée
 msgid "Displays summary about the notes and notebooks."
 msgstr "Afficher un résumé des notes et carnets."
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:26
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:25
 msgid "Synchronizes with remote storage."
 msgstr "Synchroniser les notes et carnets."
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:31
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:30
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr ""
 "Synchroniser avec la cible donnée (par défaut, la valeur de configuration "
 "`sync.target`)."
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:32
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:31
 msgid "For \"filesystem\" target only: Path to sync to."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:69
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:68
 msgid "Synchronisation is already in progress."
 msgstr "Synchronisation est déjà en cours."
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:96
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:93
 #, javascript-format
 msgid "Synchronization target: %s"
 msgstr "Cible de la synchronisation : %s"
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:98
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:95
 msgid "Cannot initialize synchronizer."
 msgstr "Impossible d'initialiser le synchroniseur."
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:100
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:97
 msgid "Starting synchronization..."
 msgstr "Commencement de la synchronisation..."
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:112
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:109
 msgid "Done."
 msgstr "Terminé."
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:127
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:124
 #: /mnt/d/Web/www/joplin/ReactNativeClient/lib/synchronizer.js:60
 msgid "Cancelling..."
 msgstr "Annulation..."
diff --git a/CliClient/locales/joplin.pot b/CliClient/locales/joplin.pot
index 61499ce22..7b480fd9e 100644
--- a/CliClient/locales/joplin.pot
+++ b/CliClient/locales/joplin.pot
@@ -8,8 +8,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Joplin-CLI 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-19 20:00+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -287,40 +285,40 @@ msgstr ""
 msgid "Displays summary about the notes and notebooks."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:26
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:25
 msgid "Synchronizes with remote storage."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:31
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:30
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:32
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:31
 msgid "For \"filesystem\" target only: Path to sync to."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:69
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:68
 msgid "Synchronisation is already in progress."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:96
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:93
 #, javascript-format
 msgid "Synchronization target: %s"
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:98
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:95
 msgid "Cannot initialize synchronizer."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:100
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:97
 msgid "Starting synchronization..."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:112
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:109
 msgid "Done."
 msgstr ""
 
-#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:127
+#: /mnt/d/Web/www/joplin/CliClient/app/command-sync.js:124
 #: /mnt/d/Web/www/joplin/ReactNativeClient/lib/synchronizer.js:60
 msgid "Cancelling..."
 msgstr ""