Switchboard Desktop Plug

Merge lp:~jaapz-b/switchboard-plug-pantheon-shell/fix-1062850 into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

  1. fix-1062850
  2. Merge into trunk
Proposed by Jaap Broekhuizen
Status: Merged
Approved by: Rico Tzschichholz
Approved revision: 52
Merged at revision: 52
Proposed branch: lp:~jaapz-b/switchboard-plug-pantheon-shell/fix-1062850
Merge into: lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk
Diff against target: 200 lines (+40/-35)
2 files modified
po/desktop-plug.pot (+39/-35)
src/Wallpaper.vala (+1/-0)
To merge this branch: bzr merge lp:~jaapz-b/switchboard-plug-pantheon-shell/fix-1062850
Reviewer Review Type Date Requested Status
Rico Tzschichholz Approve
Review via email: mp+135426@code.launchpad.net
To post a comment you must log in.
lp:~jaapz-b/switchboard-plug-pantheon-shell/fix-1062850 updated
51. By Jaap Broekhuizen

Merge branch that fixes the counting of monitor items, and adds an option for selecting the primary monitor, for plank.

52. By Jaap Broekhuizen

Added "spanned" option to list of wallpaper options.
Rebuild pot to add the "Spanned" string.

Revision history for this message
Rico Tzschichholz (ricotz) :
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 2012-11-21 14:57:49 +0000
3+++ po/desktop-plug.pot 2012-11-21 15:54:21 +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: 2012-11-21 15:57+0100\n"
9+"POT-Creation-Date: 2012-11-21 16:48+0100\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@@ -17,137 +17,141 @@
14 "Content-Type: text/plain; charset=CHARSET\n"
15 "Content-Transfer-Encoding: 8bit\n"
16
17-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:59
18-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:124
19+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:59
20+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:124
21 msgid "Wallpaper"
22 msgstr ""
23
24-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:83
25+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:83
26 msgid "Don't hide"
27 msgstr ""
28
29-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:84
30+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:84
31 msgid "Intelligent hide"
32 msgstr ""
33
34-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:85
35+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:85
36 msgid "Auto hide"
37 msgstr ""
38
39-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:86
40+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:86
41 msgid "Hide on maximize"
42 msgstr ""
43
44-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:93
45+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:93
46 msgid "Primary Monitor"
47 msgstr ""
48
49-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:96
50+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:96
51 #, c-format
52 msgid "Monitor %d"
53 msgstr ""
54
55-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:103
56+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:103
57 msgid "Icon Size:"
58 msgstr ""
59
60-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:106
61+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:106
62 msgid "Hide Mode:"
63 msgstr ""
64
65-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:109
66+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:109
67 msgid "Monitor:"
68 msgstr ""
69
70-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:113
71+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:113
72 msgid "Dock"
73 msgstr ""
74
75-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:121
76+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:121
77 msgid "When the cursor enters the corner of the display:"
78 msgstr ""
79
80-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:150
81+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:150
82 msgid "Custom Command:"
83 msgstr ""
84
85-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:162
86+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:162
87 msgid "Hot Corners"
88 msgstr ""
89
90-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:179
91+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:179
92 msgid "Do Nothing"
93 msgstr ""
94
95-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:180
96+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:180
97 msgid "Show Workspace View"
98 msgstr ""
99
100-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:181
101+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:181
102 msgid "Maximize Current Window"
103 msgstr ""
104
105-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:182
106+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:182
107 msgid "Minimize Current Window"
108 msgstr ""
109
110-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:183
111+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:183
112 msgid "Open Launcher"
113 msgstr ""
114
115-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:184
116+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:184
117 msgid "Expose Windows"
118 msgstr ""
119
120-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:185
121+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:185
122 msgid "Expose All Windows"
123 msgstr ""
124
125-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:186
126+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:186
127 msgid "Execute Custom Command"
128 msgstr ""
129
130-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//desktop-plug.vala:205
131+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//desktop-plug.vala:205
132 msgid "Desktop"
133 msgstr ""
134
135-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:116
136+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:116
137 msgid "Pictures folder"
138 msgstr ""
139
140-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:117
141+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:117
142 msgid "Backgrounds folder"
143 msgstr ""
144
145-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:118
146+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:118
147 msgid "Custom folder"
148 msgstr ""
149
150-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:123
151+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:123
152 msgid "None"
153 msgstr ""
154
155-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:125
156+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:125
157 msgid "Centered"
158 msgstr ""
159
160-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:126
161+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:126
162 msgid "Scaled"
163 msgstr ""
164
165-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:127
166+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:127
167 msgid "Stretched"
168 msgstr ""
169
170-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:128
171+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:128
172 msgid "Zoom"
173 msgstr ""
174
175-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:220
176+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:129
177+msgid "Spanned"
178+msgstr ""
179+
180+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:221
181 msgid "Select a folder"
182 msgstr ""
183
184-#: /home/jaapz/Programmeren/Elementary/fix-1079580/po/../src//Wallpaper.vala:241
185+#: /home/jaapz/Programmeren/Elementary/fix-1062850/po/../src//Wallpaper.vala:242
186 #, c-format
187 msgid "Importing wallpapers from %s"
188 msgstr ""
189
190=== modified file 'src/Wallpaper.vala'
191--- src/Wallpaper.vala 2012-10-26 15:43:50 +0000
192+++ src/Wallpaper.vala 2012-11-21 15:54:21 +0000
193@@ -126,6 +126,7 @@
194 combo.append ("scaled", _("Scaled"));
195 combo.append ("stretched", _("Stretched"));
196 combo.append ("zoom", _("Zoom"));
197+ combo.append ("spanned", _("Spanned"));
198 combo.changed.connect (update_mode);
199
200 color = new ColorButton ();

Subscribers

People subscribed via source and target branches

to all changes: