Switchboard Desktop Plug

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

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

Fix counting of items in monitor list for plank, bug #1081639.

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

Subscribers

People subscribed via source and target branches

to all changes: