Switchboard Desktop Plug

Merge lp:~codygarver/switchboard-plug-pantheon-shell/fix-1178467 into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

  1. fix-1178467
  2. Merge into trunk
Proposed by Cody Garver
Status: Merged
Approved by: Victor Martinez
Approved revision: 126
Merged at revision: 131
Proposed branch: lp:~codygarver/switchboard-plug-pantheon-shell/fix-1178467
Merge into: lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk
Diff against target: 84 lines (+13/-14)
2 files modified
po/desktop-plug.pot (+12/-13)
src/desktop-plug.vala (+1/-1)
To merge this branch: bzr merge lp:~codygarver/switchboard-plug-pantheon-shell/fix-1178467
Reviewer Review Type Date Requested Status
Victor Martinez (community) Approve
Review via email: mp+163255@code.launchpad.net

Commit message

Rename string to fix bug #1178467.

To post a comment you must log in.
Revision history for this message
Victor Martinez (victored) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/desktop-plug.pot'
2--- po/desktop-plug.pot 2013-04-12 21:48:10 +0000
3+++ po/desktop-plug.pot 2013-05-10 03:18:25 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2013-04-12 16:47-0500\n"
9+"POT-Creation-Date: 2013-05-09 22:15-0500\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -34,39 +34,38 @@
14 msgstr ""
15
16 #: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:148
17-#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:59
18-msgid "Wallpaper"
19+msgid "Centered"
20 msgstr ""
21
22 #: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:149
23-msgid "Centered"
24+msgid "Scaled"
25 msgstr ""
26
27 #: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:150
28-msgid "Scaled"
29+msgid "Stretched"
30 msgstr ""
31
32 #: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:151
33-msgid "Stretched"
34+msgid "Zoom"
35 msgstr ""
36
37 #: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:152
38-msgid "Zoom"
39-msgstr ""
40-
41-#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:153
42 msgid "Spanned"
43 msgstr ""
44
45-#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:245
46+#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:244
47 msgid "Select a folder"
48 msgstr ""
49
50-#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:266
51+#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:265
52 #, c-format
53 msgid "Importing wallpapers from %s"
54 msgstr ""
55
56+#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:59
57+msgid "Wallpaper"
58+msgstr ""
59+
60 #: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:83
61 msgid "Don't hide"
62 msgstr ""
63@@ -141,7 +140,7 @@
64 msgstr ""
65
66 #: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:216
67-msgid "Show Apps"
68+msgid "Show Applications Menu"
69 msgstr ""
70
71 #: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:217
72
73=== modified file 'src/desktop-plug.vala'
74--- src/desktop-plug.vala 2013-03-03 23:00:44 +0000
75+++ src/desktop-plug.vala 2013-05-10 03:18:25 +0000
76@@ -213,7 +213,7 @@
77 box.append ("1", _("Workspace Overview"));
78 box.append ("2", _("Maximize Current Window"));
79 box.append ("3", _("Minimize Current Window"));
80- box.append ("4", _("Show Apps"));
81+ box.append ("4", _("Show Applications Menu"));
82 box.append ("6", _("Window Overview"));
83 box.append ("7", _("Show All Windows"));
84 box.append ("5", _("Execute Custom Command"));

Subscribers

People subscribed via source and target branches

to all changes: