Release 3.1.91

Updated galician translations
Updated Spanish translation
2011-09-05 17:13:59 +02:00 · 2011-09-05 15:22:13 +02:00 · 2011-09-05 14:05:17 +02:00 · 2011-09-05 12:13:48 +01:00 · 2011-09-05 12:13:48 +01:00 · 2011-09-05 12:13:03 +01:00
12 changed files with 6404 additions and 5849 deletions
--- a/48
+++ b/48
@@ -1,3 +1,51 @@
+===========================
+Version 3.1.91 (2011-09-05)
+===========================
+
+Color:
+- Ensure the calibrate program gets run correctly (Richard Hughes)
+- Use a mnemonic character on the Import button (Jiro Matsuzawa) (#658167)
+- If cancelling profile import don't show the empty assign dialog (Richard Hughes) (#658180)
+- Do not use a GtkSeparatorToolItem in the GtkToolbar (Richard Hughes)
+
+Display:
+- Clean up signal handling when finalized (Bastien Nocera) (#657919)
+
+Media:
+- Use new media-removable icon (Bastien Nocera) (#657801)
+
+Network:
+- Set the org.gnome.system.proxy.http 'enabled' key if the user sets a HTTP proxy (Richard Hughes)
+- Explicitly unset 'use-same-proxy' as there's no UI for that (Richard Hughes) (#657235)
+
+Power:
+- Don't print a message to .xsession-errors if it's not an error (Richard Hughes)
+- Use a proper icon for the panel (Jakub Steiner) (#645536)
+- Update the UI to reflect the new mockup (Richard Hughes)
+
+Screen:
+- Hide brightness heading when unused (Bastien Nocera) (#657606)
+
+Shell:
+- Use symbolic name for minimum height (Bastien Nocera)
+
+Sound:
+- Add some (element-type) annotations to appease g-i master (Dan Winship)
+
+Wacom:
+- Dim the labels (grey, not black) (Peter Hutterer) (#657812)
+
+Translations:
+- be (Yuri Matsuk, Ihar Hrachyshka)
+- es (Jorge González)
+- fi (Timo Jyrinki)
+- gl (Fran Dieguez)
+- ja (Jiro Matsuzawa)
+- nb (Kjartan Maraas)
+- pa (A S Alam)
+- ru (Yuri Myasoedov)
+- sv (Daniel Nylander)
+
 ===========================
 Version 3.1.90 (2011-08-30)
 ===========================
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-m4_define([gnome_control_center_version], 3.1.90)
+m4_define([gnome_control_center_version], 3.1.91)
 AC_INIT([gnome-control-center], [gnome_control_center_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])

--- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c
@@ -201,7 +201,7 @@ gcm_prefs_file_chooser_get_icc_profile (CcColorPanel *prefs)
  dialog = gtk_file_chooser_dialog_new (_("Select ICC Profile File"), window,
                                        GTK_FILE_CHOOSER_ACTION_OPEN,
                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        _("Import"), GTK_RESPONSE_ACCEPT,
+                                        _("_Import"), GTK_RESPONSE_ACCEPT,
                                        NULL);
  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER(dialog), g_get_home_dir ());
  gtk_file_chooser_set_create_folders (GTK_FILE_CHOOSER(dialog), FALSE);
@@ -351,6 +351,14 @@ gcm_prefs_combo_sort_func_cb (GtkTreeModel *model,
  return retval;
 }

+static gboolean
+gcm_prefs_combo_set_default_cb (gpointer user_data)
+{
+  GtkWidget *widget = GTK_WIDGET (user_data);
+  gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
+  return FALSE;
+}
+
 static void
 gcm_prefs_add_profiles_suitable_for_devices (CcColorPanel *prefs,
                                             GtkWidget *widget,
@@ -425,7 +433,7 @@ gcm_prefs_add_profiles_suitable_for_devices (CcColorPanel *prefs,
 #if CD_CHECK_VERSION(0,1,12)
  gcm_prefs_combobox_add_profile (widget, NULL, GCM_PREFS_ENTRY_TYPE_IMPORT, NULL);
 #endif
-  gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
+  g_idle_add (gcm_prefs_combo_set_default_cb, widget);
 out:
  if (profile_array != NULL)
    g_ptr_array_unref (profile_array);
@@ -1111,6 +1119,19 @@ gcm_prefs_profile_combo_changed_cb (GtkWidget *widget,
        {
          g_warning ("failed to get ICC file");
          gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
+
+          /* if we've got no other existing profiles to choose, then
+           * just close the assign dialog */
+          gtk_combo_box_get_active_iter (GTK_COMBO_BOX(widget), &iter);
+          gtk_tree_model_get (model, &iter,
+                              GCM_PREFS_COMBO_COLUMN_TYPE, &entry_type,
+                              -1);
+          if (entry_type == GCM_PREFS_ENTRY_TYPE_IMPORT)
+            {
+              widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
+                                                           "dialog_assign"));
+              gtk_widget_hide (widget);
+            }
          goto out;
        }

--- a/panels/color/color.ui
+++ b/panels/color/color.ui
@@ -290,10 +290,16 @@
                  </packing>
                </child>
                <child>
-                  <object class="GtkSeparatorToolItem" id="toolbutton2">
+                  <object class="GtkToolItem" id="toolbutton_spacer">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="use_action_appearance">False</property>
+                    <child>
+                      <object class="GtkLabel" id="label_toolbar_padding">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                    </child>
                  </object>
                  <packing>
                    <property name="expand">True</property>
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -388,6 +388,7 @@ combo_time_changed_cb (GtkWidget *widget, CcPowerPanel *self)
  gint value;
  gboolean ret;
  const gchar *key = (const gchar *)g_object_get_data (G_OBJECT(widget), "_gsettings_key");
+  gchar *key_timeout;

  /* no selection */
  ret = gtk_combo_box_get_active_iter (GTK_COMBO_BOX(widget), &iter);
@@ -400,8 +401,11 @@ combo_time_changed_cb (GtkWidget *widget, CcPowerPanel *self)
                      1, &value,
                      -1);

-  /* set both battery and ac keys */
-  g_settings_set_int (self->priv->gsd_settings, key, value);
+  /* set both keys */
+  key_timeout = g_strdup_printf ("%s-timeout", key);
+  g_settings_set_int (self->priv->gsd_settings, key_timeout, value);
+  g_settings_set_boolean (self->priv->gsd_settings, key, value != 0);
+  g_free (key_timeout);
 }

 static void
@@ -542,14 +546,11 @@ set_ac_battery_ui_mode (CcPowerPanel *self)
  g_ptr_array_unref (devices);
 out:
  widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-                                               "vbox_actions"));
+                                               "box_header"));
  gtk_widget_set_visible (widget, has_batteries);
  widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-                                               "vbox_battery"));
+                                               "combobox_sleep_battery"));
  gtk_widget_set_visible (widget, has_batteries);
-  widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-                                               "hbox_ac"));
-  gtk_widget_set_visible (widget, !has_batteries);
 }

 static void
@@ -557,7 +558,6 @@ cc_power_panel_init (CcPowerPanel *self)
 {
  GError     *error;
  GtkWidget  *widget;
-  GtkWidget  *target;
  gint        value;

  self->priv = POWER_PANEL_PRIVATE (self);
@@ -600,70 +600,12 @@ cc_power_panel_init (CcPowerPanel *self)
                    G_CALLBACK (on_lock_settings_changed),
                    self);

-  /* setup the checkboxes correcty */
-  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-                                               "checkbutton_sleep_ac"));
-  target = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-                                               "combobox_sleep_ac"));
-  g_object_bind_property (widget, "active",
-                          target, "sensitive",
-                          G_BINDING_SYNC_CREATE);
-  gtk_widget_set_sensitive (widget,
-                            up_client_get_can_suspend (self->priv->up_client));
-
-  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-                                               "checkbutton_sleep_battery"));
-  target = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-                                               "combobox_sleep_battery"));
-  g_object_bind_property (widget, "active",
-                          target, "sensitive",
-                          G_BINDING_SYNC_CREATE);
-  gtk_widget_set_sensitive (widget,
-                            up_client_get_can_suspend (self->priv->up_client));
-
-  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-                                               "checkbutton_sleep"));
-  target = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-                                               "combobox_sleep"));
-  g_object_bind_property (widget, "active",
-                          target, "sensitive",
-                          G_BINDING_SYNC_CREATE);
-  gtk_widget_set_sensitive (widget,
-                            up_client_get_can_suspend (self->priv->up_client));
-
-  /* bind the checkboxes */
-  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-                                               "checkbutton_sleep_ac"));
-  g_settings_bind (self->priv->gsd_settings,
-                   "sleep-inactive-ac",
-                   widget, "active",
-                   G_SETTINGS_BIND_DEFAULT);
-  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-                                               "checkbutton_sleep_battery"));
-  g_settings_bind (self->priv->gsd_settings,
-                   "sleep-inactive-battery",
-                   widget, "active",
-                   G_SETTINGS_BIND_DEFAULT);
-  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-                                               "checkbutton_sleep"));
-  g_settings_bind (self->priv->gsd_settings,
-                   "sleep-inactive-ac",
-                   widget, "active",
-                   G_SETTINGS_BIND_DEFAULT);
-
  /* auto-sleep time */
  value = g_settings_get_int (self->priv->gsd_settings, "sleep-inactive-ac-timeout");
  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
                                               "combobox_sleep_ac"));
  set_value_for_combo (GTK_COMBO_BOX (widget), value);
-  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "sleep-inactive-ac-timeout");
-  g_signal_connect (widget, "changed",
-                    G_CALLBACK (combo_time_changed_cb),
-                    self);
-  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
-                                               "combobox_sleep"));
-  set_value_for_combo (GTK_COMBO_BOX (widget), value);
-  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "sleep-inactive-ac-timeout");
+  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "sleep-inactive-ac");
  g_signal_connect (widget, "changed",
                    G_CALLBACK (combo_time_changed_cb),
                    self);
@@ -671,7 +613,7 @@ cc_power_panel_init (CcPowerPanel *self)
  widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
                                               "combobox_sleep_battery"));
  set_value_for_combo (GTK_COMBO_BOX (widget), value);
-  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "sleep-inactive-battery-timeout");
+  g_object_set_data (G_OBJECT(widget), "_gsettings_key", "sleep-inactive-battery");
  g_signal_connect (widget, "changed",
                    G_CALLBACK (combo_time_changed_cb),
                    self);
--- a/panels/power/power.ui
+++ b/panels/power/power.ui
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkListStore" id="liststore_sleep">
+  <object class="GtkListStore" id="liststore_critical">
    <columns>
      <!-- column-name name -->
      <column type="gchararray"/>
@@ -13,13 +12,13 @@
    </columns>
    <data>
      <row>
-        <col id="0" translatable="yes">Suspend</col>
-        <col id="1">1</col>
+        <col id="0" translatable="yes">Hibernate</col>
+        <col id="1">3</col>
        <col id="2">True</col>
      </row>
      <row>
-        <col id="0" translatable="yes">Hibernate</col>
-        <col id="1">3</col>
+        <col id="0" translatable="yes">Shutdown</col>
+        <col id="1">2</col>
        <col id="2">True</col>
      </row>
    </data>
@@ -61,7 +60,7 @@
      </row>
    </data>
  </object>
-  <object class="GtkListStore" id="liststore_critical">
+  <object class="GtkListStore" id="liststore_sleep">
    <columns>
      <!-- column-name name -->
      <column type="gchararray"/>
@@ -71,358 +70,18 @@
      <column type="gboolean"/>
    </columns>
    <data>
+      <row>
+        <col id="0" translatable="yes">Suspend</col>
+        <col id="1">1</col>
+        <col id="2">True</col>
+      </row>
      <row>
        <col id="0" translatable="yes">Hibernate</col>
        <col id="1">3</col>
        <col id="2">True</col>
      </row>
-      <row>
-        <col id="0" translatable="yes">Shutdown</col>
-        <col id="1">2</col>
-        <col id="2">True</col>
-      </row>
    </data>
  </object>
-  <object class="GtkSizeGroup" id="sizegroup_combos">
-    <widgets>
-      <widget name="combobox_critical"/>
-      <widget name="combobox_sleep"/>
-      <widget name="combobox_sleep_battery"/>
-      <widget name="combobox_sleep_ac"/>
-    </widgets>
-  </object>
-  <object class="GtkWindow" id="window_power">
-    <property name="resizable">False</property>
-    <child>
-      <object class="GtkVBox" id="vbox_power">
-        <property name="visible">True</property>
-        <property name="border_width">12</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox_ac_batt">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkVBox" id="vbox_battery">
-                <property name="visible">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkHBox" id="hbox11">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" id="label6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Put the computer to sleep when inactive:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="vbox30">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox12">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox14">
-                            <property name="visible">True</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_sleep_ac">
-                                <property name="label" translatable="yes">On AC _power:</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="padding">12</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="combobox_sleep_ac">
-                            <property name="visible">True</property>
-                            <property name="model">liststore_time</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox13">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox15">
-                            <property name="visible">True</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_sleep_battery">
-                                <property name="label" translatable="yes">On _battery power:</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="padding">12</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="combobox_sleep_battery">
-                            <property name="visible">True</property>
-                            <property name="model">liststore_time</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox_ac">
-                <property name="visible">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkHBox" id="hbox10">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_sleep">
-                        <property name="label" translatable="yes">Put the computer to sleep when inactive:</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="combobox_sleep">
-                    <property name="visible">True</property>
-                    <property name="model">liststore_time</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkVBox" id="vbox_actions">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkHBox" id="hbox5">
-                <property name="visible">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkHBox" id="hbox6">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" id="label5">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">When power is _critically low:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">combobox_critical</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBox" id="combobox_critical">
-                    <property name="visible">True</property>
-                    <property name="model">liststore_critical</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="hbox_status">
-            <property name="visible">False</property>
-            <child>
-              <object class="GtkHBox" id="hbox2">
-                <property name="visible">True</property>
-                <property name="border_width">12</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkImage" id="image_status">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-dialog-authentication</property>
-                    <property name="icon-size">6</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="vbox4">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox3">
-                        <property name="visible">True</property>
-                        <child>
-                          <object class="GtkLabel" id="label_title">
-                            <property name="visible">True</property>
-                            <property name="label">Battery charging</property>
-                            <attributes>
-                              <attribute name="scale" value="1.500000"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_description">
-                        <property name="visible">True</property>
-                        <property name="label">55 minutes until fully charged (6%)</property>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkSizeGroup" id="sizegroup_labels">
-    <property name="mode">horizontal</property>
-    <property name="ignore-hidden">True</property>
-    <widgets>
-      <widget name="hbox6"/>
-      <widget name="hbox10"/>
-      <widget name="hbox15"/>
-      <widget name="hbox14"/>
-    </widgets>
-  </object>
  <object class="GtkListStore" id="liststore_time">
    <columns>
      <!-- column-name name -->
@@ -447,6 +106,273 @@
        <col id="0" translatable="yes">1 hour</col>
        <col id="1">3600</col>
      </row>
+      <row>
+        <col id="0" translatable="yes">Don't suspend</col>
+        <col id="1">0</col>
+      </row>
    </data>
  </object>
+  <object class="GtkWindow" id="window_power">
+    <property name="can_focus">False</property>
+    <property name="resizable">False</property>
+    <child>
+      <object class="GtkVBox" id="vbox_power">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">12</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">9</property>
+            <child>
+              <object class="GtkBox" id="box_header">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">9</property>
+                <child>
+                  <object class="GtkLabel" id="label_header_padding">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label_header_battery">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">On battery power</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label_header_ac">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">When plugged in</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="box3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">9</property>
+                <child>
+                  <object class="GtkLabel" id="label7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Suspend when inactive for:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="combobox_sleep_battery">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">liststore_time</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="combobox_sleep_ac">
+                    <property name="width_request">150</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">liststore_time</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="box2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">9</property>
+                <child>
+                  <object class="GtkLabel" id="label5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">When power is _critically low:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">combobox_critical</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="combobox_critical">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">liststore_critical</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox_status">
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkHBox" id="hbox2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">12</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkImage" id="image_status">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-dialog-authentication</property>
+                    <property name="icon-size">6</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="vbox4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="label_title">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label">Battery charging</property>
+                            <attributes>
+                              <attribute name="scale" value="1.5"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label_description">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label">55 minutes until fully charged (6%)</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup_combos">
+    <widgets>
+      <widget name="combobox_critical"/>
+      <widget name="combobox_sleep_battery"/>
+      <widget name="combobox_sleep_ac"/>
+      <widget name="label_header_battery"/>
+      <widget name="label_header_ac"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup_labels">
+    <property name="ignore_hidden">True</property>
+    <widgets>
+      <widget name="label5"/>
+      <widget name="label7"/>
+      <widget name="label_header_padding"/>
+    </widgets>
+  </object>
 </interface>
--- a/po/be.po
+++ b/po/be.po
--- a/po/es.po
+++ b/po/es.po
@@ -12,15 +12,15 @@
 # Claudio Saavedra <csaavedra@alumnos.utalca.cl>, 2007.
 # Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
 # 
-# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
-, 2011.
+# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
+, 2011.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-29 11:27+0000\n"
+"control-center&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-09-05 11:14+0000\n"
 "PO-Revision-Date: 2011-09-05 13:59Centra\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
@@ -91,29 +91,29 @@ msgstr "Gradiente vertical"
 #: ../panels/background/bg-colors-source.c:48
 msgid "Solid Color"
 msgstr "Color sólido"
-
+
 #: ../panels/background/cc-background-panel.c:1001
 #: ../panels/user-accounts/um-photo-dialog.c:217
 #: ../panels/user-accounts/data/photo-dialog.ui.h:2
 msgid "Browse for more pictures"
 msgstr "Examinar para buscar más imágenes"
-
+
 #: ../panels/background/cc-background-panel.c:1093
 msgid "Current background"
 msgstr "Fondo actual"
-
+
 #: ../panels/background/cc-background-panel.c:1177
 msgid "Wallpapers"
 msgstr "Fondos de escritorio"
-
+
 #: ../panels/background/cc-background-panel.c:1184
 msgid "Pictures Folder"
 msgstr "Carpeta de imágenes"
-
+
 #: ../panels/background/cc-background-panel.c:1191
 msgid "Colors & Gradients"
 msgstr "Colores y gradientes"
-
+
 #: ../panels/background/cc-background-panel.c:1199
 msgid "Flickr"
 msgstr "Flickr"
@@ -328,13 +328,13 @@ msgid "Left"
 msgid "Left"
 msgstr "Izquierda"

-#: ../panels/display/display-capplet.ui.h:2
+#: ../panels/display/display-capplet.ui.h:2
 #: ../panels/display/cc-display-panel.c:641
 msgid "Monitor"
 msgstr "Monitor"

-#: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/cc-display-panel.c:469
+#: ../panels/display/display-capplet.ui.h:3
+#: ../panels/display/cc-display-panel.c:477
 #: ../panels/display/cc-display-panel.c:516
 #: ../panels/universal-access/uap.ui.h:43
 msgid "Normal"
@@ -381,15 +381,15 @@ msgstr "Pantallas"
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Proyector;xranrd;Pantalla;Resolución;Actualizar;"
-
+
 #: ../panels/display/cc-display-panel.c:478
 msgid "Counterclockwise"
 msgstr "Antihorario"
-
+
 #: ../panels/display/cc-display-panel.c:479
 msgid "Clockwise"
 msgstr "Horario"
-
+
 #: ../panels/display/cc-display-panel.c:480
 msgid "180 Degrees"
 msgstr "180 grados"
@@ -398,54 +398,54 @@ msgstr "180 grados"
 #. * screen is the same as your external monitor.  Here, "Mirror" is being
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
-#.
+#.
 #: ../panels/display/cc-display-panel.c:617
 msgid "Mirror Displays"
 msgstr "Espejar pantallas"
-
+
 #: ../panels/display/cc-display-panel.c:747
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"
-
+
 #: ../panels/display/cc-display-panel.c:749
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
-
+
 #: ../panels/display/cc-display-panel.c:1656
 msgid "Drag to change primary display."
 msgstr "Arrastrar para cambiar la pantalla principal."
-
+
 #: ../panels/display/cc-display-panel.c:1714
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr ""
 "Seleccionar un monitor para cambiar sus propiedades; arrastrarlo lo reubica."
-
+
 #: ../panels/display/cc-display-panel.c:2102
 msgid "%a %R"
 msgstr "%a %R"
-
+
 #: ../panels/display/cc-display-panel.c:2104
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
-
+
 #: ../panels/display/cc-display-panel.c:2350
 msgid "Could not save the monitor configuration"
 msgstr "No se pudo guardar la configuración del monitor"
-
+
 #: ../panels/display/cc-display-panel.c:2375
 msgid "Could not get session bus while applying display configuration"
 msgstr ""
 "No se pudo obtener la sesión del bus al aplicar la configuración de la "
 "pantalla"
-
+
 #: ../panels/display/cc-display-panel.c:2420
 msgid "Could not detect displays"
 msgstr "No se pudieron detectar las pantallas"
-
+
 #: ../panels/display/cc-display-panel.c:2614
 msgid "Could not get screen information"
 msgstr "No se pudo obtener la información de la pantalla"
@@ -2243,37 +2243,37 @@ msgid_plural "minutes"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
-
+
 #: ../panels/power/cc-power-panel.c:265
 msgid "Battery charging"
 msgstr "La batería se está cargando"
-
+
 #: ../panels/power/cc-power-panel.c:268
 msgid "Battery discharging"
 msgstr "La batería se está descargando"
-
+
 #: ../panels/power/cc-power-panel.c:279
 msgid "UPS charging"
 msgstr "SAI cargándose"
-
+
 #: ../panels/power/cc-power-panel.c:282
 msgid "UPS discharging"
 msgstr "SAI descargándose"

-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
 #: ../panels/power/cc-power-panel.c:300
 #, c-format
 msgid "%s until charged (%.0lf%%)"
 msgstr "%s hasta cargarse (%.0lf%%)"

-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
+#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
 #: ../panels/power/cc-power-panel.c:306
 #, c-format
 msgid "%s until empty (%.0lf%%)"
 msgstr "%s hasta descargarse (%.0lf%%)"

 #. TRANSLATORS: %1 is a percentage value. Note: this string is only
-#. * used when we don't have a time value
+#. * used when we don't have a time value
 #: ../panels/power/cc-power-panel.c:314
 #, c-format
 msgid "%.0lf%% charged"
@@ -2299,30 +2299,34 @@ msgid "Ask me"
 msgid "Ask me"
 msgstr "Preguntarme"

+#: ../panels/power/power.ui.h:7
+msgid "Don't suspend"
+msgstr "No suspender"
+
 #: ../panels/power/power.ui.h:8
 msgid "Hibernate"
 msgstr "Hibernar"
-
-#: ../panels/power/power.ui.h:8
-msgid "On AC _power:"
-msgstr "_Con adaptador de corriente:"

-#: ../panels/power/power.ui.h:9
-msgid "On _battery power:"
+#: ../panels/power/power.ui.h:9
+msgid "On battery power"
 msgstr "Usando batería"

-#: ../panels/power/power.ui.h:10
-msgid "Put the computer to sleep when inactive:"
-msgstr "Poner el equipo a dormir si está inactivo durante:"
-
 #: ../panels/power/power.ui.h:10
 msgid "Shutdown"
 msgstr "Apagar"
-
+
 #: ../panels/power/power.ui.h:11
 msgid "Suspend"
 msgstr "Suspender"
+
+#: ../panels/power/power.ui.h:12
+msgid "Suspend when inactive for:"
+msgstr "Suspender tras una inactividad de:"

+#: ../panels/power/power.ui.h:13
+msgid "When plugged in"
+msgstr "Cuando está conectado a la red"
+
 #: ../panels/power/power.ui.h:14
 msgid "When power is _critically low:"
 msgstr "_Cuando la carga está críticamente baja:"
@@ -2361,8 +2365,8 @@ msgid "Select ICC Profile File"
 msgid "Select ICC Profile File"
 msgstr "Seleccionar archivo de perfil ICC"

-#: ../panels/color/cc-color-panel.c:204
-msgid "Import"
+#: ../panels/color/cc-color-panel.c:204
+msgid "_Import"
 msgstr "_Importar"

 #. TRANSLATORS: filter name on the file->open dialog
@@ -2375,23 +2379,23 @@ msgid "All files"
 msgid "All files"
 msgstr "Todos los archivos"

-#. TRANSLATORS: column for device list
+#. TRANSLATORS: column for device list
 #: ../panels/color/cc-color-panel.c:718
 #: ../panels/sound/gvc-mixer-dialog.c:1548
 msgid "Device"
 msgstr "Dispositivo"

-#. TRANSLATORS: column for device list
+#. TRANSLATORS: column for device list
 #: ../panels/color/cc-color-panel.c:753
 msgid "Calibration"
 msgstr "Calibración"

-#. TRANSLATORS: this is when the button is sensitive
+#. TRANSLATORS: this is when the button is sensitive
 #: ../panels/color/cc-color-panel.c:785
 msgid "Create a color profile for the selected device"
 msgstr "Crear un perfil de color para el dispositivo seleccionado"

-#. TRANSLATORS: this is when the button is insensitive
+#. TRANSLATORS: this is when the button is insensitive
 #: ../panels/color/cc-color-panel.c:799 ../panels/color/cc-color-panel.c:823
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
@@ -2400,40 +2404,40 @@ msgstr ""
 "No se detectó el instrumento de medida. Compruebe que está encendido y "
 "correctamente conectado."

-#. TRANSLATORS: this is when the button is insensitive
+#. TRANSLATORS: this is when the button is insensitive
 #: ../panels/color/cc-color-panel.c:832
 msgid "The measuring instrument does not support printer profiling."
 msgstr "El instrumento de medida no soporta perfilado de impresoras."

-#. TRANSLATORS: this is when the button is insensitive
+#. TRANSLATORS: this is when the button is insensitive
 #: ../panels/color/cc-color-panel.c:843
 msgid "The device type is not currently supported."
 msgstr "El tipo de dispositivo actualmente no está soportado."

-#. TRANSLATORS: this is when an auto-added profile cannot be removed
+#. TRANSLATORS: this is when an auto-added profile cannot be removed
 #: ../panels/color/cc-color-panel.c:915
 msgid "Cannot remove automatically added profile"
 msgstr "No se puede quitar el perfil añadido automáticamente"

-#. TRANSLATORS: this is when there is no profile for the device
+#. TRANSLATORS: this is when there is no profile for the device
 #: ../panels/color/cc-color-panel.c:1253
 msgid "No profile"
 msgstr "Sin perfil"
-
+
 #: ../panels/color/cc-color-panel.c:1272
 #, c-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i año"
 msgstr[1] "%i años"
-
+
 #: ../panels/color/cc-color-panel.c:1283
 #, c-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mes"
 msgstr[1] "%i meses"
-
+
 #: ../panels/color/cc-color-panel.c:1294
 #, c-format
 msgid "%i week"
@@ -2441,40 +2445,40 @@ msgstr[0] "%i semana"
 msgstr[0] "%i semana"
 msgstr[1] "%i semanas"

-#. fallback
+#. fallback
 #: ../panels/color/cc-color-panel.c:1301
 #, c-format
 msgid "Less than 1 week"
 msgstr "Menos de una semana"
-
+
 #: ../panels/color/cc-color-panel.c:1361
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "RGB predeterminado"
-
+
 #: ../panels/color/cc-color-panel.c:1366
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "CMYK predeterminado"
-
+
 #: ../panels/color/cc-color-panel.c:1371
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "Gris predeterminado"
-
-#: ../panels/color/cc-color-panel.c:1464 ../panels/color/cc-color-panel.c:1486
+
+#: ../panels/color/cc-color-panel.c:1486 ../panels/color/cc-color-panel.c:1508
 #: ../panels/color/cc-color-panel.c:1519
 msgid "Uncalibrated"
 msgstr "Sin calibrar"
-
+
 #: ../panels/color/cc-color-panel.c:1489
 msgid "This device is not color managed."
 msgstr "Este dispositivo no tiene gestión de color."
-
+
 #: ../panels/color/cc-color-panel.c:1511
 msgid "This device is using manufacturing calibrated data."
 msgstr "Este dispositivo está usando los datos de calibración de fabricación."
-
+
 #: ../panels/color/cc-color-panel.c:1522
 msgid ""
 "This device does not have a profile suitable for whole-screen color "
@@ -2482,42 +2486,42 @@ msgstr ""
 msgstr ""
 "Este dispositivo no tiene un perfil apto para corrección de color en toda la "
 "pantalla."
-
+
 #: ../panels/color/cc-color-panel.c:1549
 msgid "This device has an old profile that may no longer be accurate."
 msgstr "Este dispositivo tiene un perfil antiguo que puede no ser preciso."

 #. TRANSLATORS: this is when the calibration profile age is not
-#. * specified as it has been autogenerated from the hardware
+#. * specified as it has been autogenerated from the hardware
 #: ../panels/color/cc-color-panel.c:1576
 msgid "Not specified"
 msgstr "Sin especificar"

-#. add the 'No devices detected' entry
+#. add the 'No devices detected' entry
 #: ../panels/color/cc-color-panel.c:1755
 msgid "No devices supporting color management detected"
 msgstr "No se ha detectado ningún dispositivo que tenga gestión de color"
-
+
 #: ../panels/color/cc-color-panel.c:1984
 msgctxt "Device kind"
 msgid "Display"
 msgstr "Pantalla"
-
+
 #: ../panels/color/cc-color-panel.c:1986
 msgctxt "Device kind"
 msgid "Scanner"
 msgstr "Escáner"
-
+
 #: ../panels/color/cc-color-panel.c:1988
 msgctxt "Device kind"
 msgid "Printer"
 msgstr "Impresora"
-
+
 #: ../panels/color/cc-color-panel.c:1990
 msgctxt "Device kind"
 msgid "Camera"
 msgstr "Cámara"
-
+
 #: ../panels/color/cc-color-panel.c:1992
 msgctxt "Device kind"
 msgid "Webcam"
@@ -3679,8 +3683,8 @@ msgid ""
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
-msgstr ""
-"Es posible mantener la carpeta personal, el «spool» del correo y los "
+msgstr ""
+"Es posible mantener la carpeta personal, el «spool» del correo y los archivos "
 "temporales al eliminar una cuenta de usuario."

 #: ../panels/user-accounts/um-user-panel.c:446
@@ -4099,7 +4103,6 @@ msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgstr "Tableta;Wacom;Stylus;Borrador;Ratón;"

-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
 msgid "Wacom Graphics Tablet"
 msgstr "Tableta gráfica Wacom"
@@ -4146,6 +4149,12 @@ msgstr "Centro de control"
 #: ../shell/shell.ui.h:2
 msgid "_All Settings"
 msgstr "_Todas las configuraciones"
+
+#~ msgid "On AC _power:"
+#~ msgstr "_Con adaptador de corriente:"
+
+#~ msgid "Put the computer to sleep when inactive:"
+#~ msgstr "Poner el equipo a dormir si está inactivo durante:"

 #~ msgid "Wacom"
 #~ msgstr "Wacom"
@@ -4518,9 +4527,6 @@ msgstr "_Todas las configuraciones"

 #~ msgid "Show / hide printer's jobs"
 #~ msgstr "Mostrar / ocultar trabajos de la impresora"
-
-#~ msgid "AC power and inactive for:"
-#~ msgstr "Alimentación CA e inactividad para:"

 #~ msgid "Battery power and inactive for:"
 #~ msgstr "Alimentación con batería e inactividad para:"
@@ -6991,5 +6997,4 @@ msgstr "_Todas las configuraciones"
 #~ msgid "No groups set in bookmark for URI '%s'"
 #~ msgstr "No hay establecido ningún grupo para el URI «%s»"

-#~ msgid "No application with name '%s' registered a bookmark for '%s'"
-#~ msgstr ""
+#~ msgid "No application with name '%s' registered a bookmark for '%s'"
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,22 +13,22 @@
 # Antón Méixome <meixome@mancomun.org>, 2009.
 # Antón Méixome <meixome@certima.net>, 2010.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2011.
-# Fran Dieguez <frandieguez@gnome.org>, 2011.
 # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011.
+# Fran Dieguez <frandieguez@gnome.org>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center-master-po-gl-72290.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-28 15:55+0200\n"
-"PO-Revision-Date: 2011-08-28 15:55+0200\n"
-"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
+"POT-Creation-Date: 2011-09-05 15:21+0200\n"
+"PO-Revision-Date: 2011-09-05 15:22+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Lokalize 1.2\n"

 #: ../panels/background/gnome-background-panel.desktop.in.in.h:1
@@ -93,29 +93,29 @@ msgstr "Gradiente vertical"
 msgid "Solid Color"
 msgstr "Cor sólido"

-#: ../panels/background/cc-background-panel.c:1002
+#: ../panels/background/cc-background-panel.c:1001
 #: ../panels/user-accounts/um-photo-dialog.c:217
 #: ../panels/user-accounts/data/photo-dialog.ui.h:2
 msgid "Browse for more pictures"
 msgstr "Buscar máis imaxes"

-#: ../panels/background/cc-background-panel.c:1094
+#: ../panels/background/cc-background-panel.c:1093
 msgid "Current background"
 msgstr "Fondo actual"

-#: ../panels/background/cc-background-panel.c:1178
+#: ../panels/background/cc-background-panel.c:1177
 msgid "Wallpapers"
 msgstr "Fondo de escritorio"

-#: ../panels/background/cc-background-panel.c:1185
+#: ../panels/background/cc-background-panel.c:1184
 msgid "Pictures Folder"
 msgstr "Cartafol de imaxes"

-#: ../panels/background/cc-background-panel.c:1192
+#: ../panels/background/cc-background-panel.c:1191
 msgid "Colors & Gradients"
 msgstr "Cores e gradientes"

-#: ../panels/background/cc-background-panel.c:1200
+#: ../panels/background/cc-background-panel.c:1199
 msgid "Flickr"
 msgstr "Flickr"

@@ -330,13 +330,13 @@ msgid "Left"
 msgstr "Esquerda"

 #: ../panels/display/display-capplet.ui.h:2
-#: ../panels/display/cc-display-panel.c:633
+#: ../panels/display/cc-display-panel.c:641
 msgid "Monitor"
 msgstr "Monitor"

 #: ../panels/display/display-capplet.ui.h:3
-#: ../panels/display/cc-display-panel.c:469
-#: ../panels/display/cc-display-panel.c:508
+#: ../panels/display/cc-display-panel.c:477
+#: ../panels/display/cc-display-panel.c:516
 #: ../panels/universal-access/uap.ui.h:43
 msgid "Normal"
 msgstr "Normal"
@@ -383,15 +383,15 @@ msgstr "Pantallas"
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Proxector;xrandr;Pantalla;Resolución;Refresco;"

-#: ../panels/display/cc-display-panel.c:470
+#: ../panels/display/cc-display-panel.c:478
 msgid "Counterclockwise"
 msgstr "Antihoraria"

-#: ../panels/display/cc-display-panel.c:471
+#: ../panels/display/cc-display-panel.c:479
 msgid "Clockwise"
 msgstr "Horaria"

-#: ../panels/display/cc-display-panel.c:472
+#: ../panels/display/cc-display-panel.c:480
 msgid "180 Degrees"
 msgstr "180 graos"

@@ -400,25 +400,25 @@ msgstr "180 graos"
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../panels/display/cc-display-panel.c:609
+#: ../panels/display/cc-display-panel.c:617
 msgid "Mirror Displays"
 msgstr "Pantallas en espello"

-#: ../panels/display/cc-display-panel.c:739
+#: ../panels/display/cc-display-panel.c:747
 #, c-format
 msgid "%d x %d (%s)"
 msgstr "%d x %d (%s)"

-#: ../panels/display/cc-display-panel.c:741
+#: ../panels/display/cc-display-panel.c:749
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../panels/display/cc-display-panel.c:1648
+#: ../panels/display/cc-display-panel.c:1656
 msgid "Drag to change primary display."
 msgstr "Arrastre para cambiar a pantalla principal."

-#: ../panels/display/cc-display-panel.c:1706
+#: ../panels/display/cc-display-panel.c:1714
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
@@ -426,28 +426,28 @@ msgstr ""
 "Seleccione un monitor para cambiar as súas propiedades, arrástreo para "
 "reordenalo ao seu lugar."

