Merge lp:~seb128/ubuntu-system-settings/display-translated-names into lp:ubuntu-system-settings

[Sebastien Bacher]

[storage] display translated names

[storage] display translated names

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:946
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1308/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3938
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5353
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5353/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2564
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3423
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3423/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1308/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

I tested on the device with a french locale and that works

[Ken VanDine (ken-vandine)]

LGTM

review: Approve

=== modified file 'plugins/about/click.cpp'
--- plugins/about/click.cpp	2014-07-01 12:20:08 +0000
+++ plugins/about/click.cpp	2014-08-27 08:32:23 +0000
@@ -81,9 +81,10 @@
                 goto out;
             }
 
-            gchar * name = g_key_file_get_string (appinfo,
+            gchar * name = g_key_file_get_locale_string (appinfo,
                                                   G_KEY_FILE_DESKTOP_GROUP,
                                                   G_KEY_FILE_DESKTOP_KEY_NAME,
+                                                  NULL,
                                                   NULL);
 
             if (name) {