From 243a22392a087924b37f39a2ce759258b24da84e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
 <rafael.carre@savoirfairelinux.com>
Date: Tue, 27 Sep 2011 16:23:59 -0400
Subject: [PATCH] merge language scripts

---
 lang/merge-po-with-template.sh         | 8 --------
 lang/{update-template.sh => update.sh} | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100755 lang/merge-po-with-template.sh
 rename lang/{update-template.sh => update.sh} (70%)

diff --git a/lang/merge-po-with-template.sh b/lang/merge-po-with-template.sh
deleted file mode 100755
index f64642e478..0000000000
--- a/lang/merge-po-with-template.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Merge sflphone template into the existing po files
-
-for file in `find  .  -name *.po`
-do
-    msgmerge --update $file sflphone.pot
-done
diff --git a/lang/update-template.sh b/lang/update.sh
similarity index 70%
rename from lang/update-template.sh
rename to lang/update.sh
index 71124105f2..6da2ae2564 100755
--- a/lang/update-template.sh
+++ b/lang/update.sh
@@ -4,3 +4,9 @@
 
 xgettext --from-code=utf-8 --language=C -k_ -kN_ -kc_:1c,2  -kn_:1,2    -ktr2i18n -ktr2i18n:2c,1 -kki18nc:1c,2 -kki18n -ki18n -ki18nc:1c,2 -o sflphone.pot `find ../gnome/src -name \*.c`
 
+# Merge template into the existing po files
+
+for file in *.po
+do
+    msgmerge --update $file sflphone.pot
+done
-- 
GitLab