Ground Control

Merge lp://staging/~aloppnow-googlemail/groundcontrol/German_Translation into lp://staging/~doctormo/groundcontrol/translations

  1. German_Translation
  2. Merge into translations
Proposed by aloppnow
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
Reviewer Review Type Date Requested Status
Martin Owens Approve
Review via email: mp+18787@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
aloppnow (aloppnow-googlemail) wrote :

I Finished the German Translation

Revision history for this message
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.

review: Approve
Revision history for this message
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://code.launchpad.net/~aloppnow-googlemail/groundcontrol/German_Translation/+merge/18787<https://code.launchpad.net/%7Ealoppnow-googlemail/groundcontrol/German_Translation/+merge/18787>
> You are the owner of
> lp:~aloppnow-googlemail/groundcontrol/German_Translation.
>

--
<email address hidden>
www.andreas-loppnow.de

Revision history for this message
Martin Owens (doctormo) wrote :

don't forget to set your temp branch to Abandoned

https://code.launchpad.net/~aloppnow-googlemail/groundcontrol/temp

keeping the branches clean.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/de.po'
--- po/de.po 2010-02-07 04:42:19 +0000
+++ po/de.po 2010-02-07 08:28:14 +0000
@@ -8,8 +8,8 @@
8"Project-Id-Version: groundcontrol\n"8"Project-Id-Version: groundcontrol\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2010-02-06 12:35-0500\n"10"POT-Creation-Date: 2010-02-06 12:35-0500\n"
11"PO-Revision-Date: 2010-02-04 20:54+0000\n"11"PO-Revision-Date: 2010-02-07 09:24+0100\n"
12"Last-Translator: Michael Keppler <Bananeweizen@gmx.de>\n"12"Last-Translator: Andreas Loppnow <mail@andreas-loppnow.de>\n"
13"Language-Team: German <de@li.org>\n"13"Language-Team: German <de@li.org>\n"
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +19,30 @@
1919
20#: ../groundcontrol.desktop.in.h:120#: ../groundcontrol.desktop.in.h:1
21msgid "Ground Control"21msgid "Ground Control"
22msgstr ""22msgstr "Ground Control"
2323
24#: ../groundcontrol.desktop.in.h:224#: ../groundcontrol.desktop.in.h:2
25msgid "Ground Control Configuration"25msgid "Ground Control Configuration"
26msgstr ""26msgstr "Ground Control Konfiguration"
2727
28#: ../groundcontrol.desktop.in.h:328#: ../groundcontrol.desktop.in.h:3
29msgid ""29msgid "Set up your launchpad account so it works with ground control seemlessly."
30"Set up your launchpad account so it works with ground control seemlessly."30msgstr "Launchpad Account einrichten, so das er nahtlos mit Ground Control zusammenarbeitet."
31msgstr ""
3231
33#. Do not use launchpadlib within this main thread32#. Do not use launchpadlib within this main thread
34#. It's not thread safe and causes lots of errors.33#. It's not thread safe and causes lots of errors.
35#: ../nautilus-groundcontrol.py:5234#: ../nautilus-groundcontrol.py:52
36#, python-format35#, python-format
37msgid "Initializing %s-%s extension"36msgid "Initializing %s-%s extension"
38msgstr ""37msgstr "Lade %s-%s Erweiterung."
3938
40#: ../nautilus-groundcontrol.py:11139#: ../nautilus-groundcontrol.py:111
41msgid "GroundControl Extension Disabled."40msgid "GroundControl Extension Disabled."
42msgstr ""41msgstr "Ground Control Erweiterung deaktiviert."
4342
44#: ../nautilus-groundcontrol.py:11643#: ../nautilus-groundcontrol.py:116
45msgid "Please Enter Account Details"44msgid "Please Enter Account Details"
46msgstr ""45msgstr "Bitte Account Details eingeben."
4746
48#: ../nautilus-groundcontrol.py:11747#: ../nautilus-groundcontrol.py:117
49msgid "Configure Launchpad"48msgid "Configure Launchpad"
@@ -64,19 +63,20 @@
64#: ../nautilus-groundcontrol.py:17463#: ../nautilus-groundcontrol.py:174
65#, python-format64#, python-format
66msgid "Error in config GUI: %s"65msgid "Error in config GUI: %s"
67msgstr ""66msgstr "Fehler in GUI Konfiguration: %s"
6867
69#: ../nautilus-groundcontrol.py:21368#: ../nautilus-groundcontrol.py:213
70msgid "Files Have Changes"69msgid "Files Have Changes"
71msgstr ""70msgstr "Dateien haben sich geändert."
7271
73#: ../nautilus-groundcontrol.py:21472#: ../nautilus-groundcontrol.py:214
74msgid "Commit Changes"73msgid "Commit Changes"
75msgstr "Änderungen einchecken"74msgstr "Änderungen einchecken"
7675
77#: ../nautilus-groundcontrol.py:216 ../nautilus-groundcontrol.py:22276#: ../nautilus-groundcontrol.py:216
77#: ../nautilus-groundcontrol.py:222
78msgid "Revert Changes"78msgid "Revert Changes"
79msgstr ""79msgstr "Änderungen rückgängig machen."
8080
81#: ../nautilus-groundcontrol.py:21981#: ../nautilus-groundcontrol.py:219
82msgid "New Files"82msgid "New Files"
@@ -94,10 +94,11 @@
94msgid "Upload Changes"94msgid "Upload Changes"
95msgstr "Änderungen hochladen"95msgstr "Änderungen hochladen"
9696
97#: ../nautilus-groundcontrol.py:227 ../nautilus-groundcontrol.py:23897#: ../nautilus-groundcontrol.py:227
98#: ../nautilus-groundcontrol.py:238
98#: ../nautilus-groundcontrol.py:24499#: ../nautilus-groundcontrol.py:244
99msgid "Update"100msgid "Update"
100msgstr ""101msgstr "Updaten."
101102
102#: ../nautilus-groundcontrol.py:230103#: ../nautilus-groundcontrol.py:230
103msgid "Merge Requested"104msgid "Merge Requested"
@@ -111,7 +112,8 @@
111msgid "Uploaded, Merge Needed"112msgid "Uploaded, Merge Needed"
112msgstr "Hochgeladen, Zusammenführung notwendig"113msgstr "Hochgeladen, Zusammenführung notwendig"
113114
114#: ../nautilus-groundcontrol.py:237 ../glade/request-merge.glade.h:7115#: ../nautilus-groundcontrol.py:237
116#: ../glade/request-merge.glade.h:7
115msgid "Request Merge"117msgid "Request Merge"
116msgstr "Um Zusammenführung bitten (request merge)"118msgstr "Um Zusammenführung bitten (request merge)"
117119
@@ -120,11 +122,11 @@
120#. But there is something to do, do an update to trunk122#. But there is something to do, do an update to trunk
121#: ../nautilus-groundcontrol.py:243123#: ../nautilus-groundcontrol.py:243
122msgid "Code Branch"124msgid "Code Branch"
123msgstr ""125msgstr "Code Zweig"
124126
125#: ../nautilus-groundcontrol.py:246127#: ../nautilus-groundcontrol.py:246
126msgid "<b>Read Only Branch</b>"128msgid "<b>Read Only Branch</b>"
127msgstr ""129msgstr "<b>Nur Lesen Zweig</b>"
128130
129#: ../nautilus-groundcontrol.py:305131#: ../nautilus-groundcontrol.py:305
130msgid "Functionality not written yet"132msgid "Functionality not written yet"
@@ -138,12 +140,12 @@
138#: ../bin/branch-select.py:29140#: ../bin/branch-select.py:29
139#, python-format141#, python-format
140msgid "Branch not Checkout: %s"142msgid "Branch not Checkout: %s"
141msgstr ""143msgstr "Zweig noch nicht ausgecheckt: %s"
142144
143#: ../bin/branch-select.py:30145#: ../bin/branch-select.py:30
144#, python-format146#, python-format
145msgid "Workname: %s"147msgid "Workname: %s"
146msgstr ""148msgstr "Arbeitsname: %s"
147149
148#: ../glade/branch-select.glade.h:1150#: ../glade/branch-select.glade.h:1
149msgid "<b>Reason for getting code:</b>"151msgid "<b>Reason for getting code:</b>"
@@ -159,7 +161,7 @@
159161
160#: ../glade/branch-select.glade.h:4162#: ../glade/branch-select.glade.h:4
161msgid "Name of your local changes:"163msgid "Name of your local changes:"
162msgstr ""164msgstr "Name der lokalen Änderungen:"
163165
164#: ../glade/branch-select.glade.h:5166#: ../glade/branch-select.glade.h:5
165msgid "Select Branch"167msgid "Select Branch"
@@ -171,7 +173,7 @@
171173
172#: ../glade/commit-branch.glade.h:1174#: ../glade/commit-branch.glade.h:1
173msgid "<b>Explain Your Changes:</b>"175msgid "<b>Explain Your Changes:</b>"
174msgstr ""176msgstr "<b>Erkläre die Änderungen:</b>"
175177
176#: ../glade/commit-branch.glade.h:2178#: ../glade/commit-branch.glade.h:2
177msgid "<big><b>Please Confirm Your Changes:</b></big>"179msgid "<big><b>Please Confirm Your Changes:</b></big>"
@@ -181,9 +183,11 @@
181msgid ""183msgid ""
182"<big><b>Really Revert Changes?</b></big>\n"184"<big><b>Really Revert Changes?</b></big>\n"
183"\n"185"\n"
184"<b><i>Warning!</i></b> This will destroy any changes you have made, any "186"<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."
185"deleted files will repear and any new files will be removed."
186msgstr ""187msgstr ""
188"<big><b>Änderungen wirklich rückgängig machen?</b></big>\n"
189"\n"
190"<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"
187191
188#: ../glade/commit-branch.glade.h:6192#: ../glade/commit-branch.glade.h:6
189msgid "Commit Confirmation"193msgid "Commit Confirmation"
@@ -191,19 +195,19 @@
191195
192#: ../glade/commit-branch.glade.h:7196#: ../glade/commit-branch.glade.h:7
193msgid "Fixes Bugs:"197msgid "Fixes Bugs:"
194msgstr ""198msgstr "Gefixte Bugs:"
195199
196#: ../glade/commit-branch.glade.h:8200#: ../glade/commit-branch.glade.h:8
197msgid "Ignore"201msgid "Ignore"
198msgstr ""202msgstr "Ignorieren"
199203
200#: ../glade/commit-branch.glade.h:9204#: ../glade/commit-branch.glade.h:9
201msgid "Ignore New Files:"205msgid "Ignore New Files:"
202msgstr ""206msgstr "ignorierte neue Dateien:"
203207
204#: ../glade/commit-branch.glade.h:10208#: ../glade/commit-branch.glade.h:10
205msgid "Revert Confirmation"209msgid "Revert Confirmation"
206msgstr ""210msgstr "Bestätigung zurücksetzen"
207211
208#: ../glade/project-select.glade.h:1212#: ../glade/project-select.glade.h:1
209msgid "Loading Launchpad..."213msgid "Loading Launchpad..."
@@ -263,7 +267,7 @@
263267
264#: ../glade/configure.glade.h:7268#: ../glade/configure.glade.h:7
265msgid "<none>"269msgid "<none>"
266msgstr ""270msgstr "<keine>"
267271
268#: ../glade/configure.glade.h:8272#: ../glade/configure.glade.h:8
269msgid "Confirm:"273msgid "Confirm:"
@@ -302,21 +306,16 @@
302msgstr "Für Launchpad registrieren"306msgstr "Für Launchpad registrieren"
303307
304#: ../glade/configure.glade.h:17308#: ../glade/configure.glade.h:17
305msgid ""309msgid "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:"
306"We need to make a <b>Special Key</b> which will be used to access project "310msgstr "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."
307"code, this key requires a <b>New</b> password that is unrelated to your "
308"existing launchpad account:"
309msgstr ""
310"Um an den Project-Code zu gelangen wird ein <b>spezieller Schlüssel</b> "
311"benötigt. Für diesen Schlüssel wird ein <b>neues</b>, vom Launchpad-Account "
312"unabhängiges, Passwort benötigt."
313311
314#: ../GroundControl/bazaar.py:205312#: ../GroundControl/bazaar.py:205
315#, python-format313#, python-format
316msgid "Unable to remove branch at '%s', not local."314msgid "Unable to remove branch at '%s', not local."
317msgstr ""315msgstr "Konnte Zweig '%s' nicht löschen, nicht lokal."
318316
319#: ../GroundControl/bazaar.py:217 ../GroundControl/bazaar.py:241317#: ../GroundControl/bazaar.py:217
318#: ../GroundControl/bazaar.py:241
320#: ../GroundControl/branches.py:37319#: ../GroundControl/branches.py:37
321msgid "Please Wait..."320msgid "Please Wait..."
322msgstr "Bitte warten..."321msgstr "Bitte warten..."
@@ -327,15 +326,15 @@
327326
328#: ../GroundControl/bazaar.py:363327#: ../GroundControl/bazaar.py:363
329msgid "Branching Code"328msgid "Branching Code"
330msgstr ""329msgstr "Zweige Code ab"
331330
332#: ../GroundControl/bazaar.py:405331#: ../GroundControl/bazaar.py:405
333msgid "Checking Out Code"332msgid "Checking Out Code"
334msgstr ""333msgstr "Code auschecken"
335334
336#: ../GroundControl/bazaar.py:424335#: ../GroundControl/bazaar.py:424
337msgid "Commiting Changes"336msgid "Commiting Changes"
338msgstr ""337msgstr "Änderungen übetragen"
339338
340#: ../GroundControl/bazaar.py:471339#: ../GroundControl/bazaar.py:471
341msgid "Uploading Code"340msgid "Uploading Code"
@@ -343,28 +342,28 @@
343342
344#: ../GroundControl/bazaar.py:487343#: ../GroundControl/bazaar.py:487
345msgid "Re-Syncing Code"344msgid "Re-Syncing Code"
346msgstr ""345msgstr "Code erneut abgleichen"
347346
348#: ../GroundControl/bazaar.py:501347#: ../GroundControl/bazaar.py:501
349msgid "Reverting Branch"348msgid "Reverting Branch"
350msgstr ""349msgstr "Zweig zurücksetzen"
351350
352#: ../GroundControl/branches.py:37351#: ../GroundControl/branches.py:37
353msgid "Logging into Launchpad..."352msgid "Logging into Launchpad..."
354msgstr ""353msgstr "Bei Launchpad einloggen..."
355354
356#: ../GroundControl/branches.py:38355#: ../GroundControl/branches.py:38
357msgid "Loading Available Branches..."356msgid "Loading Available Branches..."
358msgstr ""357msgstr "Lade verfügbare Zweige..."
359358
360#: ../GroundControl/branches.py:39359#: ../GroundControl/branches.py:39
361#, python-format360#, python-format
362msgid "Loading Branch: %s"361msgid "Loading Branch: %s"
363msgstr ""362msgstr "Lade Zweig: %s"
364363
365#: ../GroundControl/branches.py:190364#: ../GroundControl/branches.py:190
366msgid "Project Branches"365msgid "Project Branches"
367msgstr ""366msgstr "Projekt Zweige"
368367
369#: ../GroundControl/branches.py:206368#: ../GroundControl/branches.py:206
370#, python-format369#, python-format
@@ -378,7 +377,7 @@
378#: ../GroundControl/branches.py:213377#: ../GroundControl/branches.py:213
379#, python-format378#, python-format
380msgid "(%s Series Focus)"379msgid "(%s Series Focus)"
381msgstr ""380msgstr "(%s Serie Fokus)"
382381
383#: ../GroundControl/branches.py:235382#: ../GroundControl/branches.py:235
384#, python-format383#, python-format
@@ -431,20 +430,21 @@
431430
432#: ../GroundControl/configuration.py:48431#: ../GroundControl/configuration.py:48
433msgid "Getting Launchpad Credentials"432msgid "Getting Launchpad Credentials"
434msgstr ""433msgstr "Hole Launchpad Zertifikate."
435434
436#: ../GroundControl/configuration.py:85 ../GroundControl/merger.py:64435#: ../GroundControl/configuration.py:85
436#: ../GroundControl/merger.py:64
437msgid "Unable to authorise launchpad account."437msgid "Unable to authorise launchpad account."
438msgstr ""438msgstr "Konnte Launchpad Account nicht autorisieren."
439439
440#. If nothing returned, then we failed to auth oauth. Worry440#. If nothing returned, then we failed to auth oauth. Worry
441#: ../GroundControl/configuration.py:171441#: ../GroundControl/configuration.py:171
442msgid "Unable to authenticate the launchpad OAuth"442msgid "Unable to authenticate the launchpad OAuth"
443msgstr ""443msgstr "Konnte Launchpad OAuth nicht authentifizieren."
444444
445#: ../GroundControl/configuration.py:239445#: ../GroundControl/configuration.py:239
446msgid "Can't login! incorrect email addr or password."446msgid "Can't login! incorrect email addr or password."
447msgstr ""447msgstr "Einloggen fehlgeschlagen Falsche E Mail Adresse oder Passwort."
448448
449#: ../GroundControl/gtkviews.py:49449#: ../GroundControl/gtkviews.py:49
450#, python-format450#, python-format
@@ -458,16 +458,16 @@
458458
459#: ../GroundControl/gtkviews.py:120459#: ../GroundControl/gtkviews.py:120
460msgid "More than one window is set Primary!"460msgid "More than one window is set Primary!"
461msgstr ""461msgstr "Mehr als ein Fenster ist primär!"
462462
463#: ../GroundControl/gtkviews.py:236463#: ../GroundControl/gtkviews.py:236
464#, python-format464#, python-format
465msgid "Child arguments aren't valid: %s"465msgid "Child arguments aren't valid: %s"
466msgstr ""466msgstr "Child Argument sind nicht gültig: %s"
467467
468#: ../GroundControl/gtkviews.py:373468#: ../GroundControl/gtkviews.py:373
469msgid "Your thread is still active."469msgid "Your thread is still active."
470msgstr ""470msgstr "Der Thread ist noch aktiv."
471471
472#: ../GroundControl/gtkviews.py:407472#: ../GroundControl/gtkviews.py:407
473#, python-format473#, python-format
@@ -477,21 +477,21 @@
477#: ../GroundControl/launchpad.py:63477#: ../GroundControl/launchpad.py:63
478#, python-format478#, python-format
479msgid "Save cache file to %s"479msgid "Save cache file to %s"
480msgstr ""480msgstr "Speicher Cache Datei in %s"
481481
482#: ../GroundControl/launchpad.py:90482#: ../GroundControl/launchpad.py:90
483#, python-format483#, python-format
484msgid "No launchpad server %s."484msgid "No launchpad server %s."
485msgstr ""485msgstr "Kein Launchpad Server %s."
486486
487#: ../GroundControl/launchpad.py:105487#: ../GroundControl/launchpad.py:105
488#, python-format488#, python-format
489msgid "Posting REQUEST to %s with %s via %s"489msgid "Posting REQUEST to %s with %s via %s"
490msgstr ""490msgstr "Poste REQUESTzu %s mit %s über %s"
491491
492#: ../GroundControl/launchpad.py:111492#: ../GroundControl/launchpad.py:111
493msgid "Unable to get launchpad auth, not logged in."493msgid "Unable to get launchpad auth, not logged in."
494msgstr ""494msgstr "Konnte Launchpad Authentifikation nicht holen, Sie sind nicht eingeloggt."
495495
496#: ../GroundControl/launchpadweb.py:177496#: ../GroundControl/launchpadweb.py:177
497msgid "Unable to generate data from content."497msgid "Unable to generate data from content."
@@ -505,7 +505,7 @@
505#: ../GroundControl/projects.py:96505#: ../GroundControl/projects.py:96
506#, python-format506#, python-format
507msgid "Can't create, project %s exists."507msgid "Can't create, project %s exists."
508msgstr ""508msgstr "Konnte Projekt %s nicht erstellen, es existiert bereits."
509509
510#: ../GroundControl/projects.py:141510#: ../GroundControl/projects.py:141
511msgid "Searching Launchpad... Please Wait"511msgid "Searching Launchpad... Please Wait"
@@ -514,3 +514,4 @@
514#: ../GroundControl/projects.py:185514#: ../GroundControl/projects.py:185
515msgid "Online Projects"515msgid "Online Projects"
516msgstr "Online verfügbare Projekte"516msgstr "Online verfügbare Projekte"
517

Subscribers

People subscribed via source and target branches

to all changes: