Consistency updates/corrections for source translation strings

[Nick Morrott <knowledgejunkie (at) gmail (dot) com>]

In order to collect the bonus points on offer from Robert M (see #8412), the attached patch corrects or makes consistent many translatable strings in the source code. Changes include capitlisations, ellipses, and word changes in a bid to make the 'feel' of the strings consistent across the whole MythTV application.

The patch is against trunk @ r24383.

I have not really touched "DataDirect?"/"Data Direct" strings that I encountered, as I am not sure of their status. Should they be blanket updated to refer to Schedules Direct instead?

As the patch updates the translatable strings, this will require translators to update their localised translations if/when this patch is applied.

[Nick Morrott <knowledgejunkie (at) gmail (dot) com>]

Updates to translatable strings in source code

[Jonathan Martens <jonathan@…>]

Nice work, but after a quick view there are still some inconsistencies. For some units between brackets you do use 'in' as a prefix where you removed them for others, e.g.:

@@ -80,7 +80,7 @@
                        "(" + QObject::tr("default") + ")"),
         PlayGroupDBStorage(this, _parent, "jump")
     {
-        setLabel(QObject::tr("Jump amount (in minutes)"));
+        setLabel(QObject::tr("Jump amount (minutes)"));
         setHelpText(QObject::tr("How many minutes to jump forward or backward "
                     "when the jump keys are pressed."));
     };

compared to

@@ -303,7 +304,7 @@
         setLabel(QObject::tr("Frequency")+" "+QObject::tr("or")+" "+
                  QObject::tr("Channel"));
         setHelpText(QObject::tr(
-                        "Specify either the exact frequency in kHz or "
+                        "Specify either the exact frequency (in kHz) or "
                         "a valid channel for your 'TV Format'."));
     }
 };

As well as using abbreviated units:

@@ -992,7 +992,7 @@
         SpinBoxSetting(this, min_val, 60000, 250),
         CaptureCardDBStorage(this, parent, "signal_timeout")
     {
-        setLabel(QObject::tr("Signal Timeout (msec)"));
+        setLabel(QObject::tr("Signal Timeout (ms)"));
         setValue(value);
         setHelpText(QObject::tr(
                         "Maximum time MythTV waits for any signal when "

or full out written ones:

@@ -80,7 +80,7 @@
                        "(" + QObject::tr("default") + ")"),
         PlayGroupDBStorage(this, _parent, "jump")
     {
-        setLabel(QObject::tr("Jump amount (in minutes)"));
+        setLabel(QObject::tr("Jump amount (minutes)"));
         setHelpText(QObject::tr("How many minutes to jump forward or backward "
                     "when the jump keys are pressed."));
     };

[Nick Morrott <knowledgejunkie (at) gmail (dot) com>]

Replying to Jonathan Martens <jonathan@…>:

Nice work, but after a quick view there are still some inconsistencies. For some units between brackets you do use 'in' as a prefix where you removed them for others, e.g.:

@@ -80,7 +80,7 @@
                        "(" + QObject::tr("default") + ")"),
         PlayGroupDBStorage(this, _parent, "jump")
     {
-        setLabel(QObject::tr("Jump amount (in minutes)"));
+        setLabel(QObject::tr("Jump amount (minutes)"));
         setHelpText(QObject::tr("How many minutes to jump forward or backward "
                     "when the jump keys are pressed."));
     };

compared to

@@ -303,7 +304,7 @@
         setLabel(QObject::tr("Frequency")+" "+QObject::tr("or")+" "+
                  QObject::tr("Channel"));
         setHelpText(QObject::tr(
-                        "Specify either the exact frequency in kHz or "
+                        "Specify either the exact frequency (in kHz) or "
                         "a valid channel for your 'TV Format'."));
     }
 };

Jonathan,

Thanks for the quick feedback. I thought I had caught all of those, the intention was to remove all (in ...) variants and just have the units in the parens.

As well as using abbreviated units:

