Merge lp:~codygarver/switchboard-plug-display/rotation-strings-changes into lp:~elementary-apps/switchboard-plug-display/trunk

[Cody Garver]

More human-friendly strings for Rotations, changed order.

I still don't like "Counterclockwise". It looks long and.. concatenated. But I couldn't think of a better alternative.

[Corentin Noël (tintou)]

You changed the order of strings so it's not corresponding to what it does.
The label rotation seems to be inverted for clockwise and counterclockwise

review: Needs Fixing

[lp:~codygarver/switchboard-plug-display/rotation-strings-changes]

41. By Cody Garver on 2014-07-30

Also change rotation order

[Corentin Noël (tintou)]

You got it

review: Approve

=== modified file 'src/DisplayPopover.vala'
--- src/DisplayPopover.vala	2014-07-30 02:20:42 +0000
+++ src/DisplayPopover.vala	2014-07-30 12:28:43 +0000
@@ -258,16 +258,16 @@
 
         Gnome.RRRotation[] rotations = {
             Gnome.RRRotation.ROTATION_0,
+            Gnome.RRRotation.ROTATION_270,
             Gnome.RRRotation.ROTATION_90,
-            Gnome.RRRotation.ROTATION_270,
             Gnome.RRRotation.ROTATION_180
         };
 
         string[] desc = {
-            _("Normal"),
+            _("None"),
+            _("Clockwise"),
             _("Counterclockwise"),
-            _("Clockwise"),
-            _("180 Degrees")
+            _("Flipped")
         };
 
 #if HAS_GNOME312
@@ -297,4 +297,4 @@
         rotation.sensitive = n_rotations > 0;
         rotation.active_id = ((int) info.get_rotation ()).to_string ();
     }
-}
\ No newline at end of file
+}