--- a/ChangeLog	Fri Feb 20 08:15:07 2009 +0000
+++ b/ChangeLog	Fri Feb 20 08:26:57 2009 +0000
@@ -1,3 +1,9 @@
+2009-02-20  Takao Fujiwara  <[email protected]>
+
+	* patches/gnome-power-manager-07-screensaver.diff:
+	* patches/gnome-power-manager-08-cpufreq.diff: Updated with SUN_BRANDING
+	* po-sun/gnome-power-manager/po-sun: Updated with the latest English.
+
 2009-02-20  Brian Lu  <[email protected]>
 
 	* patches/firefox3-25-pango-1-23.diff:

--- a/patches/gnome-power-manager-07-screensaver.diff	Fri Feb 20 08:15:07 2009 +0000
+++ b/patches/gnome-power-manager-07-screensaver.diff	Fri Feb 20 08:26:57 2009 +0000
@@ -144,7 +144,7 @@
 +                              <widget class="GtkCheckButton" id="checkbutton_screen_lock">
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">True</property>
-+                                <property name="label" translatable="yes">_Lock screen when computer is restored from blank screen, suspend or hibernate</property>
++                                <property name="label" translatable="yes" comments="SUN_BRANDING">_Lock screen when computer is restored from blank screen, suspend or hibernate</property>
 +                                <property name="use_underline">True</property>
 +                                <property name="response_id">0</property>
 +                                <property name="draw_indicator">True</property>

--- a/patches/gnome-power-manager-08-cpufreq.diff	Fri Feb 20 08:15:07 2009 +0000
+++ b/patches/gnome-power-manager-08-cpufreq.diff	Fri Feb 20 08:26:57 2009 +0000
@@ -820,7 +820,7 @@
 +			      <child>
 +				<widget class="GtkLabel" id="label_ac_cpu">
 +				  <property name="visible">True</property>
-+				  <property name="label" translatable="yes">Computer sp_eed policy:</property>
++				  <property name="label" translatable="yes" comments="SUN_BRANDING">Computer sp_eed policy:</property>
 +				  <property name="use_underline">True</property>
 +				  <property name="use_markup">False</property>
 +				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -879,7 +879,7 @@
 +			      <child>
 +				<widget class="GtkLabel" id="label_battery_cpu">
 +				  <property name="visible">True</property>
-+				  <property name="label" translatable="yes">Computer sp_eed policy:</property>
++				  <property name="label" translatable="yes" comments="SUN_BRANDING">Computer sp_eed policy:</property>
 +				  <property name="use_underline">True</property>
 +				  <property name="use_markup">False</property>
 +				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1289,21 +1289,25 @@
  };
  
  enum {
-@@ -99,6 +102,13 @@
+@@ -99,6 +102,17 @@
  #define ACTION_BLANK_TEXT		_("Blank screen")
  #define ACTION_NOTHING_TEXT		_("Do nothing")
  
 +/* The text that should appear in the processor combo box */
 +#define CPUFREQ_NOTHING_TEXT		_("Do nothing")
++/* SUN_BRANDING */
 +#define CPUFREQ_ONDEMAND_TEXT		_("Based on processor load")
++/* SUN_BRANDING */
 +#define CPUFREQ_CONSERVATIVE_TEXT	_("Automatic power saving")
++/* SUN_BRANDING */
 +#define CPUFREQ_POWERSAVE_TEXT		_("Maximum power saving")
++/* SUN_BRANDING */
 +#define CPUFREQ_PERFORMANCE_TEXT	_("Always maximum speed")
 +
  /* If sleep time in a slider is set to 61 it is considered as never */
  const int NEVER_TIME_ON_SLIDER = 61;
  
-@@ -704,6 +714,134 @@
+@@ -704,6 +718,134 @@
  	}
  }
  
@@ -1438,7 +1442,7 @@
  /** setup the notification page */
  static void
  prefs_setup_notification (GpmPrefs *prefs)
-@@ -815,6 +953,7 @@
+@@ -815,6 +957,7 @@
          gint page;
  
          if ((prefs->priv->has_button_lid == FALSE)
@@ -1446,7 +1450,7 @@
  	    && (prefs->priv->has_lcd == FALSE)) {
                  notebook = glade_xml_get_widget (prefs->priv->glade_xml, "notebook_preferences");
                  widget = glade_xml_get_widget (prefs->priv->glade_xml, "vbox_ac");
-@@ -827,6 +966,8 @@
+@@ -827,6 +970,8 @@
  	gpm_prefs_setup_action_combo (prefs, "combobox_ac_lid",
  				      GPM_CONF_BUTTON_LID_AC,
  				      button_lid_actions);
@@ -1455,7 +1459,7 @@
  	gpm_prefs_setup_sleep_slider (prefs, "hscale_ac_computer",
  				      GPM_CONF_TIMEOUT_SLEEP_COMPUTER_AC);
  	gpm_prefs_setup_sleep_slider (prefs, "hscale_ac_display",
-@@ -845,6 +986,16 @@
+@@ -845,6 +990,16 @@
  		widget = glade_xml_get_widget (prefs->priv->glade_xml, "hbox_ac_lid");
  		gtk_widget_hide_all (widget);
  	}
@@ -1472,7 +1476,7 @@
  #if defined(sun) && defined(__SVR4)
  	if (prefs->priv->has_lcd == FALSE || prefs->priv->can_brightness == FALSE) {
  #else
-@@ -1060,6 +1060,8 @@
+@@ -1060,6 +1064,8 @@
  	gpm_prefs_setup_action_combo (prefs, "combobox_battery_critical",
  				      GPM_CONF_ACTIONS_CRITICAL_BATT,
  				      battery_critical_actions);
@@ -1481,7 +1485,7 @@
  	gpm_prefs_setup_sleep_slider (prefs, "hscale_battery_computer",
  				      GPM_CONF_TIMEOUT_SLEEP_COMPUTER_BATT);
  	gpm_prefs_setup_sleep_slider (prefs, "hscale_battery_display",
-@@ -1133,6 +1284,8 @@
+@@ -1133,6 +1288,8 @@
  
  	prefs->priv = GPM_PREFS_GET_PRIVATE (prefs);
  
@@ -1490,7 +1494,7 @@
  	prefs->priv->screensaver = gpm_screensaver_new ();
  	g_signal_connect (prefs->priv->screensaver, "gs-delay-changed",
  			  G_CALLBACK (gs_delay_changed_cb), prefs);
-@@ -1161,6 +1314,7 @@
+@@ -1161,6 +1318,7 @@
  	GpmControl *control = gpm_control_new ();
  	if (control) {
  		prefs->priv->can_cpufreq = gpm_control_is_user_privileged (control, "hal-power-cpu");
@@ -1498,7 +1502,7 @@
  		prefs->priv->can_brightness = gpm_control_is_user_privileged (control, "hal-power-brightness");
  		g_object_unref (control);
  	} else {
-@@ -1178,6 +1332,14 @@
+@@ -1178,6 +1336,14 @@
  	gpk_prefs_setup_policykit (prefs);
  #endif
  
@@ -1513,7 +1517,7 @@
  	prefs->priv->glade_xml = glade_xml_new (GPM_DATA "/gpm-prefs.glade", NULL, NULL);
  	if (prefs->priv->glade_xml == NULL) {
  		g_error ("Cannot find 'gpm-prefs.glade'");
-@@ -1235,6 +1397,10 @@
+@@ -1235,6 +1401,10 @@
  		g_object_unref (prefs->priv->screensaver);
  	}
  

--- a/po-sun/gnome-power-manager/po-sun/cs.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/cs.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-09-30 12:44+0900\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -25,3 +25,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/de.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/de.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -37,7 +37,7 @@
 # SUN_BRANDING
 #: ../data/gpm-prefs.glade.h:7
 msgid "Computer sp_eed policy:"
-msgstr "Steuerung der Geschwindigkeit des Computers :"
+msgstr "Steuerung d_er Geschwindigkeit des Computers :"
 
 # COMMUNITY MESSAGE
 # SUN_BRANDING

--- a/po-sun/gnome-power-manager/po-sun/es.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/es.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-10-15 11:09+0100\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -31,3 +31,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr "Mostrar gráficos del rendimiento reciente de la batería"
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/fr.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/fr.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -38,7 +38,7 @@
 # SUN_BRANDING
 #: ../data/gpm-prefs.glade.h:7
 msgid "Computer sp_eed policy:"
-msgstr "Gestion de la vitesse de l'ordinateur :"
+msgstr "Gestion d_e la vitesse de l'ordinateur :"
 
 # COMMUNITY MESSAGE
 # SUN_BRANDING

--- a/po-sun/gnome-power-manager/po-sun/gnome-power-manager-sun.pot	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/gnome-power-manager-sun.pot	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -31,3 +31,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/hu.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/hu.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-09-30 12:44+0900\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -25,3 +25,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/it.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/it.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-10-14 18:25+0100\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -31,3 +31,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr "Mostra grafici delle prestazioni recenti della batteria"
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/ja.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/ja.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-09-30 12:44+0900\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -33,3 +33,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr "最近のバッテリー性能のグラフを表示します"
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/ko.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/ko.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-09-30 12:44+0900\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -31,3 +31,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr "최신 배터리 성능 그래프를 표시합니다."
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/pl.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/pl.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-09-30 12:44+0900\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -26,3 +26,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/pt_BR.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/pt_BR.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-10-14 17:08+0100\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -31,3 +31,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr "Exibir gráficos do desempenho recente da bateria"
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/ru.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/ru.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-09-30 12:44+0900\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -26,3 +26,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/sv.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/sv.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-09-30 12:44+0900\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -25,3 +25,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/zh_CN.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/zh_CN.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-09-30 12:44+0900\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -31,3 +31,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr "显示最新电池性能的图形"
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/zh_HK.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/zh_HK.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-09-30 12:44+0900\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -31,3 +31,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr "顯示最近的電池效能圖形"
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""

--- a/po-sun/gnome-power-manager/po-sun/zh_TW.po	Fri Feb 20 08:15:07 2009 +0000
+++ b/po-sun/gnome-power-manager/po-sun/zh_TW.po	Fri Feb 20 08:26:57 2009 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Sun Microsystems, Inc
+# Copyright (C) 2009 Sun Microsystems, Inc
 # This file is distributed under the same license as the gnome-power-manager package.
 #
 # Desktop Discuss <[email protected]>
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnome-power-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 12:44+0900\n"
+"POT-Creation-Date: 2009-02-20 12:28+0900\n"
 "PO-Revision-Date: 2008-09-30 12:44+0900\n"
 "Last-Translator: [email protected]\n"
 "Language-Team: [email protected]\n"
@@ -31,3 +31,35 @@
 #: ../data/gnome-power-statistics.desktop.in.in.h:3
 msgid "Show graphs of recent battery performance"
 msgstr "顯示最近的電池效能圖形"
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:7
+msgid "Computer sp_eed policy:"
+msgstr ""
+
+# SUN_BRANDING
+#: ../data/gpm-prefs.glade.h:31
+msgid ""
+"_Lock screen when computer is restored from blank screen, suspend or "
+"hibernate"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:108
+msgid "Based on processor load"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:110
+msgid "Automatic power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:112
+msgid "Maximum power saving"
+msgstr ""
+
+# SUN_BRANDING
+#: ../src/gpm-prefs-core.c:114
+msgid "Always maximum speed"
+msgstr ""