Hello community,

here is the log from the commit of package desktop-translations for 
openSUSE:Factory checked in at 2012-06-01 22:30:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/desktop-translations (Old)
 and      /work/SRC/openSUSE:Factory/.desktop-translations.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "desktop-translations", Maintainer is "[email protected]"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/desktop-translations/desktop-translations.changes    
    2012-05-25 16:14:58.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.desktop-translations.new/desktop-translations.changes
   2012-06-01 22:31:36.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun  1 12:35:31 UTC 2012 - [email protected]
+
+- PREPARE_PACKAGE: Filter wrong \n.
+- Update translations.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ desktop-translations.spec ++++++
--- /var/tmp/diff_new_pack.rnUbzM/_old  2012-06-01 22:31:38.000000000 +0200
+++ /var/tmp/diff_new_pack.rnUbzM/_new  2012-06-01 22:31:38.000000000 +0200
@@ -18,7 +18,7 @@
 Name:           desktop-translations
 Version:        12.2
 Release:        0
-Summary:        Desktop Files Translation updates
+Summary:        Desktop Files Translations
 License:        BSD-3-Clause
 Group:          System/GUI/Other
 Source0:        desktop-translations.tar.bz2
@@ -35,7 +35,7 @@
 BuildArch:      noarch
 
 %description
-This package provides translations for installed desktop files.
+This package provides the translations for installed desktop files.
 
 %prep
 %setup -q -c %{name}

++++++ PREPARE_PACKAGE ++++++
--- /var/tmp/diff_new_pack.rnUbzM/_old  2012-06-01 22:31:38.000000000 +0200
+++ /var/tmp/diff_new_pack.rnUbzM/_new  2012-06-01 22:31:38.000000000 +0200
@@ -24,17 +24,22 @@
   }
   # cp $file po/$lang/entries.po
   # instead of copying, convert to the old inline format
+  # with the first awk, filter \n in translations
+  # (msgfilter does not work for me in this case)
   msgattrib -o - --width=1000 --no-obsolete $file | awk '/^msgctxt/ {
-body = 1
-ctxt=gensub(/msgctxt \"(.+)\"/, "\\1", "g")
-gsub(/&/, "\\\\&", ctxt)
-next
-}
+  body = 1;print;next}
+body == 1 {
+  sub(/\\n/, " ")
+  print;next}
+{print}' | awk '/^msgctxt/ {
+  body = 1
+  ctxt=gensub(/msgctxt \"(.+)\"/, "\\1", "g")
+  gsub(/&/, "\\\\&", ctxt)
+  next}
 /^msgid/ && body == 1 {
-sub(/msgid \"/, "&" ctxt ": ")
-print
-next
-}
+  sub(/msgid \"/, "&" ctxt ": ")
+  print
+  next}
 {print}
 ' > po/$lang/entries.po.new
   msgfmt po/$lang/entries.po.new -o po/$lang/entries.mo || exit

++++++ desktop-translations.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/desktop-translations/desktop-translations.tar.bz2 
/work/SRC/openSUSE:Factory/.desktop-translations.new/desktop-translations.tar.bz2
 differ: char 11, line 1

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to