-#: ../panels/display/cc-display-panel.c:2094
+#: ../panels/display/cc-display-panel.c:2102
 msgid "%a %R"
 msgstr "%a %R"

-#: ../panels/display/cc-display-panel.c:2096
+#: ../panels/display/cc-display-panel.c:2104
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"

-#: ../panels/display/cc-display-panel.c:2342
+#: ../panels/display/cc-display-panel.c:2350
 msgid "Could not save the monitor configuration"
 msgstr "Non foi posíbel gardar a configuración do monitor"

-#: ../panels/display/cc-display-panel.c:2367
+#: ../panels/display/cc-display-panel.c:2375
 msgid "Could not get session bus while applying display configuration"
 msgstr ""
 "Non foi posíbel obter o bus da sesión ao aplicar a configuración da pantalla"

-#: ../panels/display/cc-display-panel.c:2412
+#: ../panels/display/cc-display-panel.c:2420
 msgid "Could not detect displays"
 msgstr "Non foi posíbel detectar as pantallas"

-#: ../panels/display/cc-display-panel.c:2606
+#: ../panels/display/cc-display-panel.c:2614
 msgid "Could not get screen information"
 msgstr "Non foi posíbel obter a información da pantalla"

@@ -2240,37 +2240,37 @@ msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"

-#: ../panels/power/cc-power-panel.c:264
+#: ../panels/power/cc-power-panel.c:265
 msgid "Battery charging"
 msgstr "Batería cargándose"

-#: ../panels/power/cc-power-panel.c:267
+#: ../panels/power/cc-power-panel.c:268
 msgid "Battery discharging"
 msgstr "Batería descargándose"

-#: ../panels/power/cc-power-panel.c:278
+#: ../panels/power/cc-power-panel.c:279
 msgid "UPS charging"
 msgstr "UPS cargándose"

-#: ../panels/power/cc-power-panel.c:281
+#: ../panels/power/cc-power-panel.c:282
 msgid "UPS discharging"
 msgstr "UPS descargándose"

 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:299
+#: ../panels/power/cc-power-panel.c:300
 #, c-format
 msgid "%s until charged (%.0lf%%)"
 msgstr "%s até estar cargada (%.0lf%%)"

 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:305
+#: ../panels/power/cc-power-panel.c:306
 #, c-format
 msgid "%s until empty (%.0lf%%)"
 msgstr "%s até estar baleira (%.0lf%%)"

 #. TRANSLATORS: %1 is a percentage value. Note: this string is only
 #. * used when we don't have a time value
-#: ../panels/power/cc-power-panel.c:313
+#: ../panels/power/cc-power-panel.c:314
 #, c-format
 msgid "%.0lf%% charged"
 msgstr "%.0lf%% de carga"
@@ -2296,30 +2296,34 @@ msgid "Ask me"
 msgstr "Preguntarme"

 #: ../panels/power/power.ui.h:7
+msgid "Don't suspend"
+msgstr "Non suspender"
+
+#: ../panels/power/power.ui.h:8
 msgid "Hibernate"
 msgstr "Hibernar"

-#: ../panels/power/power.ui.h:8
-msgid "On AC _power:"
-msgstr "_Con adaptador de corrente:"
-
 #: ../panels/power/power.ui.h:9
-msgid "On _battery power:"
-msgstr "Con _batería:"
+msgid "On battery power"
+msgstr "Cando se estea coa batería"

 #: ../panels/power/power.ui.h:10
-msgid "Put the computer to sleep when inactive:"
-msgstr "Pór o computador en modo de baixo consumo cando leve inactivo durante:"
-
-#: ../panels/power/power.ui.h:11
 msgid "Shutdown"
 msgstr "Apagar"

-#: ../panels/power/power.ui.h:12
+#: ../panels/power/power.ui.h:11
 msgid "Suspend"
 msgstr "Suspender"

+#: ../panels/power/power.ui.h:12
+msgid "Suspend when inactive for:"
+msgstr "Suspender cando se estea inactivo durante:"
+
 #: ../panels/power/power.ui.h:13
+msgid "When plugged in"
+msgstr "Ao estar enchufado"
+
+#: ../panels/power/power.ui.h:14
 msgid "When power is _critically low:"
 msgstr "_Cando a carga da batería é criticamente baixa:"

@@ -2358,8 +2362,8 @@ msgid "Select ICC Profile File"
 msgstr "Seleccionar ficheiro de perfil ICC"

 #: ../panels/color/cc-color-panel.c:204
-msgid "Import"
-msgstr "Importar"
+msgid "_Import"
+msgstr "_Importar"

 #. TRANSLATORS: filter name on the file->open dialog
 #: ../panels/color/cc-color-panel.c:215
@@ -2372,23 +2376,23 @@ msgid "All files"
 msgstr "Tódolos ficheiros"

 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:709
+#: ../panels/color/cc-color-panel.c:718
 #: ../panels/sound/gvc-mixer-dialog.c:1548
 msgid "Device"
 msgstr "Dispositivo"

 #. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:744
+#: ../panels/color/cc-color-panel.c:753
 msgid "Calibration"
 msgstr "Calibración"

 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:776
+#: ../panels/color/cc-color-panel.c:785
 msgid "Create a color profile for the selected device"
 msgstr "Crear un perfil de cor para o dispositivo seleccionado"

 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:790 ../panels/color/cc-color-panel.c:814
+#: ../panels/color/cc-color-panel.c:799 ../panels/color/cc-color-panel.c:823
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -2397,40 +2401,40 @@ msgstr ""
 "correctamente conectado."

 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:823
+#: ../panels/color/cc-color-panel.c:832
 msgid "The measuring instrument does not support printer profiling."
 msgstr "O instrumento de medida non é compatíbel co perfilado de impresoras."

 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:834
+#: ../panels/color/cc-color-panel.c:843
 msgid "The device type is not currently supported."
 msgstr "O tipo de dispositivo actualmente non é compatíbel."

 #. TRANSLATORS: this is when an auto-added profile cannot be removed
-#: ../panels/color/cc-color-panel.c:906
+#: ../panels/color/cc-color-panel.c:915
 msgid "Cannot remove automatically added profile"
 msgstr "Non é posíbel quitar o perfil engadido automaticamente"

 #. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1231
+#: ../panels/color/cc-color-panel.c:1253
 msgid "No profile"
 msgstr "Sen perfil"

-#: ../panels/color/cc-color-panel.c:1250
+#: ../panels/color/cc-color-panel.c:1272
 #, c-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i ano"
 msgstr[1] "%i anos"

-#: ../panels/color/cc-color-panel.c:1261
+#: ../panels/color/cc-color-panel.c:1283
 #, c-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mes"
 msgstr[1] "%i meses"

-#: ../panels/color/cc-color-panel.c:1272
+#: ../panels/color/cc-color-panel.c:1294
 #, c-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -2438,40 +2442,40 @@ msgstr[0] "%i semana"
 msgstr[1] "%i semanas"

 #. fallback
-#: ../panels/color/cc-color-panel.c:1279
+#: ../panels/color/cc-color-panel.c:1301
 #, c-format
 msgid "Less than 1 week"
 msgstr "Menos dunha semana"

-#: ../panels/color/cc-color-panel.c:1339
+#: ../panels/color/cc-color-panel.c:1361
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "RGB predeterminado"

-#: ../panels/color/cc-color-panel.c:1344
+#: ../panels/color/cc-color-panel.c:1366
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "CMYK predeterminado"

-#: ../panels/color/cc-color-panel.c:1349
+#: ../panels/color/cc-color-panel.c:1371
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "Gris predeterminado"

-#: ../panels/color/cc-color-panel.c:1464 ../panels/color/cc-color-panel.c:1486
-#: ../panels/color/cc-color-panel.c:1497
+#: ../panels/color/cc-color-panel.c:1486 ../panels/color/cc-color-panel.c:1508
+#: ../panels/color/cc-color-panel.c:1519
 msgid "Uncalibrated"
 msgstr "Sen calibrar"

-#: ../panels/color/cc-color-panel.c:1467
+#: ../panels/color/cc-color-panel.c:1489
 msgid "This device is not color managed."
 msgstr "Este dispositivo non ten xestión de cor."

-#: ../panels/color/cc-color-panel.c:1489
+#: ../panels/color/cc-color-panel.c:1511
 msgid "This device is using manufacturing calibrated data."
 msgstr "Este dispositivo está usando os datos de calibración de fábrica."

-#: ../panels/color/cc-color-panel.c:1500
+#: ../panels/color/cc-color-panel.c:1522
 msgid ""
 "This device does not have a profile suitable for whole-screen color "
 "correction."
@@ -2479,43 +2483,43 @@ msgstr ""
 "Este dispositivo non ten un perfil apto para corrección de cor en toda a "
 "pantalla."

-#: ../panels/color/cc-color-panel.c:1527
+#: ../panels/color/cc-color-panel.c:1549
 msgid "This device has an old profile that may no longer be accurate."
 msgstr "Este dispositivo ten un perfil antigo que pode non ser preciso."

 #. TRANSLATORS: this is when the calibration profile age is not
 #. * specified as it has been autogenerated from the hardware
