CONFLICT Accepting request 59538: Accepted submit request 59538 from user oertel

Rev openSUSE:Factory/60 Md5 5deaf4cc928b3d8f0fdf34b0c30627b5 2011-02-12 10:48:02 oertel 59538

e2fsprogs-1.41.14.de.po.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8a1dd717b4eb696ab050ff1c397e62e6f631ca04c4c7ab6d602a56d6a499967
+size 32130

e2fsprogs.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jan 25 17:25:30 CET 2011 - pth@suse.de
+
+- Fix the last untranslated entry in the message catalog.
+
+-------------------------------------------------------------------
+Mon Jan 24 14:22:36 CET 2011 - pth@suse.de
+
+- Add an updated german translation that has also been sent
+  upstream.
+- Call 'make update-po' in po/ to sync translations and original
+  messages.
+
 -------------------------------------------------------------------
 Wed Jan 5 19:53:32 UTC 2011 - abrouwers@gmail.com
 

e2fsprogs.spec

@@ -37,6 +37,8 @@ Url:            http://e2fsprogs.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
 Source2:        README.SUSE
 Source3:        baselibs.conf
+#Added for 1.41.14; can be removed with the next release
+Source4:        e2fsprogs-1.41.14.de.po.bz2
 #
 # e2fsprogs patches
 #
@@ -124,6 +126,7 @@ Development files for the com_err error message display library.
 # libcom_err patches
 %patch34 -p1
 cp %{SOURCE2} .
+bunzip2 -dc %{S:4} > po/de.po
 
 %build
 autoreconf --force --install
@@ -140,6 +143,8 @@ autoreconf --force --install
   --disable-fsck \
   CFLAGS="$RPM_OPT_FLAGS"
 make %{?_smp_mflags} V=1
+#Guarantee that tranlations match the source messages
+make -C po update-po
 
 %install
 make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib}