diff -Nru kde-guidance-0.8.0svn20080103/debian/changelog kde-guidance-0.8.0svn20080103/debian/changelog --- kde-guidance-0.8.0svn20080103/debian/changelog 2008-04-19 17:23:16.000000000 -0400 +++ kde-guidance-0.8.0svn20080103/debian/changelog 2008-04-19 17:23:16.000000000 -0400 @@ -1,3 +1,10 @@ +kde-guidance (0.8.0svn20080103-0ubuntu17) hardy; urgency=low + + * Modify kubuntu_31_wineconfig_no_i18_on_keys.patch to ensure that + strings are translatable. + + -- Yuriy Kozlov Sat, 19 Apr 2008 17:16:53 -0400 + kde-guidance (0.8.0svn20080103-0ubuntu16) hardy; urgency=low * kubuntu_26_kde-powermanager_handle_hal_dbus_restarts.patch: diff -Nru /tmp/hCE7nOlFdT/kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_31_wineconfig_no_i18_on_keys.patch /tmp/tXm7T8mQxp/kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_31_wineconfig_no_i18_on_keys.patch --- kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_31_wineconfig_no_i18_on_keys.patch 2008-04-19 17:23:16.000000000 -0400 +++ kde-guidance-0.8.0svn20080103/debian/patches/kubuntu_31_wineconfig_no_i18_on_keys.patch 2008-04-19 17:23:16.000000000 -0400 @@ -1,6 +1,6 @@ diff -Nur -x '*.orig' -x '*~' kde-guidance-0.8.0svn20080103/wineconfig/wineconfig.py kde-guidance-0.8.0svn20080103.new/wineconfig/wineconfig.py --- kde-guidance-0.8.0svn20080103/wineconfig/wineconfig.py 2008-01-03 11:26:48.000000000 -0500 -+++ kde-guidance-0.8.0svn20080103.new/wineconfig/wineconfig.py 2008-04-13 12:44:36.000000000 -0400 ++++ kde-guidance-0.8.0svn20080103.new/wineconfig/wineconfig.py 2008-04-19 17:05:42.000000000 -0400 @@ -1529,11 +1529,11 @@ # and size values and translations for that item # For example, the value of BorderWidth is @@ -28,7 +28,7 @@ ({"ButtonFace":[unicode(i18n("Face:")),QColor()], "ButtonHilight":[unicode(i18n("Hilight:")),QColor()], "ButtonLight":[unicode(i18n("Light:")),QColor()], -@@ -1554,27 +1554,27 @@ +@@ -1554,31 +1554,45 @@ "ButtonDkShadow":[unicode(i18n("Dark Shadow:")),QColor()], "WindowFrame":[unicode(i18n("Frame:")),QColor()]}, {}), #ButtonFace, ButtonHilight, ButtonLight, ButtonShadow, ButtonText, ButtonAlternateFace, ButtonDkShadow, WindowFrame @@ -62,7 +62,25 @@ ({"Hilight":[unicode(i18n("Hilight Color:")),QColor()], "HilightText":[unicode(i18n("Text Color:")),QColor()]}, {})} #Hilight, HilightText -@@ -1963,13 +1963,13 @@ + ++ # Below is a hack to make sure the displayed strings are translatable. ++ # The whole data structure above was a bad idea and needs to be ++ # rewritten. ++ customizableitems_tr = {"Window Border":unicode(i18n("Window Border")), ++ "Title Bar":unicode(i18n("Title Bar")), ++ "Application Workspace":unicode(i18n("Application Workspace")), ++ "Buttons":unicode(i18n("Buttons")), ++ "Caption Buttons":unicode(i18n("Caption Buttons")), ++ "Desktop":unicode(i18n("Desktop")), ++ "Menu":unicode(i18n("Menu")), ++ "Scrollbar":unicode(i18n("Scrollbar")), ++ "Window":unicode(i18n("Window")), ++ "Selected Items":unicode(i18n("Selected Items"))} ++ + def __init__(self,parent = None,name = None,modal = 0,fl = 0): + global imagedir + QWidget.__init__(self,parent) +@@ -1963,13 +1977,13 @@ self.config.writeEntry("ColorScheme",self.currentcustomcolorscheme) self.config.sync() @@ -80,7 +98,7 @@ prefmask = self.desktopsettings["UserPreferencemask"] prefmask = prefmask[:4] + "1" + prefmask[5:] self.desktopsettings["UserPreferencemask"] = prefmask -@@ -2008,10 +2008,10 @@ +@@ -2008,10 +2022,10 @@ items = self.customizableitems.keys() items.sort() for item in items: @@ -91,11 +109,11 @@ + if not (allowwm and (item == "Window Border" \ + or item == "Title Bar" or \ + item == "Caption Buttons")): -+ combo.insertItem(unicode(i18n(item))) ++ combo.insertItem(self.customizableitems_tr[item]) def slotFillItemComboDesktop(self,desktop): """ -@@ -2029,10 +2029,10 @@ +@@ -2029,10 +2043,10 @@ items.sort() self.currentitems = [] for item in items: @@ -106,11 +124,11 @@ + if not (currentallowwm == 'Y' and (item == "Window Border" \ + or item == "Title Bar" or \ + item == "Caption Buttons")): -+ combo.insertItem(unicode(i18n(item))) ++ combo.insertItem(self.customizableitems_tr[item]) self.currentitems.append(item) def slotThemeActivated(self,themeid): -@@ -2114,63 +2114,63 @@ +@@ -2114,63 +2128,63 @@ config = KConfig("kdesktoprc") config.setGroup("General") @@ -201,7 +219,7 @@ config.readColorEntry("Color1",QColor(50,150,85)) self.saveColorScheme(self.colorschemes[1]) -@@ -2238,7 +2238,7 @@ +@@ -2238,7 +2252,7 @@ self.GetKdeColorScheme() if not self.selecteditem: @@ -210,7 +228,7 @@ else: self.__selectItem(self.selecteditem) -@@ -2263,7 +2263,7 @@ +@@ -2263,7 +2277,7 @@ if item1 == item: self.itemcombo.setCurrentItem(i) @@ -219,7 +237,7 @@ key = "AppWorkSpace" self.colorsizehbox1.show() self.colorsizetext1.setText(\ -@@ -2283,7 +2283,7 @@ +@@ -2283,7 +2297,7 @@ self.colorsizehbox6.hide() self.colorsizehbox7.hide() self.colorsizehbox8.hide() @@ -228,7 +246,7 @@ key = "ButtonFace" self.colorsizehbox1.show() self.colorsizetext1.setText(\ -@@ -2379,7 +2379,7 @@ +@@ -2379,7 +2393,7 @@ self.colorcombo8.setColor(\ self.customizableitems[item][0][key][1]) self.colorcombo8.setName(key) @@ -237,7 +255,7 @@ key = "CaptionHeight" self.colorsizehbox1.show() self.colorsizetext1.setText(\ -@@ -2414,7 +2414,7 @@ +@@ -2414,7 +2428,7 @@ self.colorsizehbox6.hide() self.colorsizehbox7.hide() self.colorsizehbox8.hide() @@ -246,7 +264,7 @@ key = "Background" self.colorsizehbox1.show() self.colorsizetext1.setText(\ -@@ -2434,7 +2434,7 @@ +@@ -2434,7 +2448,7 @@ self.colorsizehbox6.hide() self.colorsizehbox7.hide() self.colorsizehbox8.hide() @@ -255,7 +273,7 @@ key = "Menu" self.colorsizehbox1.show() self.colorsizetext1.setText(\ -@@ -2500,7 +2500,7 @@ +@@ -2500,7 +2514,7 @@ self.colorsizehbox6.hide() self.colorsizehbox7.hide() self.colorsizehbox8.hide() @@ -264,7 +282,7 @@ key = "Scrollbar" self.colorsizehbox1.show() self.colorsizetext1.setText(\ -@@ -2533,7 +2533,7 @@ +@@ -2533,7 +2547,7 @@ self.colorsizehbox6.hide() self.colorsizehbox7.hide() self.colorsizehbox8.hide() @@ -273,7 +291,7 @@ key = "Hilight" self.colorsizehbox1.show() self.colorsizetext1.setText(\ -@@ -2564,7 +2564,7 @@ +@@ -2564,7 +2578,7 @@ self.colorsizehbox6.hide() self.colorsizehbox7.hide() self.colorsizehbox8.hide() @@ -282,7 +300,7 @@ key = "ActiveTitle" self.colorsizehbox1.show() self.colorsizetext1.setText(\ -@@ -2639,7 +2639,7 @@ +@@ -2639,7 +2653,7 @@ self.colorsizehbox7.hide() self.colorsizehbox8.hide() @@ -291,7 +309,7 @@ key = "Window" self.colorsizehbox1.show() self.colorsizetext1.setText(\ -@@ -2670,7 +2670,7 @@ +@@ -2670,7 +2684,7 @@ self.colorsizehbox6.hide() self.colorsizehbox7.hide() self.colorsizehbox8.hide() @@ -300,7 +318,7 @@ key = "ActiveBorder" self.colorsizehbox1.show() self.colorsizetext1.setText(\ -@@ -2733,11 +2733,11 @@ +@@ -2733,11 +2747,11 @@ # --- Some default color schemes, with names --- preset1 = (unicode(i18n("Purple")), @@ -314,7 +332,7 @@ ({"ActiveTitle":[unicode(i18n("Active Color:")),QColor(91,86,168)], "GradientActiveTitle":[unicode(i18n("Gradient:")),QColor(136,118,202)], "InactiveTitle":[unicode(i18n("Inactive Color:")),QColor(223,225,230)], -@@ -2745,10 +2745,10 @@ +@@ -2745,10 +2759,10 @@ "TitleText":[unicode(i18n("Active Text:")),QColor(255,255,255)], "InactiveTitleText":[unicode(i18n("Inactive Text:")),QColor(168,168,168)]}, {}), #ActiveTitle, GradientActiveTitle, InactiveTitle, GradientInactiveTitle, TitleText, InactiveTitleText @@ -327,7 +345,7 @@ ({"ButtonFace":[unicode(i18n("Face:")),QColor(238,239,242)], "ButtonHilight":[unicode(i18n("Hilight:")),QColor(255,255,255)], "ButtonLight":[unicode(i18n("Light:")),QColor(201,199,255)], -@@ -2758,37 +2758,37 @@ +@@ -2758,37 +2772,37 @@ "ButtonDkShadow":[unicode(i18n("Dark Shadow:")),QColor(98,96,143)], "WindowFrame":[unicode(i18n("Frame:")),QColor(144,140,209)]}, {}), #ButtonFace, ButtonHilight, ButtonLight, ButtonShadow, ButtonText, ButtonAlternateFace, ButtonDkShadow, WindowFrame @@ -373,7 +391,7 @@ ({"ActiveTitle":[unicode(i18n("Active Color:")),QColor(0,113,201)], "GradientActiveTitle":[unicode(i18n("Gradient:")),QColor(87,161,219)], "InactiveTitle":[unicode(i18n("Inactive Color:")),QColor(191,191,191)], -@@ -2796,10 +2796,10 @@ +@@ -2796,10 +2810,10 @@ "TitleText":[unicode(i18n("Active Text:")),QColor(255,255,255)], "InactiveTitleText":[unicode(i18n("Inactive Text:")),QColor(95,95,95)]}, {}), #ActiveTitle, GradientActiveTitle, InactiveTitle, GradientInactiveTitle, TitleText, InactiveTitleText @@ -386,7 +404,7 @@ ({"ButtonFace":[unicode(i18n("Face:")),QColor(239,239,239)], "ButtonHilight":[unicode(i18n("Hilight:")),QColor(246,246,246)], "ButtonLight":[unicode(i18n("Light:")),QColor(191,207,251)], -@@ -2809,27 +2809,27 @@ +@@ -2809,27 +2823,27 @@ "ButtonDkShadow":[unicode(i18n("Dark Shadow:")),QColor(50,101,146)], "WindowFrame":[unicode(i18n("Frame:")),QColor(74,149,214)]}, {}), #ButtonFace, ButtonHilight, ButtonLight, ButtonShadow, ButtonText, ButtonAlternateFace, ButtonDkShadow, WindowFrame