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
=== modified file 'po/desktop-plug.pot'
--- po/desktop-plug.pot 2013-04-12 21:48:10 +0000
+++ po/desktop-plug.pot 2013-05-10 03:18:25 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2013-04-12 16:47-0500\n"11"POT-Creation-Date: 2013-05-09 22:15-0500\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,39 +34,38 @@
34msgstr ""34msgstr ""
3535
36#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:14836#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:148
37#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:5937msgid "Centered"
38msgid "Wallpaper"
39msgstr ""38msgstr ""
4039
41#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:14940#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:149
42msgid "Centered"41msgid "Scaled"
43msgstr ""42msgstr ""
4443
45#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:15044#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:150
46msgid "Scaled"45msgid "Stretched"
47msgstr ""46msgstr ""
4847
49#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:15148#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:151
50msgid "Stretched"49msgid "Zoom"
51msgstr ""50msgstr ""
5251
53#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:15252#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:152
54msgid "Zoom"
55msgstr ""
56
57#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:153
58msgid "Spanned"53msgid "Spanned"
59msgstr ""54msgstr ""
6055
61#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:24556#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:244
62msgid "Select a folder"57msgid "Select a folder"
63msgstr ""58msgstr ""
6459
65#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:26660#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//Wallpaper.vala:265
66#, c-format61#, c-format
67msgid "Importing wallpapers from %s"62msgid "Importing wallpapers from %s"
68msgstr ""63msgstr ""
6964
65#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:59
66msgid "Wallpaper"
67msgstr ""
68
70#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:8369#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:83
71msgid "Don't hide"70msgid "Don't hide"
72msgstr ""71msgstr ""
@@ -141,7 +140,7 @@
141msgstr ""140msgstr ""
142141
143#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:216142#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:216
144msgid "Show Apps"143msgid "Show Applications Menu"
145msgstr ""144msgstr ""
146145
147#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:217146#: /home/codygarver/switchboard-plug-pantheon-shell/po/../src//desktop-plug.vala:217
148147
=== modified file 'src/desktop-plug.vala'
--- src/desktop-plug.vala 2013-03-03 23:00:44 +0000
+++ src/desktop-plug.vala 2013-05-10 03:18:25 +0000
@@ -213,7 +213,7 @@
213 box.append ("1", _("Workspace Overview"));213 box.append ("1", _("Workspace Overview"));
214 box.append ("2", _("Maximize Current Window"));214 box.append ("2", _("Maximize Current Window"));
215 box.append ("3", _("Minimize Current Window"));215 box.append ("3", _("Minimize Current Window"));
216 box.append ("4", _("Show Apps"));216 box.append ("4", _("Show Applications Menu"));
217 box.append ("6", _("Window Overview"));217 box.append ("6", _("Window Overview"));
218 box.append ("7", _("Show All Windows"));218 box.append ("7", _("Show All Windows"));
219 box.append ("5", _("Execute Custom Command"));219 box.append ("5", _("Execute Custom Command"));

Subscribers

People subscribed via source and target branches

to all changes: