Updated: libtool version to 2.5.4, gettext version to 0.26

3 files changed, 17 insertions, 3 deletions

diff --git a/l10n/gen-pot-file b/l10n/gen-pot-file
index ad465c8..bae78ef 100755
--- a/l10n/gen-pot-file
+++ b/l10n/gen-pot-file
@@ -47,7 +47,7 @@ xgettext --from-code=UTF-8 --keyword=N_ --keyword=_ --keyword=Q_:1,2  \
   echo -en "Create new ${_PO_FNAME}.po file:\n.. "
   msginit --no-translator --no-wrap --locale=${_LOCALE} --input=libmpu.pot --output-file=${_PO_FNAME}.po
   echo "Merge translated strings back ${_PO_FNAME}.po:"
-  msgmerge --no-wrap --sort-output ${_PO_FNAME}.po~ ${_PO_FNAME}.po > ${_PO_FNAME}.po.new
+  msgmerge --no-wrap ${_PO_FNAME}.po~ ${_PO_FNAME}.po > ${_PO_FNAME}.po.new
   # ======= Save new version: =======
   save_new_version ${_PO_FNAME}.po ${_PO_FNAME}.po.new
   mv ${_PO_FNAME}.po.new ${_PO_FNAME}.po
diff --git a/l10n/merge-ru_RU.utf8-messages b/l10n/merge-ru_RU.utf8-messages
new file mode 100755
index 0000000..0e7761e
--- /dev/null
+++ b/l10n/merge-ru_RU.utf8-messages
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+CWD=`pwd`
+
+SCRIPT_DIR=`cd $(dirname ${BASH_SOURCE[0]}) >/dev/null 2>&1 && pwd`
+program=`basename $0`
+
+cd ${SCRIPT_DIR}/../po
+
+POFILE=ru.po
+POTFILE=libmpu.pot
+
+msgmerge --update --no-wrap --backup=simple ${POFILE} ${POTFILE}
diff --git a/l10n/update-gettext b/l10n/update-gettext
index 09446ea..e9643db 100755
--- a/l10n/update-gettext
+++ b/l10n/update-gettext
@@ -73,9 +73,10 @@ echo ""
 #   конфигурирования --disable-nls .
 #
 if [ ! -f "po/Makevars" ] ; then
-  mv po/Makevars.template po/Makevars
+  cp po/Makevars.template po/Makevars
 else
-  mv po/Makevars.template po/Makevars
+  cp -a po/Makevars po/Makevars~
+  cp po/Makevars.template po/Makevars
 fi
 cp -a gettext.h gettext.h~
 cp /usr/share/gettext/gettext.h .