@@ -992,7 +992,7 @@
         SpinBoxSetting(this, min_val, 60000, 250),
         CaptureCardDBStorage(this, parent, "signal_timeout")
     {
-        setLabel(QObject::tr("Signal Timeout (msec)"));
+        setLabel(QObject::tr("Signal Timeout (ms)"));
         setValue(value);
         setHelpText(QObject::tr(
                         "Maximum time MythTV waits for any signal when "

or full out written ones:

@@ -80,7 +80,7 @@
                        "(" + QObject::tr("default") + ")"),
         PlayGroupDBStorage(this, _parent, "jump")
     {
-        setLabel(QObject::tr("Jump amount (in minutes)"));
+        setLabel(QObject::tr("Jump amount (minutes)"));
         setHelpText(QObject::tr("How many minutes to jump forward or backward "
                     "when the jump keys are pressed."));
     };

The only abbreviated units that I intended to leave in were for milliseconds and for frequencies. I guess that does make it less consistent, but this can easily be rectified if required. I think things are consistent on a per-unit basis.

If a dev could provide their input (such as the preferred style to use in the label text vs help text), I/we can improve it from here to further improve consistency.

[Nicolas Riendeau <knight@…>]

Hi,

Nice work but you should not directly update the themestrings.h files as their content is extracted from the theme files and any update you do to these files (themestrings.h) , if not modified in the theme files themselves, will get overwritten the next time themestringtool/themestrings is run.

Have a nice day!

Nick

[sphery]

Nick M., thanks for the patch. Could you please make the changes that Nick R. mentioned above and at ​http://www.gossamer-threads.com/lists/mythtv/dev/438914#438914 . Also, I think I may have broken some of the hunks with the consistency changes I made to setup strings in ​http://svn.mythtv.org/trac/changeset/25039 (feel free to follow some of the guidelines I set there, too).

Don't worry--we'll still award you the original bonus points for the first effort. After the updates, we'll give you 3 extra bonus points.

[Nick Morrott <knowledgejunkie (at) gmail (dot) com>]

Updated consistency changes

[Nick Morrott <knowledgejunkie (at) gmail (dot) com>]

I've just added an updated set of consistency changes, taking into account Nicolas' themes request and the broken hunks arising due to Mike's setup updates.

I replaced the single ellipsis character with the "..." string to make it consistent with all others in the source. If it is decided to replace all 3-period strings with the UTF-8 ellipsis character, this can be done en masse in another patch. If you want to keep the solitary ellipsis, please remove it from the diff.

[Robert Kulagowski]

Why did you delete the "Please Wait"?

Index: mythtv/themes/themestrings.h
===================================================================
--- mythtv/themes/themestrings.h        (revision 25149)
+++ mythtv/themes/themestrings.h        (working copy)
@@ -178,15 +178,14 @@
     ThemeUI::tr("Welcome to MythTV");
     ThemeUI::tr("MythTV is idle and will shut down shortly.");
     ThemeUI::tr("Current Recording(s):");
-    ThemeUI::tr("Retrieving Recording Status ...");
+    ThemeUI::tr("Retrieving Recording Status...");
     ThemeUI::tr("Next Scheduled Recording(s):");
-    ThemeUI::tr("Retrieving Scheduled Recordings ...");
+    ThemeUI::tr("Retrieving Scheduled Recordings...");
     ThemeUI::tr("WARNING: There are conflicting scheduled recordings!");
     ThemeUI::tr("Move the selected arrow to the corner of the TV screen.  Press SELECT to edit the other arrow.  Press MENU for options and ESC to quit.");
     ThemeUI::tr("1280 x 720");
     ThemeUI::tr("0 x 0");
     ThemeUI::tr("Filename");
-    ThemeUI::tr("Please Wait....");
     ThemeUI::tr("Select an Icon");
     ThemeUI::tr("Icon Download Status...");

[sphery]

In theory, there shouldn't be any 4-period version of "Please Wait..." after his changes. (Note that I haven't done a grep to verify.)

[sphery]

In [25354]:

Apply consistency changes.

Closes 8524.

(was missing #, so copying here manually)