Switchboard Desktop Plug

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

  1. fix-1188980
  2. Merge into trunk
Proposed by Cody Garver
Status: Merged
Approved by: Danielle Foré
Approved revision: 145
Merged at revision: 145
Proposed branch: lp:~codygarver/switchboard-plug-pantheon-shell/fix-1188980
Merge into: lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk
Diff against target: 34 lines (+3/-3)
2 files modified
po/desktop-plug.pot (+2/-2)
src/Wallpaper.vala (+1/-1)
To merge this branch: bzr merge lp:~codygarver/switchboard-plug-pantheon-shell/fix-1188980
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+168252@code.launchpad.net

Commit message

Change "None" to "Solid Color" to fix bug #1188980.

Description of the change

Change "None" to "Solid Color" to fix bug #1188980.

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) :
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-05-23 09:17:12 +0000
3+++ po/desktop-plug.pot 2013-06-08 17:58:27 +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-05-23 04:16-0500\n"
9+"POT-Creation-Date: 2013-06-08 12:54-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@@ -30,7 +30,7 @@
14 msgstr ""
15
16 #: /home/codygarver/shell/po/../src//Wallpaper.vala:148
17-msgid "None"
18+msgid "Solid Color"
19 msgstr ""
20
21 #: /home/codygarver/shell/po/../src//Wallpaper.vala:149
22
23=== modified file 'src/Wallpaper.vala'
24--- src/Wallpaper.vala 2013-05-24 22:17:34 +0000
25+++ src/Wallpaper.vala 2013-06-08 17:58:27 +0000
26@@ -145,7 +145,7 @@
27 folder_combo.set_active (1);
28
29 combo = new ComboBoxText ();
30- combo.append ("none", _("None"));
31+ combo.append ("none", _("Solid Color"));
32 combo.append ("centered", _("Centered"));
33 combo.append ("scaled", _("Scaled"));
34 combo.append ("stretched", _("Stretched"));

Subscribers

People subscribed via source and target branches

to all changes: