Software Properties

Merge lp:~medigeek/software-properties/bug-407240 into lp:software-properties

  1. bug-407240
  2. Merge into main
Proposed by Savvas Radevic
Status: Merged
Merged at revision: not available
Proposed branch: lp:~medigeek/software-properties/bug-407240
Merge into: lp:software-properties
Diff against target: None lines
To merge this branch: bzr merge lp:~medigeek/software-properties/bug-407240
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+9496@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/software-properties.pot'
2--- po/software-properties.pot 2007-04-10 07:18:37 +0000
3+++ po/software-properties.pot 2009-07-31 06:01:16 +0000
4@@ -7,8 +7,8 @@
5 msgid ""
6 msgstr ""
7 "Project-Id-Version: PACKAGE VERSION\n"
8-"Report-Msgid-Bugs-To: \n"
9-"POT-Creation-Date: 2007-04-07 10:28+0200\n"
10+"Report-Msgid-Bugs-To: Sebastian Heinlein <sebi@glatzor.de>\n"
11+"POT-Creation-Date: 2009-07-31 07:52+0200\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
15@@ -22,14 +22,29 @@
16 msgstr ""
17
18 #: ../data/software-properties.desktop.in.h:2
19-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:464
20-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:465
21-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:517
22-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:537
23-#: ../data/glade/main.glade.h:17
24+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:549
25+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:569
26+#: ../data/glade/main.glade.h:23
27 msgid "Software Sources"
28 msgstr ""
29
30+#: ../software-properties-gtk:82
31+msgid "You need to be root to run this program"
32+msgstr ""
33+
34+#: ../add-apt-repository:18
35+msgid "Error: must run as root"
36+msgstr ""
37+
38+#: ../add-apt-repository:22
39+msgid "Error: need a repository as argument"
40+msgstr ""
41+
42+#: ../add-apt-repository:31
43+#, c-format
44+msgid "Error: '%s' invalid"
45+msgstr ""
46+
47 #: ../softwareproperties/distro.py:28
48 msgid ""
49 "<i>To improve the user experience of Ubuntu please take part in the "
50@@ -72,42 +87,42 @@
51 msgstr ""
52
53 #. update_days = apt_pkg.Config.FindI(softwareproperties.CONF_MAP["autoupdate"])
54-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:171
55-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:149
56+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:193
57+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:175
58 msgid "Daily"
59 msgstr ""
60
61-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:172
62-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:150
63+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:194
64+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:176
65 msgid "Every two days"
66 msgstr ""
67
68-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:173
69-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:151
70+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:195
71+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:177
72 msgid "Weekly"
73 msgstr ""
74
75-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:174
76-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:152
77+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:196
78+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:178
79 msgid "Every two weeks"
80 msgstr ""
81
82-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:181
83-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:161
84+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:203
85+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:187
86 #, python-format
87 msgid "Every %s days"
88 msgstr ""
89
90 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
91-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:223
92-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:229
93+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:245
94+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:255
95 #, python-format
96 msgid "%s updates"
97 msgstr ""
98
99 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
100-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:227
101-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:232
102+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:249
103+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:258
104 #, python-format
105 msgid "%s Software"
106 msgstr ""
107@@ -115,27 +130,23 @@
108 #. TRANSLATORS: Label for the components in the Internet section
109 #. first %s is the description of the component
110 #. second %s is the code name of the comp, eg main, universe
111-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:244
112-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:246
113+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:269
114+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:272
115 #, python-format
116 msgid "%s (%s)"
117 msgstr ""
118
119 #. add a separator and the option to choose another mirror from the list
120 #. #FIXME server_store.append(["sep", None, True])
121-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:296
122-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:401
123-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:358
124-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:409
125+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:322
126+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:427
127+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:384
128+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:441
129 msgid "Other..."
130 msgstr ""
131
132-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:509
133-msgid "Key"
134-msgstr ""
135-
136 #. L10N: the example is of the format: deb http://ftp.debian.org sarge main
137-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:620
138+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:653
139 #, python-format
140 msgid ""
141 "<p><b>Enter the complete APT line of the<br /> repository that you want to "
142@@ -143,48 +154,44 @@
143 "components of a repository,<br /> for example <i>\"%s\"</i>.</p>"
144 msgstr ""
145
146-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:621
147+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:654
148 msgid "Add APT repository"
149 msgstr ""
150
151-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:658
152-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:733
153+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:695
154+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:807
155 msgid "Import key"
156 msgstr ""
157
158-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:661
159-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:743
160+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:698
161+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:820
162 #: ../softwareproperties/gtk/DialogAptKey.py:88
163 msgid "Error importing selected file"
164 msgstr ""
165
166-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:662
167-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:744
168+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:699
169+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:821
170 #: ../softwareproperties/gtk/DialogAptKey.py:89
171 msgid "The selected file may not be a GPG key file or it might be corrupt."
172 msgstr ""
173
174-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:676
175-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:757
176+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:713
177+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:834
178 #: ../softwareproperties/gtk/DialogAptKey.py:101
179 msgid "Error removing the key"
180 msgstr ""
181
182-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:677
183-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:758
184+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:714
185+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:835
186 #: ../softwareproperties/gtk/DialogAptKey.py:102
187 msgid "The key you selected could not be removed. Please report this as a bug."
188 msgstr ""
189
190-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:693
191+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:730
192 msgid "Reload"
193 msgstr ""
194
195-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:694
196-msgid "Close"
197-msgstr ""
198-
199-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:695
200+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:732
201 #: ../data/glade/dialogs.glade.h:4
202 msgid ""
203 "<b><big>The information about available software is out-of-date</big></b>\n"
204@@ -195,12 +202,11 @@
205 "You need a working internet connection to continue."
206 msgstr ""
207
208-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:723
209+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:762
210 msgid "CD Error"
211 msgstr ""
212
213-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:724
214-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:803
215+#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:763
216 #, python-format
217 msgid ""
218 "<big><b>Error scanning the CD</b></big>\n"
219@@ -208,20 +214,20 @@
220 "%s"
221 msgstr ""
222
223-#: ../softwareproperties/kde/CdromProgress.py:50
224+#: ../softwareproperties/kde/CdromProgress.py:51
225 msgid "CD Name"
226 msgstr ""
227
228-#: ../softwareproperties/kde/CdromProgress.py:50
229+#: ../softwareproperties/kde/CdromProgress.py:51
230 #: ../softwareproperties/gtk/CdromProgress.py:58
231 msgid "Please enter a name for the disc"
232 msgstr ""
233
234-#: ../softwareproperties/kde/CdromProgress.py:54
235+#: ../softwareproperties/kde/CdromProgress.py:55
236 msgid "Insert Disk"
237 msgstr ""
238
239-#: ../softwareproperties/kde/CdromProgress.py:54
240+#: ../softwareproperties/kde/CdromProgress.py:55
241 #: ../softwareproperties/gtk/CdromProgress.py:74
242 msgid "Please insert a disk in the drive:"
243 msgstr ""
244@@ -230,15 +236,15 @@
245 msgid "Binary"
246 msgstr ""
247
248-#: ../softwareproperties/kde/DialogEdit.py:41 ../data/glade/main.glade.h:18
249+#: ../softwareproperties/kde/DialogEdit.py:41 ../data/glade/main.glade.h:24
250 msgid "Source code"
251 msgstr ""
252
253-#: ../softwareproperties/SoftwareProperties.py:363
254+#: ../softwareproperties/SoftwareProperties.py:446
255 msgid "(Source Code)"
256 msgstr ""
257
258-#: ../softwareproperties/SoftwareProperties.py:369
259+#: ../softwareproperties/SoftwareProperties.py:452
260 msgid "Source Code"
261 msgstr ""
262
263@@ -251,23 +257,41 @@
264 msgid "Completed %s of %s tests"
265 msgstr ""
266
267-#: ../softwareproperties/gtk/DialogMirror.py:353
268+#: ../softwareproperties/gtk/DialogMirror.py:355
269 msgid "No suitable download server was found"
270 msgstr ""
271
272-#: ../softwareproperties/gtk/DialogMirror.py:354
273+#: ../softwareproperties/gtk/DialogMirror.py:356
274 msgid "Please check your Internet connection."
275 msgstr ""
276
277-#: ../softwareproperties/gtk/DialogMirror.py:370
278+#: ../softwareproperties/gtk/DialogMirror.py:372
279 msgid "Canceling..."
280 msgstr ""
281
282-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:528
283-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:548
284+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:560
285+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:580
286 msgid "Active"
287 msgstr ""
288
289+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:631
290+msgid "_Add key from paste data"
291+msgstr ""
292+
293+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:644
294+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:655
295+msgid "Error importing key"
296+msgstr ""
297+
298+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:645
299+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:656
300+msgid "The selected data may not be a GPG key file or it might be corrupt."
301+msgstr ""
302+
303+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:875
304+msgid "Error scanning the CD"
305+msgstr ""
306+
307 #. some known keys
308 #: ../softwareproperties/gtk/DialogAptKey.py:37
309 #: ../softwareproperties/AptAuth.py:33
310@@ -333,91 +357,102 @@
311 msgstr ""
312
313 #: ../data/glade/main.glade.h:5
314+msgid "<b>Release upgrade</b>"
315+msgstr ""
316+
317+#: ../data/glade/main.glade.h:6
318 msgid "<b>Trusted software providers</b>"
319 msgstr ""
320
321-#: ../data/glade/main.glade.h:6
322+#: ../data/glade/main.glade.h:7
323 msgid "Add CD-ROM..."
324 msgstr ""
325
326-#: ../data/glade/main.glade.h:7
327+#: ../data/glade/main.glade.h:8
328 msgid "Add..."
329 msgstr ""
330
331-#: ../data/glade/main.glade.h:8
332+#: ../data/glade/main.glade.h:9
333 msgid "Authentication"
334 msgstr ""
335
336-#: ../data/glade/main.glade.h:9
337+#: ../data/glade/main.glade.h:10
338+msgid "Chec_k for updates:"
339+msgstr ""
340+
341+#: ../data/glade/main.glade.h:11
342 msgid "Download from:"
343 msgstr ""
344
345-#: ../data/glade/main.glade.h:10
346+#: ../data/glade/main.glade.h:12
347 msgid "Edit..."
348 msgstr ""
349
350-#: ../data/glade/main.glade.h:11
351+#: ../data/glade/main.glade.h:13
352 msgid "Import the public key from a trusted software provider"
353 msgstr ""
354
355-#: ../data/glade/main.glade.h:12
356+#: ../data/glade/main.glade.h:14
357 msgid "Install _security updates without confirmation"
358 msgstr ""
359
360-#: ../data/glade/main.glade.h:13
361+#: ../data/glade/main.glade.h:15
362 msgid ""
363 "Keys are used to authenticate the correct source of software and so protect "
364 "your computer from malicious software"
365 msgstr ""
366
367-#: ../data/glade/main.glade.h:14
368+#: ../data/glade/main.glade.h:16
369+msgid ""
370+"Never\n"
371+"Normal releases\n"
372+"Long term support releases only"
373+msgstr ""
374+
375+#: ../data/glade/main.glade.h:19
376 msgid "Only _notify about available updates"
377 msgstr ""
378
379-#: ../data/glade/main.glade.h:15
380+#: ../data/glade/main.glade.h:20
381 msgid "Restore _Defaults"
382 msgstr ""
383
384-#: ../data/glade/main.glade.h:16
385+#: ../data/glade/main.glade.h:21
386 msgid "Restore the default keys of your distribution"
387 msgstr ""
388
389-#: ../data/glade/main.glade.h:19
390+#: ../data/glade/main.glade.h:22
391+msgid "Show new distribution releases: "
392+msgstr ""
393+
394+#: ../data/glade/main.glade.h:25
395 msgid "Statistics"
396 msgstr ""
397
398-#: ../data/glade/main.glade.h:20
399+#: ../data/glade/main.glade.h:26
400 msgid "Submit statistical information"
401 msgstr ""
402
403-#: ../data/glade/main.glade.h:21
404+#: ../data/glade/main.glade.h:27
405 msgid "Third-Party Software"
406 msgstr ""
407
408-#: ../data/glade/main.glade.h:22
409+#: ../data/glade/main.glade.h:28
410 msgid "To install from a CD-ROM or DVD, insert the medium into the drive."
411 msgstr ""
412
413-#: ../data/glade/main.glade.h:23
414+#: ../data/glade/main.glade.h:29
415 msgid "Updates"
416 msgstr ""
417
418-#: ../data/glade/main.glade.h:24
419-msgid "_Check for updates:"
420-msgstr ""
421-
422-#: ../data/glade/main.glade.h:25
423+#: ../data/glade/main.glade.h:30
424 msgid "_Download all updates in the background"
425 msgstr ""
426
427-#: ../data/glade/main.glade.h:26
428+#: ../data/glade/main.glade.h:31
429 msgid "_Import Key File..."
430 msgstr ""
431
432-#: ../data/glade/dialog_add_channels.glade.h:1
433-msgid "Add Software Channel"
434-msgstr ""
435-
436 #: ../data/glade/dialogs.glade.h:1
437 msgid ""
438 "<b><big>Testing download servers</big></b>\n"

Subscribers

People subscribed via source and target branches

to status/vote changes: