From 553b44184dcaaf91b903d38207cb1523487f784b Mon Sep 17 00:00:00 2001 From: Christopher Hofmann Date: Tue, 11 Oct 2016 14:16:22 +0200 Subject: [PATCH 1/2] Use own textdomain (gtk-pkg instead of gtk) (bsc#1004050) --- src/YGPackageSelector.cc | 2 +- src/pkg-selector-help.cc | 2 +- src/ygtkpkgdetailview.cc | 2 +- src/ygtkpkgfilterview.cc | 2 +- src/ygtkpkghistorydialog.cc | 2 +- src/ygtkpkglanguageview.cc | 2 +- src/ygtkpkglistview.cc | 2 +- src/ygtkpkgmenubar.cc | 2 +- src/ygtkpkgpatternview.cc | 2 +- src/ygtkpkgproductdialog.cc | 2 +- src/ygtkpkgquerycombo.cc | 3 ++- src/ygtkpkgrpmgroupsview.cc | 2 +- src/ygtkpkgsearchentry.cc | 2 +- src/ygtkpkgstatusbar.cc | 2 +- src/ygtkpkgundolist.cc | 2 +- src/ygtkpkgvestigialdialog.cc | 2 +- src/yzypptags.cc | 2 +- src/yzyppwrapper.cc | 2 +- 18 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/YGPackageSelector.cc b/src/YGPackageSelector.cc index 076307e..0d52300 100644 --- a/src/YGPackageSelector.cc +++ b/src/YGPackageSelector.cc @@ -2,7 +2,7 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/pkg-selector-help.cc b/src/pkg-selector-help.cc index b671c36..7e1958a 100644 --- a/src/pkg-selector-help.cc +++ b/src/pkg-selector-help.cc @@ -2,7 +2,7 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/ygtkpkgdetailview.cc b/src/ygtkpkgdetailview.cc index d14a210..d5f916c 100644 --- a/src/ygtkpkgdetailview.cc +++ b/src/ygtkpkgdetailview.cc @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/ygtkpkgfilterview.cc b/src/ygtkpkgfilterview.cc index b9b8012..549c22f 100644 --- a/src/ygtkpkgfilterview.cc +++ b/src/ygtkpkgfilterview.cc @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/ygtkpkghistorydialog.cc b/src/ygtkpkghistorydialog.cc index c982579..ed433ad 100644 --- a/src/ygtkpkghistorydialog.cc +++ b/src/ygtkpkghistorydialog.cc @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/ygtkpkglanguageview.cc b/src/ygtkpkglanguageview.cc index 69c4253..ae8100b 100644 --- a/src/ygtkpkglanguageview.cc +++ b/src/ygtkpkglanguageview.cc @@ -1,7 +1,7 @@ /******************************************************************** * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ -/* Textdomain "yast2-gtk" */ +/* Textdomain "gtk-pkg" */ /* YGtkPkgLanguageView, language list implementation */ // check the header file for information about this widget diff --git a/src/ygtkpkglistview.cc b/src/ygtkpkglistview.cc index 8aa294d..09ec837 100644 --- a/src/ygtkpkglistview.cc +++ b/src/ygtkpkglistview.cc @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #define YUILogComponent "gtk" diff --git a/src/ygtkpkgmenubar.cc b/src/ygtkpkgmenubar.cc index 43dea89..7b81eb3 100644 --- a/src/ygtkpkgmenubar.cc +++ b/src/ygtkpkgmenubar.cc @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/ygtkpkgpatternview.cc b/src/ygtkpkgpatternview.cc index c46f945..602bf82 100644 --- a/src/ygtkpkgpatternview.cc +++ b/src/ygtkpkgpatternview.cc @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/ygtkpkgproductdialog.cc b/src/ygtkpkgproductdialog.cc index 500803c..784119c 100644 --- a/src/ygtkpkgproductdialog.cc +++ b/src/ygtkpkgproductdialog.cc @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/ygtkpkgquerycombo.cc b/src/ygtkpkgquerycombo.cc index 16780ad..339bad0 100644 --- a/src/ygtkpkgquerycombo.cc +++ b/src/ygtkpkgquerycombo.cc @@ -1,3 +1,4 @@ + /******************************************************************** * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ @@ -5,7 +6,7 @@ // check the header file for information about this widget /* - Textdomain "yast2-gtk" + Textdomain "gtk-pkg" */ #define YUILogComponent "gtk-pkg" diff --git a/src/ygtkpkgrpmgroupsview.cc b/src/ygtkpkgrpmgroupsview.cc index 16321bb..b51999c 100644 --- a/src/ygtkpkgrpmgroupsview.cc +++ b/src/ygtkpkgrpmgroupsview.cc @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/ygtkpkgsearchentry.cc b/src/ygtkpkgsearchentry.cc index bd7696e..bc0ab42 100644 --- a/src/ygtkpkgsearchentry.cc +++ b/src/ygtkpkgsearchentry.cc @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/ygtkpkgstatusbar.cc b/src/ygtkpkgstatusbar.cc index cce230b..cbd3ccf 100644 --- a/src/ygtkpkgstatusbar.cc +++ b/src/ygtkpkgstatusbar.cc @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/ygtkpkgundolist.cc b/src/ygtkpkgundolist.cc index 1897a74..1aae4bd 100644 --- a/src/ygtkpkgundolist.cc +++ b/src/ygtkpkgundolist.cc @@ -5,7 +5,7 @@ // check the header file for information about this utility /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/ygtkpkgvestigialdialog.cc b/src/ygtkpkgvestigialdialog.cc index dc85eae..bada8e4 100644 --- a/src/ygtkpkgvestigialdialog.cc +++ b/src/ygtkpkgvestigialdialog.cc @@ -5,7 +5,7 @@ // check the header file for information about this widget /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/yzypptags.cc b/src/yzypptags.cc index 614b385..5c303a3 100644 --- a/src/yzypptags.cc +++ b/src/yzypptags.cc @@ -5,7 +5,7 @@ // check the header file for information about this translator /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "YGi18n.h" diff --git a/src/yzyppwrapper.cc b/src/yzyppwrapper.cc index 1d302d6..825383d 100644 --- a/src/yzyppwrapper.cc +++ b/src/yzyppwrapper.cc @@ -5,7 +5,7 @@ // check the header file for information about this wrapper /* - Textdomain "gtk" + Textdomain "gtk-pkg" */ #include "config.h" From 935ee680e930bc9083b36b59522dca51eeccb772 Mon Sep 17 00:00:00 2001 From: Christopher Hofmann Date: Tue, 11 Oct 2016 14:23:09 +0200 Subject: [PATCH 2/2] Packaging --- package/libyui-gtk-pkg-doc.spec | 2 +- package/libyui-gtk-pkg.changes | 6 ++++++ package/libyui-gtk-pkg.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/libyui-gtk-pkg-doc.spec b/package/libyui-gtk-pkg-doc.spec index 92dc3f5..2254a96 100644 --- a/package/libyui-gtk-pkg-doc.spec +++ b/package/libyui-gtk-pkg-doc.spec @@ -20,7 +20,7 @@ %define so_version 7 Name: %{parent}-doc -Version: 2.43.3 +Version: 2.43.4 Release: 0 Source: %{parent}-%{version}.tar.bz2 diff --git a/package/libyui-gtk-pkg.changes b/package/libyui-gtk-pkg.changes index 3a974a8..be6982c 100644 --- a/package/libyui-gtk-pkg.changes +++ b/package/libyui-gtk-pkg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 11 12:21:12 UTC 2016 - cwh@suse.com + +- Use own textdomain (gtk-pkg instead of gtk) (bsc#1004050) +- 2.43.4 + ------------------------------------------------------------------- Wed Sep 16 17:29:23 CEST 2015 - mvidner@suse.com diff --git a/package/libyui-gtk-pkg.spec b/package/libyui-gtk-pkg.spec index fb936f9..391d9a0 100644 --- a/package/libyui-gtk-pkg.spec +++ b/package/libyui-gtk-pkg.spec @@ -17,7 +17,7 @@ Name: libyui-gtk-pkg -Version: 2.43.3 +Version: 2.43.4 Release: 0 Source: %{name}-%{version}.tar.bz2