Jaka Kranjc : po: Preserve the previous msgid on change as a hint to translators.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 08e7491cb5a18c260209cd8629aa33521fd3124b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=08e7491cb5a18c260209cd8629aa33521fd3124b

Author: Jaka Kranjc <lynxlupodian at users.sourceforge.net>
Date:   Tue Feb 21 22:51:28 2012 +0100

po: Preserve the previous msgid on change as a hint to translators.

---

 configure    |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index e7d691d..045d4f5 100755
--- a/configure
+++ b/configure
@@ -15590,7 +15590,7 @@ then
     test "$srcdir" = . || as_fn_error $? "Rebuilding po files is not supported for out of tree builds." "$LINENO" 5
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS "ALL_POT_FILES =$ALL_POT_FILES
 \$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot
-	msgmerge -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@
+	msgmerge --previous -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@
 \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES)
 	msgcat -o \$@ \$(ALL_POT_FILES)"
 fi
diff --git a/configure.ac b/configure.ac
index 3fd320e..27db29c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3107,7 +3107,7 @@ then
     WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],
 [ALL_POT_FILES =$ALL_POT_FILES
 \$(LINGUAS:%=po/%.po): \$(srcdir)/po/wine.pot
-	msgmerge -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[@].new && mv \$[@].new \$[@]
+	msgmerge --previous -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[@].new && mv \$[@].new \$[@]
 \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES)
 	msgcat -o \$[@] \$(ALL_POT_FILES)])
 fi