rpms/kdebase-workspace/F-10 kdebase-workspace-4.1.2-kdm-i18n.patch, 1.1, 1.2

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23637

Modified Files:
	kdebase-workspace-4.1.2-kdm-i18n.patch 
Log Message:
better fix


kdebase-workspace-4.1.2-kdm-i18n.patch:

Index: kdebase-workspace-4.1.2-kdm-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace-4.1.2-kdm-i18n.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.1.2-kdm-i18n.patch	5 Nov 2008 17:47:20 -0000	1.1
+++ kdebase-workspace-4.1.2-kdm-i18n.patch	6 Nov 2008 11:16:36 -0000	1.2
@@ -1,13 +1,13 @@
-diff -up kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp.i18n kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp
---- kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp.i18n	2008-11-05 17:56:34.000000000 +0100
-+++ kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp	2008-11-05 17:54:19.000000000 +0100
-@@ -234,24 +234,24 @@ KdmLabel::update()
+diff -up kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp.orig kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp
+--- kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp.orig	2008-11-06 11:51:38.000000000 +0100
++++ kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp	2008-11-06 11:45:09.000000000 +0100
+@@ -233,39 +233,47 @@ KdmLabel::update()
+ 	}
  }
  
- static const struct {
+-static const struct {
 -	const char *type, *text;
-+	const char *type, *text, *context;
- } stocks[] = {
+-} stocks[] = {
 -	{ "language",          I18N_NOOP2("@action:button", "Lan_guage") },
 -	{ "session",           I18N_NOOP2("@action:button", "Session _Type") },
 -	{ "system",            I18N_NOOP2("@action:button", "_Menu") },	// i18n("Actions");
@@ -24,42 +24,56 @@
 -	{ "username-label",    I18N_NOOP("_Username:") },
 -	{ "password-label",    I18N_NOOP("_Password:") },
 -	{ "login",             I18N_NOOP2("@action:button", "_Login") }
-+	{ "language",          I18N_NOOP2("@action:button", "Lan_guage"), "@action:button" },
-+	{ "session",           I18N_NOOP2("@action:button", "Session _Type"), "@action:button" },
-+	{ "system",            I18N_NOOP2("@action:button", "_Menu"), "@action:button" },	// i18n("Actions");
-+	{ "disconnect",        I18N_NOOP2("@action:button ... from XDMCP server", "Disconn_ect"), "@action:button" },
-+	{ "quit",              I18N_NOOP2("@action:button", "_Quit"), "@action:button" },
-+	{ "halt",              I18N_NOOP2("@action:button", "Power o_ff"), "@action:button" },
-+//	{ "suspend",           I18N_NOOP2("@action:button", "_Suspend") , "@action:button"},
-+	{ "reboot",            I18N_NOOP2("@action:button", "Re_boot"), "@action:button" },
-+	{ "chooser",           I18N_NOOP2("@action:button", "_Remote login"), "@action:button" },
-+	{ "caps-lock-warning", I18N_NOOP("Caps Lock is enabled"), NULL },
-+	{ "timed-label",       I18N_NOOP("User %u will log in in %t"), NULL },
-+	{ "welcome-label",     I18N_NOOP("Welcome to %h"), NULL },	// _greetString
-+	{ "domain-label",      I18N_NOOP("_Domain:"), NULL },
-+	{ "username-label",    I18N_NOOP("_Username:"), NULL },
-+	{ "password-label",    I18N_NOOP("_Password:"), NULL },
-+	{ "login",             I18N_NOOP2("@action:button", "_Login"), "@action:button" }
- };
- 
+-};
+-
  // public static
-@@ -260,10 +260,15 @@ KdmLabel::lookupStock( const QString &st
+ QString
+ KdmLabel::lookupStock( const QString &stock )
  {
  	QString type( stock.toLower() );
- 
+-
 -	for (uint i = 0; i < sizeof(stocks)/sizeof(stocks[0]); i++)
 -		if (type == stocks[i].type)
 -			return i18n(stocks[i].text);
 -
-+	for (uint i = 0; i < sizeof(stocks)/sizeof(stocks[0]); i++) {
-+		if (type == stocks[i].type) {
-+			if (stocks[i].context) {
-+				return i18nc(stocks[i].context, stocks[i].text);
-+			}
-+			else
-+				return i18n(stocks[i].text);
-+		}
+-	kWarning() << "Invalid <stock> element '" << stock << "'. Check your theme!";
+-	return stock;
++	if (type == "language") {
++		return i18nc("@action:button", "Lan_guage");
++	} else if (type == "session") {
++		return i18nc("@action:button", "Session _Type");
++	} else if (type == "system") {
++		return i18nc("@action:button", "_Menu");
++	} else if (type == "disconnect") {
++		return i18nc("@action:button ... from XDMCP server", "Disconn_ect");
++	} else if (type == "quit") {
++		return i18nc("@action:button", "_Quit");
++	} else if (type == "halt") {
++		return i18nc("@action:button", "Power o_ff");
++	} else if (type == "suspend") {
++		return i18nc("@action:button", "_Suspend");
++	} else if (type == "reboot") {
++		return i18nc("@action:button", "Re_boot");
++	} else if (type == "chooser") {
++		return i18nc("@action:button", "_Remote login");
++	} else if (type == "caps-lock-warning") {
++		return i18n("Caps Lock is enabled");
++	} else if (type == "timed-label") {
++		return i18n("User %u will log in in %t");
++	} else if (type == "welcome-label") {
++		return i18n("Welcome to %h");
++	} else if (type == "domain-label") {
++		return i18n("_Domain:");
++	} else if (type == "username-label") {
++		return i18n("_Username:");
++	} else if (type == "password-label") {
++		return i18n("_Password:");
++	} else if (type == "login") {
++		return i18nc("@action:button", "_Login");
++	} else {
++		kWarning() << "Invalid <stock> element '" << stock << "'. Check your theme!";
++		return stock;
 +	}
- 	kWarning() << "Invalid <stock> element '" << stock << "'. Check your theme!";
- 	return stock;
  }
+ 
+ QString KdmLabel::timedUser = QString();