[mythtv] Re: [PATCH] mythtv: i18n/minor code change 2nd try

Stefan Frank sfr+lists at 6913304088794.gnuu.de
Mon Dec 15 20:01:26 EST 2003


Hi,

here's an updated version of the patches. Note that running lupdate
before applying my changes added a new entry in the mythfrontend_*.ts files
at line 2533 (for de). My .ts patch assumes this entry is existing.

After applying the mythfrontend_status.diff patch lupdate must be run
again before applying the mythfrontend_de.ts.diff patch.


Bye, Stefan

-- 
Scientists are people who build the Brooklyn Bridge and then buy it.
		-- William Buckley
-------------- next part --------------
--- mythtv/i18n/mythfrontend_de.ts	2003-12-16 01:42:07.000000000 +0100
+++ mythtv-local/i18n/mythfrontend_de.ts	2003-12-16 01:19:44.000000000 +0100
@@ -297,7 +297,7 @@
     </message>
     <message>
         <source>Yes; allow re-recording</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja, wieder aufnehmen</translation>
     </message>
 </context>
 <context>
@@ -382,31 +382,31 @@
     <name>ProgramRecPriority</name>
     <message>
         <source>Recording just this showing</source>
-        <translation type="unfinished">Nehme diese Ausstrahlung auf</translation>
+        <translation>Nehme diese Ausstrahlung auf</translation>
     </message>
     <message>
         <source>Recording every week</source>
-        <translation type="unfinished">Nehme wöchentlich auf</translation>
+        <translation>Nehme wöchentlich auf</translation>
     </message>
     <message>
         <source>Recording when shown in this timeslot</source>
-        <translation type="unfinished">Nehme zu dieser Zeit auf</translation>
+        <translation>Nehme zu dieser Zeit auf</translation>
     </message>
     <message>
         <source>Recording when shown on this channel</source>
-        <translation type="unfinished">Nehme auf diesem Sender auf</translation>
+        <translation>Nehme auf diesem Sender auf</translation>
     </message>
     <message>
         <source>Recording all showings</source>
-        <translation type="unfinished">Nehme alle Ausstrahlungen auf</translation>
+        <translation>Nehme alle Ausstrahlungen auf</translation>
     </message>
     <message>
         <source>Not recording this showing</source>
-        <translation type="unfinished">Wird nicht aufgenommen</translation>
+        <translation>Wird nicht aufgenommen</translation>
     </message>
     <message>
         <source>Error!</source>
-        <translation type="unfinished">Fehler!</translation>
+        <translation>Fehler!</translation>
     </message>
 </context>
 <context>
@@ -1894,7 +1894,7 @@
     </message>
     <message>
         <source>Notify, but do not skip</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur Hinweisen</translation>
     </message>
     <message>
         <source>Automatically Skip</source>
@@ -1902,7 +1902,7 @@
     </message>
     <message>
         <source>Automatically skip commercial breaks that have been flagged during Automatic Commercial Flagging or by the mythcommflag program, or just notify that a commercial has been detected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erkannte Werbung automatisch Ã?berspringen, oder nur darauf hinweisen.</translation>
     </message>
     <message>
         <source>UDP Notify Port</source>
@@ -1938,31 +1938,31 @@
     </message>
     <message>
         <source>Recording on cardid: </source>
-        <translation type="unfinished"></translation>
+        <translation>Benutze Tuner (cardid):</translation>
     </message>
     <message>
         <source>Not Recording: </source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Aufnahme:</translation>
     </message>
     <message>
         <source>Manual Override</source>
-        <translation type="unfinished"></translation>
+        <translation>Ãœberstimmt</translation>
     </message>
     <message>
         <source>Previously Recorded</source>
-        <translation type="unfinished"></translation>
+        <translation>Schon aufgenommen</translation>
     </message>
     <message>
         <source>Currently Recording</source>
-        <translation type="unfinished"></translation>
+        <translation>Momentan aufnehmen</translation>
     </message>
     <message>
         <source>Other Showing</source>
-        <translation type="unfinished"></translation>
+        <translation>Andere Ausstrahlung</translation>
     </message>
     <message>
         <source>Too Many Recordings</source>
-        <translation type="unfinished"></translation>
+        <translation>Zu viele Aufnahmen</translation>
     </message>
     <message>
         <source>Don&apos;t Record List</source>
@@ -1982,15 +1982,15 @@
     </message>
     <message>
         <source>Overlap</source>
-        <translation type="unfinished"></translation>
+        <translation>Ãœberschneidung</translation>
     </message>
     <message>
         <source>Reason Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Ursache unbekannt</translation>
     </message>
     <message>
         <source>Repeat</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiederholung</translation>
     </message>
     <message>
         <source>R</source>
@@ -2018,83 +2018,83 @@
     </message>
     <message>
         <source>Single Recording</source>
-        <translation type="unfinished"></translation>
+        <translation>Einmalig</translation>
     </message>
     <message>
         <source>Daily Recording</source>
-        <translation type="unfinished"></translation>
+        <translation>TÃ?glich</translation>
     </message>
     <message>
         <source>Weekly Recording</source>
-        <translation type="unfinished">Wöchentliche Aufnahme</translation>
+        <translation>Wöchentlich</translation>
     </message>
     <message>
         <source>Conflicting</source>
-        <translation type="unfinished"></translation>
+        <translation>Konflikt</translation>
     </message>
     <message>
         <source>Will Record</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufnehmen</translation>
     </message>
     <message>
         <source>Won&apos;t Record</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Aufnahme</translation>
     </message>
     <message>
         <source>Don&apos;t record it</source>
-        <translation type="unfinished">Nicht aufnehmen</translation>
+        <translation>Nicht aufnehmen</translation>
     </message>
     <message>
         <source>Never record this episode</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Folge niemals aufnehmen</translation>
     </message>
     <message>
         <source>Record it anyway</source>
-        <translation type="unfinished">Dennoch aufnehmen</translation>
+        <translation>Dennoch aufnehmen</translation>
     </message>
     <message>
         <source>The following scheduled recordings conflict with each other.  Which would you like to record?</source>
-        <translation type="unfinished"></translation>
+        <translation>Die folgenden geplanten Aufnahmen �berlappen sich. Welche davon möchten Sie aufnehmen?</translation>
     </message>
     <message>
         <source>Remember this choice and use it automatically in the future</source>
-        <translation type="unfinished">Diese Auswahl fÃ?r die Zukunft merken</translation>
+        <translation>Diese Auswahl fÃ?r die Zukunft merken</translation>
     </message>
     <message>
         <source>Priority</source>
-        <translation type="unfinished"></translation>
+        <translation>PrioritÃ?t</translation>
     </message>
     <message>
         <source>Enable AC3 to SPDIF passthrough</source>
-        <translation type="unfinished"></translation>
+        <translation>AC3 nach SPDIF durchschleifen</translation>
     </message>
     <message>
         <source>Enable sending AC3 sound directly to your sound card&apos;s SPDIF output, on sources which contain AC3 soundtracks (usually digital TV).  Requires that the audio output device be set to something suitable.</source>
-        <translation type="unfinished"></translation>
+        <translation>AC3 Audio am SPDIF Ausgang der Soundkarte bereitstellen. Dies funktioniert nur falls eine AC3 Tonspur verf�gbar ist (wie beim Digitalfernsehen). Ihre Soundkarte muß daf�r richtig konfiguriert sein.</translation>
     </message>
     <message>
         <source>PIP Video Location</source>
-        <translation type="unfinished"></translation>
+        <translation>PIP Position</translation>
     </message>
     <message>
         <source>Top Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Oben links</translation>
     </message>
     <message>
         <source>Bottom Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Unten links</translation>
     </message>
     <message>
         <source>Top Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Oben rechts</translation>
     </message>
     <message>
         <source>Bottom Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Unten rechts</translation>
     </message>
     <message>
         <source>Location of PIP Video window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Position fÃ?r das PIP Fenster (Bild im Bild, verfÃ?gbar bei zwei Tunerkarten).</translation>
     </message>
     <message>
         <source>Reverse direction in fast forward/rewind</source>
@@ -2106,7 +2106,7 @@
     </message>
     <message>
         <source>Use Recording Priorities</source>
-        <translation type="unfinished"></translation>
+        <translation>AufnahmeprioritÃ?ten verwenden</translation>
     </message>
     <message>
         <source>Use program recording priorities to resolve conflicts.</source>
@@ -2166,7 +2166,51 @@
     </message>
     <message>
         <source>Yes, Exit and Shutdown</source>
-        <translation type="unfinished"></translation>
+        <translation>Verlassen und den Rechner anhalten</translation>
+    </message>
+    <message>
+        <source>Myth version:</source>
+        <translation>Myth Version:</translation>
+    </message>
+    <message>
+        <source>Last mythfilldatabase guide update:</source>
+        <translation>Letzte Aktualisierung des TV Programms:</translation>
+    </message>
+    <message>
+        <source>Started:   </source>
+        <translation>Gestartet: </translation>
+    </message>
+    <message>
+        <source>Finished: </source>
+        <translation>Beendet: </translation>
+    </message>
+    <message>
+        <source>Result: </source>
+        <translation>Status: </translation>
+    </message>
+    <message>
+        <source>There&apos;s no guide data available! </source>
+        <translation>Keine Programminformationen verfÃ?gbar!</translation>
+    </message>
+    <message>
+        <source>Have you run mythfilldatabase?</source>
+        <translation>Haben Sie mythfilldatabase gestartet?</translation>
+    </message>
+    <message>
+        <source>There is guide data until </source>
+        <translation>Letzter Eintrag fÃ?r </translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>Tage</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>Tag</translation>
+    </message>
+    <message>
+        <source>WARNING: is mythfilldatabase running?</source>
+        <translation>WARNUNG: lÃ?uft mythfilldatabase?</translation>
     </message>
 </context>
 <context>
@@ -2533,7 +2577,7 @@
     </message>
     <message>
         <source>Color %1 %</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe %1 %</translation>
     </message>
 </context>
 <context>
-------------- next part --------------
--- mythtv/programs/mythfrontend/main.cpp	2003-12-15 23:48:15.000000000 +0100
+++ mythtv-local/programs/mythfrontend/main.cpp	2003-12-16 00:30:40.000000000 +0100
@@ -228,44 +228,55 @@
     mfdLastRunEnd = gContext->GetSetting("mythfilldatabaseLastRunEnd");
     mfdLastRunStatus = gContext->GetSetting("mythfilldatabaseLastRunStatus");
 
-    Status = QString("Myth version: ") + MYTH_BINARY_VERSION;
+    Status = QObject::tr("Myth version:") + " " + MYTH_BINARY_VERSION;
 
-    Status += "\nLast mythfilldatabase guide update:";
-    Status += "\n   Started:   ";
+    Status = QObject::tr("Last mythfilldatabase guide update:");
+    Status += "\n   ";
+    Status += QObject::tr("Started:   ");
     Status += mfdLastRunStart;
     if (mfdLastRunEnd > mfdLastRunStart)  //if end < start, it's still running.
     {
-       Status += "\n   Finished: ";
-       Status += mfdLastRunEnd;
+        Status += "\n   ";
+        Status += QObject::tr("Finished: ");
+        Status += mfdLastRunEnd;
     }
 
-    Status += "\n   Result: ";
+    Status += "\n   ";
+    Status += QObject::tr("Result: ");
     Status += mfdLastRunStatus;
 
     DaysOfData = qdtNow.daysTo(GuideDataThrough);
 
-    if (!GuideDataThrough.isNull())
+    if (GuideDataThrough.isNull())
     {
-        Status += "\n\nThere's guide data until ";
+        Status += QObject::tr("There's no guide data available! ");
+        Status += QObject::tr("Have you run mythfilldatabase?");
+        Status += "\n";
+    }
+    else
+    {
+        Status += "\n\n";
+        Status += QObject::tr("There is guide data until ");
         Status += QDateTime(GuideDataThrough).toString("yyyy-MM-dd hh:mm");
 
         if (DaysOfData > 0)
         {
-            Status += QString("\n(%1 day").arg(DaysOfData);
-            Status += (DaysOfData == 1 ? "" : "s" );
+            Status += QString("\n(%1 ").arg(DaysOfData);
+            if (DaysOfData >1)
+                Status += QObject::tr("days");
+            else
+                Status += QObject::tr("day");
             Status += ").";
         }
         else
             Status += ".";
     }
-    else
-    {
-        Status += "There's no guide data available! ";
-        Status += "Have you run mythfilldatabase?\n";
-    }
 
     if (DaysOfData <= 3)
-       Status += "\nWARNING: is mythfilldatabase running?";
+    {
+        Status += "\n";
+        Status += QObject::tr("WARNING: is mythfilldatabase running?");
+    }
 
     DialogBox *status_dialog = new DialogBox(gContext->GetMainWindow(), Status);
     status_dialog->AddButton(QObject::tr("OK"));


More information about the mythtv-dev mailing list