-#: ../panels/color/cc-color-panel.c:1554
+#: ../panels/color/cc-color-panel.c:1576
 msgid "Not specified"
 msgstr "Sen especificar"

 #. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1733
+#: ../panels/color/cc-color-panel.c:1755
 msgid "No devices supporting color management detected"
 msgstr ""
 "Non foi posíbel detectar ningún dispositivo compatíbel coa xestión de cor"

-#: ../panels/color/cc-color-panel.c:1962
+#: ../panels/color/cc-color-panel.c:1984
 msgctxt "Device kind"
 msgid "Display"
 msgstr "Pantalla"

-#: ../panels/color/cc-color-panel.c:1964
+#: ../panels/color/cc-color-panel.c:1986
 msgctxt "Device kind"
 msgid "Scanner"
 msgstr "Escáner"

-#: ../panels/color/cc-color-panel.c:1966
+#: ../panels/color/cc-color-panel.c:1988
 msgctxt "Device kind"
 msgid "Printer"
 msgstr "Impresora"

-#: ../panels/color/cc-color-panel.c:1968
+#: ../panels/color/cc-color-panel.c:1990
 msgctxt "Device kind"
 msgid "Camera"
 msgstr "Cámara"

-#: ../panels/color/cc-color-panel.c:1970
+#: ../panels/color/cc-color-panel.c:1992
 msgctxt "Device kind"
 msgid "Webcam"
 msgstr "Cámara web"
@@ -4096,8 +4100,8 @@ msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgstr "Tableta;Wacom;Stylus;Borrador;Rato;"

 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
-msgid "Wacom"
-msgstr "Wacom"
+msgid "Wacom Graphics Tablet"
+msgstr "Tableta gráfica Wacom"

 #: ../shell/control-center.c:54
 msgid "Enable verbose mode"
@@ -4142,6 +4146,16 @@ msgstr "Centro de control"
 msgid "_All Settings"
 msgstr "_Todas as configuracións"

+#~ msgid "On AC _power:"
+#~ msgstr "_Con adaptador de corrente:"
+
+#~ msgid "Put the computer to sleep when inactive:"
+#~ msgstr ""
+#~ "Pór o computador en modo de baixo consumo cando leve inactivo durante:"
+
+#~ msgid "Wacom"
+#~ msgstr "Wacom"
+
 #~ msgid "Chinese"
 #~ msgstr "Chinés"

@@ -4501,9 +4515,6 @@ msgstr "_Todas as configuracións"
 #~ msgid "_Variants:"
 #~ msgstr "V_ariantes:"

-#~ msgid "AC power and inactive for:"
-#~ msgstr "Co adaptador de corrente e inactivo durante:"
-
 #~ msgid "Battery power and inactive for:"
 #~ msgstr "Coa batería e inactivo durante:"

--- a/po/ja.po
+++ b/po/ja.po
@@ -10,21 +10,21 @@
 # Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009.
 # Yasumichi Akahoshi <yasumichi@vinelinux.org>, 2010.
 # Kiyotaka NISHIBORI <ml.nishibori.kiyotaka@gmail.com>, 2011.
-# Jiro Matsuzawa <matsuzawa.jr@gmail.com>, 2010, 2011.
+# Jiro Matsuzawa <jmatsuzawa@src.gnome.org>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-22 22:58+0000\n"
-"PO-Revision-Date: 2011-04-19 23:13+0900\n"
-"Last-Translator: Jiro Matsuzawa <matsuzawa.jr@gmail.com>\n"
+"POT-Creation-Date: 2011-08-28 14:34+0000\n"
+"PO-Revision-Date: 2011-09-02 20:46+0900\n"
+"Last-Translator: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

 #: ../libgnome-control-center/cc-lockbutton.c:347
@@ -565,7 +565,7 @@ msgid "Standard"
 msgstr "標準"

 #: ../panels/info/cc-info-panel.c:1010
-#: ../panels/keyboard/keyboard-shortcuts.c:1752
+#: ../panels/keyboard/keyboard-shortcuts.c:1762
 msgid "Section"
 msgstr "セクション"

@@ -820,7 +820,7 @@ msgstr "アクセラレータの種類です。"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
-#: ../panels/keyboard/keyboard-shortcuts.c:1173
+#: ../panels/keyboard/keyboard-shortcuts.c:1183
 #: ../panels/sound/gvc-mixer-control.c:1084
 #: ../panels/user-accounts/um-fingerprint-dialog.c:177
 #: ../panels/user-accounts/um-fingerprint-dialog.c:178
@@ -842,21 +842,22 @@ msgid "Shortcut;Repeat;Blink;"
 msgstr "Shortcut;Repeat;Blink;ショートカット;リピート;点滅;"

 #: ../panels/keyboard/keyboard-shortcuts.c:646
-#: ../panels/keyboard/keyboard-shortcuts.c:948
-#: ../panels/keyboard/keyboard-shortcuts.c:1546
-#: ../panels/keyboard/keyboard-shortcuts.c:1550
+#: ../panels/keyboard/keyboard-shortcuts.c:654
+#: ../panels/keyboard/keyboard-shortcuts.c:958
+#: ../panels/keyboard/keyboard-shortcuts.c:1556
+#: ../panels/keyboard/keyboard-shortcuts.c:1560
 msgid "Custom Shortcuts"
 msgstr "独自のショートカット"

-#: ../panels/keyboard/keyboard-shortcuts.c:800
+#: ../panels/keyboard/keyboard-shortcuts.c:804
 msgid "<Unknown Action>"
 msgstr "<不明な操作>"

-#: ../panels/keyboard/keyboard-shortcuts.c:1199
+#: ../panels/keyboard/keyboard-shortcuts.c:1209
 msgid "Error saving the new shortcut"
 msgstr "新しいショートカットを保存する際にエラー"

-#: ../panels/keyboard/keyboard-shortcuts.c:1332
+#: ../panels/keyboard/keyboard-shortcuts.c:1342
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -867,7 +868,7 @@ msgstr ""
 "ん。\n"
 "[Ctrl] や [Alt] や [Shift] といった修飾キーを併用するようにしてください。"

-#: ../panels/keyboard/keyboard-shortcuts.c:1362
+#: ../panels/keyboard/keyboard-shortcuts.c:1372
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -876,7 +877,7 @@ msgstr ""
 "\"%s\" というショートカットは既に登録済です:\n"
 "\"%s\""

-#: ../panels/keyboard/keyboard-shortcuts.c:1367
+#: ../panels/keyboard/keyboard-shortcuts.c:1377
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
@@ -884,19 +885,19 @@ msgstr ""
 "ショートカットを \"%s\" に変更すると、\"%s\" というショートカットが無効になり"
 "ます。"

-#: ../panels/keyboard/keyboard-shortcuts.c:1373
+#: ../panels/keyboard/keyboard-shortcuts.c:1383
 msgid "_Reassign"
 msgstr "割り当てる(_R)"

-#: ../panels/keyboard/keyboard-shortcuts.c:1485
+#: ../panels/keyboard/keyboard-shortcuts.c:1495
 msgid "Too many custom shortcuts"
 msgstr "独自のショートカットが多すぎます"

-#: ../panels/keyboard/keyboard-shortcuts.c:1805
+#: ../panels/keyboard/keyboard-shortcuts.c:1815
 msgid "Action"
 msgstr "操作"

-#: ../panels/keyboard/keyboard-shortcuts.c:1828
+#: ../panels/keyboard/keyboard-shortcuts.c:1838
 msgid "Shortcut"
 msgstr "ショートカット"

@@ -1136,206 +1137,206 @@ msgid "cd;dvd;usb;audio;video;disc;"
 msgstr "cd;dvd;usb;audio;video;disc;オーディオ;ビデオ;ディスク;"

 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:487
+#: ../panels/printers/cc-printers-panel.c:494
 msgid "Low on toner"
 msgstr "トナーの残量が少ないです"

 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:489
+#: ../panels/printers/cc-printers-panel.c:496
 msgid "Out of toner"
 msgstr "トナーが空です"

 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:492
+#: ../panels/printers/cc-printers-panel.c:499
 msgid "Low on developer"
 msgstr "現像液が少ないです"

 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: ../panels/printers/cc-printers-panel.c:495
+#: ../panels/printers/cc-printers-panel.c:502
 msgid "Out of developer"
 msgstr "現像液が空です"

 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:497
+#: ../panels/printers/cc-printers-panel.c:504
 msgid "Low on a marker supply"
 msgstr "インクが少なくなっています"

 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:499
+#: ../panels/printers/cc-printers-panel.c:506
 msgid "Out of a marker supply"
 msgstr "インクが切れています"

 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:501
+#: ../panels/printers/cc-printers-panel.c:508
 msgid "Open cover"
 msgstr "カバーが開いています"

 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:503
+#: ../panels/printers/cc-printers-panel.c:510
 msgid "Open door"
 msgstr "扉が開いています"

 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:505
+#: ../panels/printers/cc-printers-panel.c:512
 msgid "Low on paper"
 msgstr "紙が少なくなっています"

 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:507
+#: ../panels/printers/cc-printers-panel.c:514
 msgid "Out of paper"
 msgstr "紙が空です"

 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:509
+#: ../panels/printers/cc-printers-panel.c:516
 msgctxt "printer state"
 msgid "Offline"
 msgstr "オフライン"

 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:511
+#: ../panels/printers/cc-printers-panel.c:518
 msgctxt "printer state"
 msgid "Paused"
 msgstr "一時停止中"

 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:513
+#: ../panels/printers/cc-printers-panel.c:520
 msgid "Waste receptacle almost full"
 msgstr "廃インクタンクがもう少しでいっぱいです"

 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:515
+#: ../panels/printers/cc-printers-panel.c:522
 msgid "Waste receptacle full"
 msgstr "廃インクタンクがいっぱいです"

 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:517
+#: ../panels/printers/cc-printers-panel.c:524
 msgid "The optical photo conductor is near end of life"
 msgstr "感光体の寿命が近づいています"

 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:519
+#: ../panels/printers/cc-printers-panel.c:526
 msgid "The optical photo conductor is no longer functioning"
 msgstr "感光体の寿命です"

 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:691
+#: ../panels/printers/cc-printers-panel.c:698
 msgctxt "printer state"
 msgid "Ready"
 msgstr "準備完了"

 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:695
+#: ../panels/printers/cc-printers-panel.c:702
 msgctxt "printer state"
 msgid "Processing"
 msgstr "処理中"

 #. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:699
+#: ../panels/printers/cc-printers-panel.c:706
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "停止中"

 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:818
+#: ../panels/printers/cc-printers-panel.c:825
 msgid "Toner Level"
 msgstr "トナーの量"

 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:821
+#: ../panels/printers/cc-printers-panel.c:828
 msgid "Ink Level"
 msgstr "インクの量"

 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:824
+#: ../panels/printers/cc-printers-panel.c:831
 msgid "Supply Level"
 msgstr "サプライの量"

 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:839
-#: ../panels/printers/cc-printers-panel.c:1222
+#: ../panels/printers/cc-printers-panel.c:846
+#: ../panels/printers/cc-printers-panel.c:1229
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
 msgstr[0] "%u 個がアクティブ"

 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:944
+#: ../panels/printers/cc-printers-panel.c:951
 msgid "No printers available"
 msgstr "利用できるプリンタがありません"

 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:1265
+#: ../panels/printers/cc-printers-panel.c:1272
 msgctxt "print job"
 msgid "Pending"
 msgstr "待機中"

 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:1269
+#: ../panels/printers/cc-printers-panel.c:1276
 msgctxt "print job"
 msgid "Held"
 msgstr "保留"

 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:1273
+#: ../panels/printers/cc-printers-panel.c:1280
 msgctxt "print job"
 msgid "Processing"
 msgstr "印刷中"

 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:1277
+#: ../panels/printers/cc-printers-panel.c:1284
 msgctxt "print job"
 msgid "Stopped"
 msgstr "停止"

 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:1281
+#: ../panels/printers/cc-printers-panel.c:1288
 msgctxt "print job"
 msgid "Canceled"
 msgstr "キャンセル"

 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:1285
+#: ../panels/printers/cc-printers-panel.c:1292
 msgctxt "print job"
 msgid "Aborted"
 msgstr "中止"

 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:1289
+#: ../panels/printers/cc-printers-panel.c:1296
 msgctxt "print job"
 msgid "Completed"
 msgstr "完了"

 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:1372
+#: ../panels/printers/cc-printers-panel.c:1379
 msgid "Job Title"
 msgstr "ジョブ名"

 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:1381
+#: ../panels/printers/cc-printers-panel.c:1388
 msgid "Job State"
 msgstr "ジョブの状態"

 # FIXME
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:1387
+#: ../panels/printers/cc-printers-panel.c:1394
 msgid "Time"
 msgstr "時刻"

 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:2122
+#: ../panels/printers/cc-printers-panel.c:2129
 msgid "Failed to add new printer."
 msgstr "新しいプリンタを追加できませんでした。"

 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2294
-#: ../panels/printers/cc-printers-panel.c:2308
+#: ../panels/printers/cc-printers-panel.c:2301
+#: ../panels/printers/cc-printers-panel.c:2315
 msgid "Test page"
 msgstr "テストページ"

 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2507
+#: ../panels/printers/cc-printers-panel.c:2514
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "ui ファイルを読み込めませんでした: %s"
@@ -1376,34 +1377,34 @@ msgstr "キャンセル"
 msgid "Search by Address"
 msgstr "アドレスで検索"

-#: ../panels/printers/pp-new-printer-dialog.c:392
+#: ../panels/printers/pp-new-printer-dialog.c:493
 msgid "Getting devices..."
 msgstr "デバイスの取得中..."

 #. Translators: Column of devices which can be installed
-#: ../panels/printers/pp-new-printer-dialog.c:652
-#: ../panels/printers/pp-new-printer-dialog.c:657
+#: ../panels/printers/pp-new-printer-dialog.c:759
+#: ../panels/printers/pp-new-printer-dialog.c:764
 msgid "Devices"
 msgstr "デバイス"

 #. Translators: Local means local printers
-#: ../panels/printers/pp-new-printer-dialog.c:682
+#: ../panels/printers/pp-new-printer-dialog.c:789
 msgid "Local"
 msgstr "ローカル"

 #. Translators: Network means network printers
-#: ../panels/printers/pp-new-printer-dialog.c:684
+#: ../panels/printers/pp-new-printer-dialog.c:791
 #: ../panels/network/gnome-network-panel.desktop.in.in.h:1
 msgid "Network"
 msgstr "ネットワーク"

 #. Translators: Device types column (network or local)
-#: ../panels/printers/pp-new-printer-dialog.c:725
+#: ../panels/printers/pp-new-printer-dialog.c:832
 msgid "Device types"
 msgstr "デバイスの種類"

 #. Translators: Name of job which makes printer to autoconfigure itself
-#: ../panels/printers/pp-new-printer-dialog.c:1022
+#: ../panels/printers/pp-new-printer-dialog.c:1144
 msgid "Automatic configuration"
 msgstr "自動設定"

@@ -1438,8 +1439,8 @@ msgid "Default"
 msgstr "デフォルト"

 #: ../panels/printers/printers.ui.h:11
-#: ../panels/network/cc-network-panel.c:1596
-#: ../panels/network/cc-network-panel.c:1599 ../panels/network/network.ui.h:11
+#: ../panels/network/cc-network-panel.c:1595
+#: ../panels/network/cc-network-panel.c:1598 ../panels/network/network.ui.h:11
 msgid "IP Address"
 msgstr "IP アドレス"

@@ -1724,67 +1725,67 @@ msgstr "信頼できない公衆ネットワークでは推奨されません。
 #. TRANSLATORS: this is when the access point is not listed
 #. * in the dropdown (or hidden) and the user has to select
 #. * another entry manually
-#: ../panels/network/cc-network-panel.c:814
+#: ../panels/network/cc-network-panel.c:813
 msgctxt "Wireless access point"
 msgid "Other..."
 msgstr "その他..."

 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/cc-network-panel.c:972
+#: ../panels/network/cc-network-panel.c:971
 msgid "WEP"
 msgstr "WEP"

 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/cc-network-panel.c:976
+#: ../panels/network/cc-network-panel.c:975
 msgid "WPA"
 msgstr "WPA"

 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/cc-network-panel.c:980
+#: ../panels/network/cc-network-panel.c:979
 msgid "WPA2"
 msgstr "WPA2"

 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/cc-network-panel.c:985
+#: ../panels/network/cc-network-panel.c:984
 msgid "Enterprise"
 msgstr "Enterprise"

 #. TRANSLATORS: this no (!) WiFi security
-#: ../panels/network/cc-network-panel.c:991
+#: ../panels/network/cc-network-panel.c:990
 #: ../panels/universal-access/uap.ui.h:43
 msgid "None"
 msgstr "何もしない"

 #. Translators: network device speed
-#: ../panels/network/cc-network-panel.c:1294
-#: ../panels/network/cc-network-panel.c:1339
+#: ../panels/network/cc-network-panel.c:1293
+#: ../panels/network/cc-network-panel.c:1338
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"

-#: ../panels/network/cc-network-panel.c:1592 ../panels/network/network.ui.h:12
+#: ../panels/network/cc-network-panel.c:1591 ../panels/network/network.ui.h:12
 msgid "IPv4 Address"
 msgstr "IPv4 アドレス"

-#: ../panels/network/cc-network-panel.c:1593 ../panels/network/network.ui.h:13
+#: ../panels/network/cc-network-panel.c:1592 ../panels/network/network.ui.h:13
 msgid "IPv6 Address"
 msgstr "IPv6 アドレス"

-#: ../panels/network/cc-network-panel.c:1731
+#: ../panels/network/cc-network-panel.c:1730
 msgid "Proxy"
 msgstr "プロキシ"

-#: ../panels/network/cc-network-panel.c:1795
+#: ../panels/network/cc-network-panel.c:1794
 msgid "Network proxy"
 msgstr "ネットワークプロキシ"

-#: ../panels/network/cc-network-panel.c:1961
+#: ../panels/network/cc-network-panel.c:1960
 #, c-format
 msgid "%s VPN"
 msgstr "%s VPN"

 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:2029
