diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-06-26 15:41:16 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-06-26 21:17:47 +0100 |
| commit | 627c406d7206a715fd231281cc7d88d5ee45ff06 (patch) | |
| tree | 17554e4eaf7c76e5a365e884e2f4c10b2df26cad | |
| parent | b3496d76e934a8df42ec5bca214b9ae08c814cfc (diff) | |
| download | openconnect-627c406d7206a715fd231281cc7d88d5ee45ff06.tar.gz openconnect-627c406d7206a715fd231281cc7d88d5ee45ff06.tar.bz2 openconnect-627c406d7206a715fd231281cc7d88d5ee45ff06.zip | |
Clean up Transifex import some more
Don't let local msgmerge use fuzzy translations either, don't care about
Translation-Team: changing, and use 'diff' so we actually see the changes
(since more often than not they're false positives, so it eases debugging).
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 594ed69..f9d0ee0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,15 +106,15 @@ update-translations: po/$(PACKAGE).pot echo "*** ERROR: Uncommitted changes in above files"; exit 1; \ else \ for a in po/*.po; do \ - msgmerge -q -F $$a $(abs_builddir)/po/$(PACKAGE).pot | grep -v PO-Revision-Date: > $$a.old ; \ + msgmerge -q -N -F $$a $(abs_builddir)/po/$(PACKAGE).pot | egrep -v PO-Revision-Date:\|Language-Team: > $$a.old ; \ done && \ tx pull -af && \ for a in po/*.po; do \ - msgmerge -q -F $$a $(abs_builddir)/po/$(PACKAGE).pot | grep -v PO-Revision-Date: > $$a.new ; \ + msgmerge -q -N -F $$a $(abs_builddir)/po/$(PACKAGE).pot | egrep -v PO-Revision-Date:\|Language-Team: > $$a.new ; \ if ! git ls-tree --name-only HEAD $$a | grep -q $$a; then \ echo New file $$a ; \ git add $$a ; \ - elif ! cmp -s $$a.old $$a.new; then \ + elif ! diff -u $$a.old $$a.new; then \ echo New changes for $$a; \ mv $$a.new $$a; \ else \ |