Imported Upstream version 1.12.26

Change-Id: Ie635ae91f2b39eb5ace6a1e314bf3c17232f7f4a
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index f29514e..c8cbaa7 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -34,7 +34,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "12")
-SET(VERSION_PATCH "25")
+SET(VERSION_PATCH "26")
 
-# LAST RELEASED: 1.12.25
+# LAST RELEASED: 1.12.26
 #=======

diff --git a/package/zypper.changes b/package/zypper.changes
index 6d91ab7..7c9b333 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,30 @@
 -------------------------------------------------------------------
+Mon Nov 16 12:28:14 CET 2015 - ma@suse.de
+
+- createPot: Fix plural form detection (bsc#955053)
+- version 1.12.26
+
+-------------------------------------------------------------------
+Sun Nov 15 01:14:02 CET 2015 - ma@suse.de
+
+- Update zypper-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Nov 12 01:14:07 CET 2015 - ma@suse.de
+
+- Update zypper-po.tar.bz2
+
+-------------------------------------------------------------------
+Sun Nov  8 01:14:48 CET 2015 - ma@suse.de
+
+- Update sle-zypper-po.tar.bz2
+
+-------------------------------------------------------------------
+Sun Nov  8 01:13:21 CET 2015 - ma@suse.de
+
+- Update zypper-po.tar.bz2
+
+-------------------------------------------------------------------
 Fri Nov  6 11:03:59 CET 2015 - ma@suse.de
 
 - Fix #83 incomplete bash completion for --type

diff --git a/po/createPot b/po/createPot
index 1116dc1..5c85561 100755 (executable)
--- a/po/createPot
+++ b/po/createPot
@@ -12,4 +12,4 @@ SRCFILES=`find src \
                                 -o -name "*.cpp"`
 
 #calling xgettext with the sourcefiles
-xgettext -L C++ --boost --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --keyword=_PL:1,2 --foreign-user --copyright-holder="SuSE Linux GmbH, Nuernberg" --package-name=zypper --default-domain=zypper --output="$POTFILE" $SRCFILES
+xgettext -L C++ --boost --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --keyword=PL_:1,2 --foreign-user --copyright-holder="SuSE Linux GmbH, Nuernberg" --package-name=zypper --default-domain=zypper --output="$POTFILE" $SRCFILES

diff --git a/po/sle-zypper-po.tar.bz2 b/po/sle-zypper-po.tar.bz2
index 669e2e4..4aac3b5 100644 (file)
Binary files a/po/sle-zypper-po.tar.bz2 and b/po/sle-zypper-po.tar.bz2 differ

diff --git a/po/zypper-po.tar.bz2 b/po/zypper-po.tar.bz2
index b41a429..98bb5a0 100644 (file)
Binary files a/po/zypper-po.tar.bz2 and b/po/zypper-po.tar.bz2 differ