+#: ../panels/network/cc-network-panel.c:2028
 msgid "The system network services are not compatible with this version."
 msgstr "システムのネットワークサービスはこのバージョンと互換性がありません。"

@@ -1827,7 +1828,7 @@ msgstr "グループのパスワード"

 #: ../panels/network/network.ui.h:8
 msgid "H_TTPS Proxy"
-msgstr "HTTP プロキシ(_T)"
+msgstr "HTTPS プロキシ(_T)"

 #: ../panels/network/network.ui.h:9
 msgid "Hardware Address"
@@ -3120,32 +3121,32 @@ msgstr "'%s' という名のユーザはすでに存在しています。"
 msgid "This user does not exist."
 msgstr "このユーザは存在していません。"

-#: ../panels/user-accounts/um-user-panel.c:357
+#: ../panels/user-accounts/um-user-panel.c:358
 msgid "Failed to delete user"
 msgstr "ユーザの削除に失敗しました"

-#: ../panels/user-accounts/um-user-panel.c:417
+#: ../panels/user-accounts/um-user-panel.c:418
 msgid "You cannot delete your own account."
 msgstr "自分自身のアカウントは削除できません。"

-#: ../panels/user-accounts/um-user-panel.c:426
+#: ../panels/user-accounts/um-user-panel.c:427
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s はまだログインしています"

-#: ../panels/user-accounts/um-user-panel.c:430
+#: ../panels/user-accounts/um-user-panel.c:431
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
 msgstr ""
 "ログイン中のユーザを削除すると、システムが不整合な状態になることがあります。"

-#: ../panels/user-accounts/um-user-panel.c:439
+#: ../panels/user-accounts/um-user-panel.c:440
 #, c-format
 msgid "Do you want to keep %s's files?"
 msgstr "'%s' のファイルを残しますか?"

-#: ../panels/user-accounts/um-user-panel.c:443
+#: ../panels/user-accounts/um-user-panel.c:444
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -3153,54 +3154,54 @@ msgstr ""
 "ユーザアカウントを削除するときに、ユーザのホームディレクトリ、メールスプール"
 "および一時ファイルを残しておくことができます。"

-#: ../panels/user-accounts/um-user-panel.c:446
+#: ../panels/user-accounts/um-user-panel.c:447
 msgid "_Delete Files"
 msgstr "ファイルを削除(_D)"

-#: ../panels/user-accounts/um-user-panel.c:447
-msgid "_Keep Files"
-msgstr "ファイルの維持(_K)"
-
 #: ../panels/user-accounts/um-user-panel.c:448
+msgid "_Keep Files"
+msgstr "ファイルを残す(_K)"
+
+#: ../panels/user-accounts/um-user-panel.c:449
 msgid "_Cancel"
 msgstr "キャンセル(_C)"

-#: ../panels/user-accounts/um-user-panel.c:498
+#: ../panels/user-accounts/um-user-panel.c:499
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "無効アカウント"

-#: ../panels/user-accounts/um-user-panel.c:506
+#: ../panels/user-accounts/um-user-panel.c:507
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "次のログイン時に設定"

-#: ../panels/user-accounts/um-user-panel.c:509
+#: ../panels/user-accounts/um-user-panel.c:510
 msgctxt "Password mode"
 msgid "None"
 msgstr "なし"

-#: ../panels/user-accounts/um-user-panel.c:831
+#: ../panels/user-accounts/um-user-panel.c:832
 msgid "Failed to contact the accounts service"
 msgstr "アカウントサービスの接続に失敗しました"

-#: ../panels/user-accounts/um-user-panel.c:833
+#: ../panels/user-accounts/um-user-panel.c:834
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr ""
 "AccountService がインストールされ、有効になっているか確認してください。"

-#: ../panels/user-accounts/um-user-panel.c:866
+#: ../panels/user-accounts/um-user-panel.c:870
 msgid ""
 "To make changes,\n"
 "click the * icon first"
 msgstr "変更するには、まず * アイコンをクリックしてください"

-#: ../panels/user-accounts/um-user-panel.c:904
+#: ../panels/user-accounts/um-user-panel.c:908
 msgid "Create a user"
 msgstr "ユーザを作成します"

-#: ../panels/user-accounts/um-user-panel.c:915
-#: ../panels/user-accounts/um-user-panel.c:1214
+#: ../panels/user-accounts/um-user-panel.c:919
+#: ../panels/user-accounts/um-user-panel.c:1218
 msgid ""
 "To create a user,\n"
 "click the * icon first"
@@ -3208,12 +3209,12 @@ msgstr ""
 "ユーザを作成するには、\n"
 "まず * アイコンをクリックしてください"

-#: ../panels/user-accounts/um-user-panel.c:924
+#: ../panels/user-accounts/um-user-panel.c:928
 msgid "Delete the selected user"
 msgstr "選択したユーザを削除します"

-#: ../panels/user-accounts/um-user-panel.c:936
-#: ../panels/user-accounts/um-user-panel.c:1219
+#: ../panels/user-accounts/um-user-panel.c:940
+#: ../panels/user-accounts/um-user-panel.c:1223
 msgid ""
 "To delete the selected user,\n"
 "click the * icon first"
@@ -3221,11 +3222,11 @@ msgstr ""
 "選択したユーザを削除するには、\n"
 "まず * アイコンをクリックしてください"

-#: ../panels/user-accounts/um-user-panel.c:1114
+#: ../panels/user-accounts/um-user-panel.c:1118
 msgid "My Account"
 msgstr "自分のアカウント"

-#: ../panels/user-accounts/um-user-panel.c:1124
+#: ../panels/user-accounts/um-user-panel.c:1128
 msgid "Other Accounts"
 msgstr "他のアカウント"

@@ -3270,8 +3271,8 @@ msgid ""
 "to all users of this system.  Do <b>not</b> include the password here.</"
 "small>"
 msgstr ""
-"<small>このヒントはログイン画面に表示されます。  このシステムのユーザ全員に見"
-"えることになります。  ここにパスワードを含め<b>ない</b>でください。</small>"
+"<small>このヒントはログイン画面に表示されます。このシステムのユーザ全員に見え"
+"ることになります。ここにパスワードを含め<b>ない</b>でください。</small>"

 #: ../panels/user-accounts/data/password-dialog.ui.h:2
 msgid "C_onfirm password"
@@ -3438,27 +3439,28 @@ msgstr ""
 "あなたの指紋を登録しました。今から指紋リーダを使ってログインできるようになり"
 "ました。"

-#: ../shell/control-center.c:51
+#: ../shell/control-center.c:53
 msgid "Enable verbose mode"
 msgstr "冗長モードを有効にする"

-#: ../shell/control-center.c:52
+#: ../shell/control-center.c:54
 msgid "Show the overview"
 msgstr "全体を表示する"

-#: ../shell/control-center.c:53
+#: ../shell/control-center.c:55 ../shell/control-center.c:56
+#: ../shell/control-center.c:57
 msgid "Show help options"
 msgstr "ヘルプのオプションを表示する"

-#: ../shell/control-center.c:54
+#: ../shell/control-center.c:58
 msgid "Panel to display"
 msgstr "表示するパネル"

-#: ../shell/control-center.c:76
+#: ../shell/control-center.c:80
 msgid "- System Settings"
 msgstr "- システム設定"

-#: ../shell/control-center.c:84
+#: ../shell/control-center.c:88
 #, c-format
 msgid ""
 "%s\n"
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/ru.po
+++ b/po/ru.po
Author	SHA1	Message	Date
Rodrigo Moya	fd34db1f8a	Release 3.1.91	2011-09-05 17:13:59 +02:00
Fran Dieguez	71e7f5ed0a	Updated galician translations	2011-09-05 15:22:13 +02:00
Jorge González	f8698236d9	Updated Spanish translation	2011-09-05 14:05:17 +02:00
Richard Hughes	fe261e0861	color: Do not use a GtkSeparatorToolItem in the GtkToolbar Adwaita now themes these, and a single random row of centered pixels just looks wrong. Use an empty GtkLabel to introduce padding without the random pixels.	2011-09-05 12:13:48 +01:00
Richard Hughes	67e12897e6	color: If cancelling profile import don't show the empty assign dialog Fixes https://bugzilla.gnome.org/show_bug.cgi?id=658180	2011-09-05 12:13:48 +01:00
Jiro Matsuzawa	6e069f6feb	color: Use a mnemonic character on the Import button Resolves #658167 Signed-off-by: Richard Hughes <richard@hughsie.com>	2011-09-05 12:13:03 +01:00
Richard Hughes	477bfa6bd7	power: Update the UI to reflect the new mockup	2011-09-05 12:12:54 +01:00
Fran Dieguez	65f7d5b241	Updated galician translations	2011-09-04 23:24:13 +02:00
Ihar Hrachyshka	32e348d73b	Updated Belarusian translation.	2011-09-05 00:20:50 +03:00
Yuri Matsuk	402b5c4614	Updated Belarusian translation.	2011-09-04 17:51:06 +03:00
A S Alam	be260698b3	update translation for Punjabi	2011-09-04 16:43:13 +05:30
Yuri Myasoedov	31ebb004d4	Updated Russian translation	2011-09-03 17:04:00 +04:00
Jiro Matsuzawa	fba2f20ab7	Updated Japanese translation	2011-09-03 12:54:55 +09:00