Switchboard Network Plug

Merge lp:~donadigo/switchboard-plug-networking/po-fixes into lp:~elementary-pantheon/switchboard-plug-networking/trunk

  1. po-fixes
  2. Merge into trunk
Proposed by Adam Bieńkowski
Status: Merged
Approved by: xapantu
Approved revision: 144
Merged at revision: 143
Proposed branch: lp:~donadigo/switchboard-plug-networking/po-fixes
Merge into: lp:~elementary-pantheon/switchboard-plug-networking/trunk
Diff against target: 481 lines (+212/-197)
3 files modified
po/pantheon-network-plug.pot (+206/-189)
src/Plug.vala (+5/-6)
src/Widgets/Proxy/ProxyConfigurationPage.vala (+1/-2)
To merge this branch: bzr merge lp:~donadigo/switchboard-plug-networking/po-fixes
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+268059@code.launchpad.net

Commit message

Update translation catalog and misc string fixes

Description of the change

Fixes for po translations.

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/pantheon-network-plug.pot'
2--- po/pantheon-network-plug.pot 2015-08-04 21:28:13 +0000
3+++ po/pantheon-network-plug.pot 2015-08-14 12:29:45 +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: 2015-08-04 16:27-0500\n"
9+"POT-Creation-Date: 2015-08-14 14:26+0200\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,152 +17,7 @@
14 "Content-Type: text/plain; charset=UTF-8\n"
15 "Content-Transfer-Encoding: 8bit\n"
16
17-#: ../src/Widgets/Footer.vala:30
18-msgid "Airplane Mode"
19-msgstr ""
20-
21-#: ../src/Widgets/Device/DeviceItem.vala:152
22-msgid "Disabled"
23-msgstr ""
24-
25-#: ../src/Widgets/Device/DeviceItem.vala:156
26-msgid "Enabled (manual mode)"
27-msgstr ""
28-
29-#: ../src/Widgets/Device/DeviceItem.vala:160
30-msgid "Enabled (auto mode)"
31-msgstr ""
32-
33-#: ../src/Widgets/InfoBox.vala:30
34-msgid "Status:"
35-msgstr ""
36-
37-#: ../src/Widgets/InfoBox.vala:31
38-msgid "IP Address:"
39-msgstr ""
40-
41-#: ../src/Widgets/InfoBox.vala:32
42-msgid "Subnet mask:"
43-msgstr ""
44-
45-#: ../src/Widgets/InfoBox.vala:33
46-msgid "Router:"
47-msgstr ""
48-
49-#: ../src/Widgets/InfoBox.vala:34
50-msgid "Broadcast:"
51-msgstr ""
52-
53-#: ../src/Widgets/InfoBox.vala:35
54-msgid "Sent:"
55-msgstr ""
56-
57-#: ../src/Widgets/InfoBox.vala:36
58-msgid "Received:"
59-msgstr ""
60-
61-#: ../src/Widgets/Proxy/ProxyExceptionsPage.vala:17
62-msgid "Ignored hosts"
63-msgstr ""
64-
65-#: ../src/Widgets/Proxy/ProxyExceptionsPage.vala:25
66-msgid "Exception to add (separate with commas to add multiple)"
67-msgstr ""
68-
69-#: ../src/Widgets/Proxy/ProxyExceptionsPage.vala:27
70-msgid "Add Exception"
71-msgstr ""
72-
73-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:30
74-msgid "Automatic proxy configuration"
75-msgstr ""
76-
77-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:31
78-msgid "Manual proxy configuration"
79-msgstr ""
80-
81-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:34
82-msgid "URL to configuration script"
83-msgstr ""
84-
85-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:47
86-#: ../src/Widgets/DeviceList.vala:124
87-msgid "Proxy"
88-msgstr ""
89-
90-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:69
91-msgid "HTTP Proxy:"
92-msgstr ""
93-
94-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:72
95-msgid "HTTPS Proxy:"
96-msgstr ""
97-
98-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:75
99-msgid "FTP Proxy:"
100-msgstr ""
101-
102-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:78
103-msgid "SOCKS Host:"
104-msgstr ""
105-
106-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:94
107-msgid "Apply"
108-msgstr ""
109-
110-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:97
111-msgid "Reset all settings"
112-msgstr ""
113-
114-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:246
115-msgid "Do not reset"
116-msgstr ""
117-
118-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:247
119-msgid "Reset"
120-msgstr ""
121-
122-#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:244
123-msgid "Do you want to reset all the settings to"
124-msgstr ""
125-
126-#: ../src/Widgets/Proxy/ProxyPage.vala:19
127-msgid "Configuration"
128-msgstr ""
129-
130-#: ../src/Widgets/Proxy/ProxyPage.vala:20
131-msgid "Exceptions"
132-msgstr ""
133-
134-#: ../src/Widgets/DeviceList.vala:48
135-msgid "Virtual"
136-msgstr ""
137-
138-#: ../src/Widgets/DeviceList.vala:55
139-msgid "Devices"
140-msgstr ""
141-
142-#: ../src/Widgets/DeviceList.vala:83
143-msgid "Wireless"
144-msgstr ""
145-
146-#: ../src/Widgets/WifiInterface.vala:36
147-msgid "Wi-Fi Network"
148-msgstr ""
149-
150-#: ../src/Widgets/WifiInterface.vala:48
151-msgid "Disconnect"
152-msgstr ""
153-
154-#: ../src/Widgets/WifiInterface.vala:65
155-msgid "Connect to Hidden Network…"
156-msgstr ""
157-
158-#: ../src/Widgets/WifiInterface.vala:86
159-msgid "Wireless:"
160-msgstr ""
161-
162-#: ../src/Utils.vala:20
163+#: ../src/Utils.vala:19
164 msgid "Advanced Settings…"
165 msgstr ""
166
167@@ -258,46 +113,197 @@
168 msgid "Bridge master"
169 msgstr ""
170
171-#: ../src/common/Widgets/WifiMenuItem.vala:75
172+#: ../src/Widgets/Footer.vala:30
173+msgid "Airplane Mode"
174+msgstr ""
175+
176+#: ../src/Widgets/WifiInterface.vala:55
177+msgid "Wi-Fi Network"
178+msgstr ""
179+
180+#: ../src/Widgets/WifiInterface.vala:86
181+msgid "Connect to Hidden Network…"
182+msgstr ""
183+
184+#: ../src/Widgets/WifiInterface.vala:96
185+msgid "Wireless:"
186+msgstr ""
187+
188+#: ../src/Widgets/WifiInterface.vala:141
189+msgid "Disconnect"
190+msgstr ""
191+
192+#: ../src/Widgets/WifiInterface.vala:148
193+msgid "Settings…"
194+msgstr ""
195+
196+#: ../src/Widgets/Proxy/ProxyPage.vala:19
197+msgid "Configuration"
198+msgstr ""
199+
200+#: ../src/Widgets/Proxy/ProxyPage.vala:20
201+msgid "Exceptions"
202+msgstr ""
203+
204+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:30
205+msgid "Automatic proxy configuration"
206+msgstr ""
207+
208+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:31
209+msgid "Manual proxy configuration"
210+msgstr ""
211+
212+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:34
213+msgid "URL to configuration script"
214+msgstr ""
215+
216+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:47
217+#: ../src/Widgets/DeviceList.vala:124
218+msgid "Proxy"
219+msgstr ""
220+
221+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:69
222+msgid "HTTP Proxy:"
223+msgstr ""
224+
225+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:72
226+msgid "HTTPS Proxy:"
227+msgstr ""
228+
229+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:75
230+msgid "FTP Proxy:"
231+msgstr ""
232+
233+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:78
234+msgid "SOCKS Host:"
235+msgstr ""
236+
237+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:94
238+msgid "Apply"
239+msgstr ""
240+
241+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:97
242+msgid "Reset all settings"
243+msgstr ""
244+
245+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:244
246+msgid ""
247+"Do you want to reset all the settings to\n"
248+"default values inluding hosts and ports?"
249+msgstr ""
250+
251+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:245
252+msgid "Do not reset"
253+msgstr ""
254+
255+#: ../src/Widgets/Proxy/ProxyConfigurationPage.vala:246
256+msgid "Reset"
257+msgstr ""
258+
259+#: ../src/Widgets/Proxy/ProxyExceptionsPage.vala:17
260+msgid "Ignored hosts"
261+msgstr ""
262+
263+#: ../src/Widgets/Proxy/ProxyExceptionsPage.vala:25
264+msgid "Exception to add (separate with commas to add multiple)"
265+msgstr ""
266+
267+#: ../src/Widgets/Proxy/ProxyExceptionsPage.vala:27
268+msgid "Add Exception"
269+msgstr ""
270+
271+#: ../src/Widgets/DeviceList.vala:48
272+msgid "Virtual"
273+msgstr ""
274+
275+#: ../src/Widgets/DeviceList.vala:55
276+msgid "Devices"
277+msgstr ""
278+
279+#: ../src/Widgets/DeviceList.vala:83
280+msgid "Wireless"
281+msgstr ""
282+
283+#: ../src/Widgets/InfoBox.vala:30
284+msgid "Status:"
285+msgstr ""
286+
287+#: ../src/Widgets/InfoBox.vala:31
288+msgid "IP Address:"
289+msgstr ""
290+
291+#: ../src/Widgets/InfoBox.vala:32
292+msgid "Subnet mask:"
293+msgstr ""
294+
295+#: ../src/Widgets/InfoBox.vala:33
296+msgid "Router:"
297+msgstr ""
298+
299+#: ../src/Widgets/InfoBox.vala:34
300+msgid "Broadcast:"
301+msgstr ""
302+
303+#: ../src/Widgets/InfoBox.vala:35
304+msgid "Sent:"
305+msgstr ""
306+
307+#: ../src/Widgets/InfoBox.vala:36
308+msgid "Received:"
309+msgstr ""
310+
311+#: ../src/Widgets/Device/DeviceItem.vala:152
312+msgid "Disabled"
313+msgstr ""
314+
315+#: ../src/Widgets/Device/DeviceItem.vala:156
316+msgid "Enabled (manual mode)"
317+msgstr ""
318+
319+#: ../src/Widgets/Device/DeviceItem.vala:160
320+msgid "Enabled (auto mode)"
321+msgstr ""
322+
323+#: ../src/common/Widgets/AbstractWifiInterface.vala:53
324+msgid "No Access Points Available"
325+msgstr ""
326+
327+#: ../src/common/Widgets/AbstractWifiInterface.vala:57
328+msgid "There are no wireless access points within range."
329+msgstr ""
330+
331+#: ../src/common/Widgets/AbstractWifiInterface.vala:66
332+msgid "Wireless Is Disabled"
333+msgstr ""
334+
335+#: ../src/common/Widgets/AbstractWifiInterface.vala:67
336+msgid "Enable wireless to discover nearby wireless access points."
337+msgstr ""
338+
339+#: ../src/common/Widgets/AbstractWifiInterface.vala:78
340+msgid "Scanning for Access Points..."
341+msgstr ""
342+
343+#: ../src/common/Widgets/WifiMenuItem.vala:77
344 msgid "This wireless network could not be connected to."
345 msgstr ""
346
347-#: ../src/common/Widgets/WifiMenuItem.vala:121
348+#: ../src/common/Widgets/WifiMenuItem.vala:125
349 msgid "This network uses 40/64-bit WEP encryption."
350 msgstr ""
351
352-#: ../src/common/Widgets/WifiMenuItem.vala:123
353+#: ../src/common/Widgets/WifiMenuItem.vala:127
354 msgid "This network uses 104/128-bit WEP encryption."
355 msgstr ""
356
357-#: ../src/common/Widgets/WifiMenuItem.vala:125
358+#: ../src/common/Widgets/WifiMenuItem.vala:129
359 msgid "This network uses WPA encryption."
360 msgstr ""
361
362-#: ../src/common/Widgets/WifiMenuItem.vala:127
363+#: ../src/common/Widgets/WifiMenuItem.vala:131
364 msgid "This network uses encryption."
365 msgstr ""
366
367-#: ../src/common/Widgets/AbstractWifiInterface.vala:52
368-msgid "No Access Points Available"
369-msgstr ""
370-
371-#: ../src/common/Widgets/AbstractWifiInterface.vala:56
372-msgid "There are no wireless access points within range."
373-msgstr ""
374-
375-#: ../src/common/Widgets/AbstractWifiInterface.vala:65
376-msgid "Wireless Is Disabled"
377-msgstr ""
378-
379-#: ../src/common/Widgets/AbstractWifiInterface.vala:66
380-msgid "Enable wireless to discover nearby wireless access points."
381-msgstr ""
382-
383-#: ../src/common/Widgets/AbstractWifiInterface.vala:77
384-msgid "Scanning for Access Points..."
385-msgstr ""
386-
387 #: ../src/Plug.vala:34
388 msgid "Unknown"
389 msgstr ""
390@@ -306,26 +312,37 @@
391 msgid "Airplane Mode Is Enabled"
392 msgstr ""
393
394+#: ../src/Plug.vala:81
395+msgid ""
396+"You will be unable to browse the web or use applications that require a "
397+"network connection or Internet access.\n"
398+msgstr ""
399+
400+#: ../src/Plug.vala:80
401+msgid ""
402+"While in Airplane Mode your device's Internet access and any wireless and "
403+"ethernet connections, will be suspended.\n"
404+"\n"
405+msgstr ""
406+
407+#: ../src/Plug.vala:84
408+msgid "There is nothing to do"
409+msgstr ""
410+
411 #: ../src/Plug.vala:85
412-msgid "There is nothing to do"
413+msgid ""
414+"There are no available WiFi connections and devices connected to this "
415+"computer.\n"
416+msgstr ""
417+
418+#: ../src/Plug.vala:86
419+msgid "Please connect at least one device to begin configuring the newtork."
420+msgstr ""
421+
422+#: ../src/Plug.vala:179
423+msgid "Network"
424 msgstr ""
425
426 #: ../src/Plug.vala:180
427-msgid "Network"
428-msgstr ""
429-
430-#: ../src/Plug.vala:181
431 msgid "Network settings"
432 msgstr ""
433-
434-#: ../src/Plug.vala:86
435-msgid ""
436-"There are no available WiFi connections and devices connected to this "
437-"computer."
438-msgstr ""
439-
440-#: ../src/Plug.vala:80
441-msgid ""
442-"While in Airplane Mode your device's Internet access and any wireless and "
443-"ethernet connections, will be suspended."
444-msgstr ""
445
446=== modified file 'src/Plug.vala'
447--- src/Plug.vala 2015-08-04 20:56:39 +0000
448+++ src/Plug.vala 2015-08-14 12:29:45 +0000
449@@ -77,14 +77,13 @@
450 footer.hexpand = false;
451
452 var airplane_mode = new Widgets.InfoScreen (_("Airplane Mode Is Enabled"),
453- _("While in Airplane Mode your device's Internet access and any wireless and ethernet connections, will be suspended.
454-
455-You will be unable to browse the web or use applications that require a network connection or Internet access.
456-Applications and other functions that do not require the Internet will be unaffected."), "airplane-mode");
457+ _("While in Airplane Mode your device's Internet access and any wireless and ethernet connections, will be suspended.\n\n" +
458+_("You will be unable to browse the web or use applications that require a network connection or Internet access.\n") +
459+"Applications and other functions that do not require the Internet will be unaffected."), "airplane-mode");
460
461 no_devices = new Widgets.InfoScreen (_("There is nothing to do"),
462- _("There are no available WiFi connections and devices connected to this computer.
463-Please connect at least one device to begin configuring the newtork."), "dialog-cancel");
464+ _("There are no available WiFi connections and devices connected to this computer.\n") +
465+_("Please connect at least one device to begin configuring the newtork."), "dialog-cancel");
466
467 content.add_named (airplane_mode, "airplane-mode-info");
468 content.add_named (no_devices, "no-devices-info");
469
470=== modified file 'src/Widgets/Proxy/ProxyConfigurationPage.vala'
471--- src/Widgets/Proxy/ProxyConfigurationPage.vala 2015-04-27 14:42:50 +0000
472+++ src/Widgets/Proxy/ProxyConfigurationPage.vala 2015-08-14 12:29:45 +0000
473@@ -241,8 +241,7 @@
474 private void on_reset_btn_clicked () {
475 var reset_dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL, Gtk.MessageType.INFO, Gtk.ButtonsType.NONE, " ");
476
477- reset_dialog.text = _("Do you want to reset all the settings to
478-default values inluding hosts and ports?");
479+ reset_dialog.text = _("Do you want to reset all the settings to\ndefault values inluding hosts and ports?");
480 reset_dialog.add_button (_("Do not reset"), 0);
481 reset_dialog.add_button (_("Reset"), 1);
482

Subscribers

People subscribed via source and target branches

to all changes: