rev 16074 - in trunk/packages/kdebase-workspace/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2009-10-06 22:29:02 +0000 (Tue, 06 Oct 2009)
New Revision: 16074

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
Log:
Don't hack in a Debian in a user oriented string that normally is
translated upstream, but with that patch not translated at all.

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-10-06 22:12:16 UTC (rev 16073)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-10-06 22:29:02 UTC (rev 16074)
@@ -1,3 +1,10 @@
+kdebase-workspace (4:4.3.2-2) UNRELEASED; urgency=low
+
+  * Don't hack in a Debian in a user oriented string that normally is
+    translated upstream, but with that patch not translated at all.
+
+ -- Sune Vuorela <debian at pusling.com>  Wed, 07 Oct 2009 00:28:09 +0200
+
 kdebase-workspace (4:4.3.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2009-10-06 22:12:16 UTC (rev 16073)
+++ trunk/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2009-10-06 22:29:02 UTC (rev 16074)
@@ -1,23 +1,3 @@
---- a/kcontrol/kdm/kdm-dlg.cpp
-+++ b/kcontrol/kdm/kdm-dlg.cpp
-@@ -281,7 +281,7 @@ void KDMDialogWidget::load()
- 
- 	// Read the greeting string
- 	greetstr_lined->setText( configGrp.readEntry( "GreetString",
--	                                              i18n("Welcome to %s at %n") ) );
-+	                                              i18n("Welcome to Debian at %n") ) );
- 
- 	// Regular logo or clock
- 	QString logoArea = configGrp.readEntry( "LogoArea", "Logo" );
-@@ -309,7 +309,7 @@ void KDMDialogWidget::load()
- 
- void KDMDialogWidget::defaults()
- {
--	greetstr_lined->setText( i18n("Welcome to %s at %n") );
-+	greetstr_lined->setText( i18n("Welcome to Debian at %n") );
- 	logoRadio->setChecked( true );
- 	slotAreaRadioClicked( KdmLogo );
- 	setLogo( "" );
 --- a/kdm/config.def
 +++ b/kdm/config.def
 @@ -47,11 +47,11 @@