[gnome-control-center] display: Use "display" instead of "screen"

[Bastien Nocera <hadess src gnome org>]

commit 7667671ab172817796b515c1e1d3f18733205cc7
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Dec 7 16:57:09 2010 +0000

    display: Use "display" instead of "screen"
    
    Use "display" consistently instead of "screen" in some portions
    of the UI.

 panels/display/display-capplet.ui |    2 +-
 panels/display/xrandr-capplet.c   |   29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/panels/display/display-capplet.ui b/panels/display/display-capplet.ui
index 7a2cead..9f51398 100644
--- a/panels/display/display-capplet.ui
+++ b/panels/display/display-capplet.ui
@@ -224,7 +224,7 @@
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkCheckButton" id="clone_checkbox">
-                    <property name="label" translatable="yes">_Mirror screens</property>
+                    <property name="label" translatable="yes">_Mirror displays</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
diff --git a/panels/display/xrandr-capplet.c b/panels/display/xrandr-capplet.c
index 3d7fd54..4514661 100644
--- a/panels/display/xrandr-capplet.c
+++ b/panels/display/xrandr-capplet.c
@@ -382,7 +382,7 @@ count_all_outputs (GnomeRRConfig *config)
 }
 #endif
 
-/* Computes whether "Mirror Screens" (clone mode) is supported based on these criteria:
+/* Computes whether "Mirror displays" (clone mode) is supported based on these criteria:
  *
  * 1. There is an available size for cloning.
  *
@@ -444,6 +444,17 @@ rebuild_mirror_screens (App *app)
   g_signal_handlers_unblock_by_func (app->clone_checkbox, G_CALLBACK (on_clone_changed), app);
 }
 
+static char *
+mirror_monitor_name (void)
+{
+  /* Translators:  this is the feature where what you see on your laptop's
+   * 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".
+   */
+  return g_strdup (_("Mirror Displays"));
+}
+
 static void
 rebuild_current_monitor_label (App *app)
 {
@@ -454,7 +465,7 @@ rebuild_current_monitor_label (App *app)
   if (app->current_output)
     {
       if (app->current_configuration->clone)
-        tmp = g_strdup (_("Mirror Screens"));
+        tmp = mirror_monitor_name ();
       else
         tmp = g_strdup (app->current_output->display_name);
 
@@ -979,7 +990,7 @@ on_clone_changed (GtkWidget *box, gpointer data)
         }
 
       /* Turn on all the connected screens that support the best clone mode.
-       * The user may hit "Mirror Screens", but he shouldn't have to turn on
+       * The user may hit "Mirror displays", but he shouldn't have to turn on
        * all the required outputs as well.
        */
 
@@ -1702,16 +1713,10 @@ get_display_name (App *app,
   PangoLayout *layout;
   char *text;
 
-  if (app->current_configuration->clone) {
-    /* Translators:  this is the feature where what you see on your laptop's
-     * 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".
-     */
-    text = g_strdup(_("Mirror Screens"));
-  } else {
+  if (app->current_configuration->clone)
+    text = mirror_monitor_name ();
+  else
     text = g_strdup (output->display_name);
-  }
 
   layout = gtk_widget_create_pango_layout (GTK_WIDGET (app->area), text);
   g_free (text);