Merge lp://staging/~aloppnow-googlemail/groundcontrol/German_Translation into lp://staging/~doctormo/groundcontrol/translations
- German_Translation
- Merge into translations
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp://staging/~aloppnow-googlemail/groundcontrol/German_Translation |
Merge into: | lp://staging/~doctormo/groundcontrol/translations |
Diff against target: |
373 lines (+64/-63) 1 file modified
po/de.po (+64/-63) |
To merge this branch: | bzr merge lp://staging/~aloppnow-googlemail/groundcontrol/German_Translation |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Owens | Approve | ||
Review via email:
|
Commit message
Description of the change
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
aloppnow (aloppnow-googlemail) wrote : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Martin Owens (doctormo) wrote : | # |
Brilliant work, I'm hoping launchpad doesn't overwrite your work, so I'm going to merge it into translations and then into trunk so it's in multiple places.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
aloppnow (aloppnow-googlemail) wrote : | # |
Thank you,
it is fun working on the Translations. Ground Control makes it really easy
to download Code, work on it and upload it again. Nice work
Do you have more Projects that need a German Translation???
I'm interested.
Have Fun watching the Super bowl,
Greetings A.Loppnow
2010/2/7 Martin Owens <email address hidden>
> Review: Approve
> Brilliant work, I'm hoping launchpad doesn't overwrite your work, so I'm
> going to merge it into translations and then into trunk so it's in multiple
> places.
> --
>
> https:/
> You are the owner of
> lp:~aloppnow-googlemail/groundcontrol/German_Translation.
>
--
<email address hidden>
www.andreas-
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Martin Owens (doctormo) wrote : | # |
don't forget to set your temp branch to Abandoned
https:/
keeping the branches clean.
Preview Diff
1 | === modified file 'po/de.po' |
2 | --- po/de.po 2010-02-07 04:42:19 +0000 |
3 | +++ po/de.po 2010-02-07 08:28:14 +0000 |
4 | @@ -8,8 +8,8 @@ |
5 | "Project-Id-Version: groundcontrol\n" |
6 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
7 | "POT-Creation-Date: 2010-02-06 12:35-0500\n" |
8 | -"PO-Revision-Date: 2010-02-04 20:54+0000\n" |
9 | -"Last-Translator: Michael Keppler <Bananeweizen@gmx.de>\n" |
10 | +"PO-Revision-Date: 2010-02-07 09:24+0100\n" |
11 | +"Last-Translator: Andreas Loppnow <mail@andreas-loppnow.de>\n" |
12 | "Language-Team: German <de@li.org>\n" |
13 | "MIME-Version: 1.0\n" |
14 | "Content-Type: text/plain; charset=UTF-8\n" |
15 | @@ -19,31 +19,30 @@ |
16 | |
17 | #: ../groundcontrol.desktop.in.h:1 |
18 | msgid "Ground Control" |
19 | -msgstr "" |
20 | +msgstr "Ground Control" |
21 | |
22 | #: ../groundcontrol.desktop.in.h:2 |
23 | msgid "Ground Control Configuration" |
24 | -msgstr "" |
25 | +msgstr "Ground Control Konfiguration" |
26 | |
27 | #: ../groundcontrol.desktop.in.h:3 |
28 | -msgid "" |
29 | -"Set up your launchpad account so it works with ground control seemlessly." |
30 | -msgstr "" |
31 | +msgid "Set up your launchpad account so it works with ground control seemlessly." |
32 | +msgstr "Launchpad Account einrichten, so das er nahtlos mit Ground Control zusammenarbeitet." |
33 | |
34 | #. Do not use launchpadlib within this main thread |
35 | #. It's not thread safe and causes lots of errors. |
36 | #: ../nautilus-groundcontrol.py:52 |
37 | #, python-format |
38 | msgid "Initializing %s-%s extension" |
39 | -msgstr "" |
40 | +msgstr "Lade %s-%s Erweiterung." |
41 | |
42 | #: ../nautilus-groundcontrol.py:111 |
43 | msgid "GroundControl Extension Disabled." |
44 | -msgstr "" |
45 | +msgstr "Ground Control Erweiterung deaktiviert." |
46 | |
47 | #: ../nautilus-groundcontrol.py:116 |
48 | msgid "Please Enter Account Details" |
49 | -msgstr "" |
50 | +msgstr "Bitte Account Details eingeben." |
51 | |
52 | #: ../nautilus-groundcontrol.py:117 |
53 | msgid "Configure Launchpad" |
54 | @@ -64,19 +63,20 @@ |
55 | #: ../nautilus-groundcontrol.py:174 |
56 | #, python-format |
57 | msgid "Error in config GUI: %s" |
58 | -msgstr "" |
59 | +msgstr "Fehler in GUI Konfiguration: %s" |
60 | |
61 | #: ../nautilus-groundcontrol.py:213 |
62 | msgid "Files Have Changes" |
63 | -msgstr "" |
64 | +msgstr "Dateien haben sich geändert." |
65 | |
66 | #: ../nautilus-groundcontrol.py:214 |
67 | msgid "Commit Changes" |
68 | msgstr "Änderungen einchecken" |
69 | |
70 | -#: ../nautilus-groundcontrol.py:216 ../nautilus-groundcontrol.py:222 |
71 | +#: ../nautilus-groundcontrol.py:216 |
72 | +#: ../nautilus-groundcontrol.py:222 |
73 | msgid "Revert Changes" |
74 | -msgstr "" |
75 | +msgstr "Änderungen rückgängig machen." |
76 | |
77 | #: ../nautilus-groundcontrol.py:219 |
78 | msgid "New Files" |
79 | @@ -94,10 +94,11 @@ |
80 | msgid "Upload Changes" |
81 | msgstr "Änderungen hochladen" |
82 | |
83 | -#: ../nautilus-groundcontrol.py:227 ../nautilus-groundcontrol.py:238 |
84 | +#: ../nautilus-groundcontrol.py:227 |
85 | +#: ../nautilus-groundcontrol.py:238 |
86 | #: ../nautilus-groundcontrol.py:244 |
87 | msgid "Update" |
88 | -msgstr "" |
89 | +msgstr "Updaten." |
90 | |
91 | #: ../nautilus-groundcontrol.py:230 |
92 | msgid "Merge Requested" |
93 | @@ -111,7 +112,8 @@ |
94 | msgid "Uploaded, Merge Needed" |
95 | msgstr "Hochgeladen, Zusammenführung notwendig" |
96 | |
97 | -#: ../nautilus-groundcontrol.py:237 ../glade/request-merge.glade.h:7 |
98 | +#: ../nautilus-groundcontrol.py:237 |
99 | +#: ../glade/request-merge.glade.h:7 |
100 | msgid "Request Merge" |
101 | msgstr "Um Zusammenführung bitten (request merge)" |
102 | |
103 | @@ -120,11 +122,11 @@ |
104 | #. But there is something to do, do an update to trunk |
105 | #: ../nautilus-groundcontrol.py:243 |
106 | msgid "Code Branch" |
107 | -msgstr "" |
108 | +msgstr "Code Zweig" |
109 | |
110 | #: ../nautilus-groundcontrol.py:246 |
111 | msgid "<b>Read Only Branch</b>" |
112 | -msgstr "" |
113 | +msgstr "<b>Nur Lesen Zweig</b>" |
114 | |
115 | #: ../nautilus-groundcontrol.py:305 |
116 | msgid "Functionality not written yet" |
117 | @@ -138,12 +140,12 @@ |
118 | #: ../bin/branch-select.py:29 |
119 | #, python-format |
120 | msgid "Branch not Checkout: %s" |
121 | -msgstr "" |
122 | +msgstr "Zweig noch nicht ausgecheckt: %s" |
123 | |
124 | #: ../bin/branch-select.py:30 |
125 | #, python-format |
126 | msgid "Workname: %s" |
127 | -msgstr "" |
128 | +msgstr "Arbeitsname: %s" |
129 | |
130 | #: ../glade/branch-select.glade.h:1 |
131 | msgid "<b>Reason for getting code:</b>" |
132 | @@ -159,7 +161,7 @@ |
133 | |
134 | #: ../glade/branch-select.glade.h:4 |
135 | msgid "Name of your local changes:" |
136 | -msgstr "" |
137 | +msgstr "Name der lokalen Änderungen:" |
138 | |
139 | #: ../glade/branch-select.glade.h:5 |
140 | msgid "Select Branch" |
141 | @@ -171,7 +173,7 @@ |
142 | |
143 | #: ../glade/commit-branch.glade.h:1 |
144 | msgid "<b>Explain Your Changes:</b>" |
145 | -msgstr "" |
146 | +msgstr "<b>Erkläre die Änderungen:</b>" |
147 | |
148 | #: ../glade/commit-branch.glade.h:2 |
149 | msgid "<big><b>Please Confirm Your Changes:</b></big>" |
150 | @@ -181,9 +183,11 @@ |
151 | msgid "" |
152 | "<big><b>Really Revert Changes?</b></big>\n" |
153 | "\n" |
154 | -"<b><i>Warning!</i></b> This will destroy any changes you have made, any " |
155 | -"deleted files will repear and any new files will be removed." |
156 | +"<b><i>Warning!</i></b> This will destroy any changes you have made, any deleted files will repear and any new files will be removed." |
157 | msgstr "" |
158 | +"<big><b>Änderungen wirklich rückgängig machen?</b></big>\n" |
159 | +"\n" |
160 | +"<b><i>Warnung!</i></b> Das wird alle Änderungen die Sie gemacht haben vernichten, alle gelöschten Dateien sind wieder da und alle neuen Dateien werden gelöscht" |
161 | |
162 | #: ../glade/commit-branch.glade.h:6 |
163 | msgid "Commit Confirmation" |
164 | @@ -191,19 +195,19 @@ |
165 | |
166 | #: ../glade/commit-branch.glade.h:7 |
167 | msgid "Fixes Bugs:" |
168 | -msgstr "" |
169 | +msgstr "Gefixte Bugs:" |
170 | |
171 | #: ../glade/commit-branch.glade.h:8 |
172 | msgid "Ignore" |
173 | -msgstr "" |
174 | +msgstr "Ignorieren" |
175 | |
176 | #: ../glade/commit-branch.glade.h:9 |
177 | msgid "Ignore New Files:" |
178 | -msgstr "" |
179 | +msgstr "ignorierte neue Dateien:" |
180 | |
181 | #: ../glade/commit-branch.glade.h:10 |
182 | msgid "Revert Confirmation" |
183 | -msgstr "" |
184 | +msgstr "Bestätigung zurücksetzen" |
185 | |
186 | #: ../glade/project-select.glade.h:1 |
187 | msgid "Loading Launchpad..." |
188 | @@ -263,7 +267,7 @@ |
189 | |
190 | #: ../glade/configure.glade.h:7 |
191 | msgid "<none>" |
192 | -msgstr "" |
193 | +msgstr "<keine>" |
194 | |
195 | #: ../glade/configure.glade.h:8 |
196 | msgid "Confirm:" |
197 | @@ -302,21 +306,16 @@ |
198 | msgstr "Für Launchpad registrieren" |
199 | |
200 | #: ../glade/configure.glade.h:17 |
201 | -msgid "" |
202 | -"We need to make a <b>Special Key</b> which will be used to access project " |
203 | -"code, this key requires a <b>New</b> password that is unrelated to your " |
204 | -"existing launchpad account:" |
205 | -msgstr "" |
206 | -"Um an den Project-Code zu gelangen wird ein <b>spezieller Schlüssel</b> " |
207 | -"benötigt. Für diesen Schlüssel wird ein <b>neues</b>, vom Launchpad-Account " |
208 | -"unabhängiges, Passwort benötigt." |
209 | +msgid "We need to make a <b>Special Key</b> which will be used to access project code, this key requires a <b>New</b> password that is unrelated to your existing launchpad account:" |
210 | +msgstr "Um an den Project-Code zu gelangen wird ein <b>spezieller Schlüssel</b> benötigt. Für diesen Schlüssel wird ein <b>neues</b>, vom Launchpad-Account unabhängiges, Passwort benötigt." |
211 | |
212 | #: ../GroundControl/bazaar.py:205 |
213 | #, python-format |
214 | msgid "Unable to remove branch at '%s', not local." |
215 | -msgstr "" |
216 | +msgstr "Konnte Zweig '%s' nicht löschen, nicht lokal." |
217 | |
218 | -#: ../GroundControl/bazaar.py:217 ../GroundControl/bazaar.py:241 |
219 | +#: ../GroundControl/bazaar.py:217 |
220 | +#: ../GroundControl/bazaar.py:241 |
221 | #: ../GroundControl/branches.py:37 |
222 | msgid "Please Wait..." |
223 | msgstr "Bitte warten..." |
224 | @@ -327,15 +326,15 @@ |
225 | |
226 | #: ../GroundControl/bazaar.py:363 |
227 | msgid "Branching Code" |
228 | -msgstr "" |
229 | +msgstr "Zweige Code ab" |
230 | |
231 | #: ../GroundControl/bazaar.py:405 |
232 | msgid "Checking Out Code" |
233 | -msgstr "" |
234 | +msgstr "Code auschecken" |
235 | |
236 | #: ../GroundControl/bazaar.py:424 |
237 | msgid "Commiting Changes" |
238 | -msgstr "" |
239 | +msgstr "Änderungen übetragen" |
240 | |
241 | #: ../GroundControl/bazaar.py:471 |
242 | msgid "Uploading Code" |
243 | @@ -343,28 +342,28 @@ |
244 | |
245 | #: ../GroundControl/bazaar.py:487 |
246 | msgid "Re-Syncing Code" |
247 | -msgstr "" |
248 | +msgstr "Code erneut abgleichen" |
249 | |
250 | #: ../GroundControl/bazaar.py:501 |
251 | msgid "Reverting Branch" |
252 | -msgstr "" |
253 | +msgstr "Zweig zurücksetzen" |
254 | |
255 | #: ../GroundControl/branches.py:37 |
256 | msgid "Logging into Launchpad..." |
257 | -msgstr "" |
258 | +msgstr "Bei Launchpad einloggen..." |
259 | |
260 | #: ../GroundControl/branches.py:38 |
261 | msgid "Loading Available Branches..." |
262 | -msgstr "" |
263 | +msgstr "Lade verfügbare Zweige..." |
264 | |
265 | #: ../GroundControl/branches.py:39 |
266 | #, python-format |
267 | msgid "Loading Branch: %s" |
268 | -msgstr "" |
269 | +msgstr "Lade Zweig: %s" |
270 | |
271 | #: ../GroundControl/branches.py:190 |
272 | msgid "Project Branches" |
273 | -msgstr "" |
274 | +msgstr "Projekt Zweige" |
275 | |
276 | #: ../GroundControl/branches.py:206 |
277 | #, python-format |
278 | @@ -378,7 +377,7 @@ |
279 | #: ../GroundControl/branches.py:213 |
280 | #, python-format |
281 | msgid "(%s Series Focus)" |
282 | -msgstr "" |
283 | +msgstr "(%s Serie Fokus)" |
284 | |
285 | #: ../GroundControl/branches.py:235 |
286 | #, python-format |
287 | @@ -431,20 +430,21 @@ |
288 | |
289 | #: ../GroundControl/configuration.py:48 |
290 | msgid "Getting Launchpad Credentials" |
291 | -msgstr "" |
292 | +msgstr "Hole Launchpad Zertifikate." |
293 | |
294 | -#: ../GroundControl/configuration.py:85 ../GroundControl/merger.py:64 |
295 | +#: ../GroundControl/configuration.py:85 |
296 | +#: ../GroundControl/merger.py:64 |
297 | msgid "Unable to authorise launchpad account." |
298 | -msgstr "" |
299 | +msgstr "Konnte Launchpad Account nicht autorisieren." |
300 | |
301 | #. If nothing returned, then we failed to auth oauth. Worry |
302 | #: ../GroundControl/configuration.py:171 |
303 | msgid "Unable to authenticate the launchpad OAuth" |
304 | -msgstr "" |
305 | +msgstr "Konnte Launchpad OAuth nicht authentifizieren." |
306 | |
307 | #: ../GroundControl/configuration.py:239 |
308 | msgid "Can't login! incorrect email addr or password." |
309 | -msgstr "" |
310 | +msgstr "Einloggen fehlgeschlagen Falsche E Mail Adresse oder Passwort." |
311 | |
312 | #: ../GroundControl/gtkviews.py:49 |
313 | #, python-format |
314 | @@ -458,16 +458,16 @@ |
315 | |
316 | #: ../GroundControl/gtkviews.py:120 |
317 | msgid "More than one window is set Primary!" |
318 | -msgstr "" |
319 | +msgstr "Mehr als ein Fenster ist primär!" |
320 | |
321 | #: ../GroundControl/gtkviews.py:236 |
322 | #, python-format |
323 | msgid "Child arguments aren't valid: %s" |
324 | -msgstr "" |
325 | +msgstr "Child Argument sind nicht gültig: %s" |
326 | |
327 | #: ../GroundControl/gtkviews.py:373 |
328 | msgid "Your thread is still active." |
329 | -msgstr "" |
330 | +msgstr "Der Thread ist noch aktiv." |
331 | |
332 | #: ../GroundControl/gtkviews.py:407 |
333 | #, python-format |
334 | @@ -477,21 +477,21 @@ |
335 | #: ../GroundControl/launchpad.py:63 |
336 | #, python-format |
337 | msgid "Save cache file to %s" |
338 | -msgstr "" |
339 | +msgstr "Speicher Cache Datei in %s" |
340 | |
341 | #: ../GroundControl/launchpad.py:90 |
342 | #, python-format |
343 | msgid "No launchpad server %s." |
344 | -msgstr "" |
345 | +msgstr "Kein Launchpad Server %s." |
346 | |
347 | #: ../GroundControl/launchpad.py:105 |
348 | #, python-format |
349 | msgid "Posting REQUEST to %s with %s via %s" |
350 | -msgstr "" |
351 | +msgstr "Poste REQUESTzu %s mit %s über %s" |
352 | |
353 | #: ../GroundControl/launchpad.py:111 |
354 | msgid "Unable to get launchpad auth, not logged in." |
355 | -msgstr "" |
356 | +msgstr "Konnte Launchpad Authentifikation nicht holen, Sie sind nicht eingeloggt." |
357 | |
358 | #: ../GroundControl/launchpadweb.py:177 |
359 | msgid "Unable to generate data from content." |
360 | @@ -505,7 +505,7 @@ |
361 | #: ../GroundControl/projects.py:96 |
362 | #, python-format |
363 | msgid "Can't create, project %s exists." |
364 | -msgstr "" |
365 | +msgstr "Konnte Projekt %s nicht erstellen, es existiert bereits." |
366 | |
367 | #: ../GroundControl/projects.py:141 |
368 | msgid "Searching Launchpad... Please Wait" |
369 | @@ -514,3 +514,4 @@ |
370 | #: ../GroundControl/projects.py:185 |
371 | msgid "Online Projects" |
372 | msgstr "Online verfügbare Projekte" |
373 | + |
I Finished the German Translation