Skip to content

Commit

Permalink
Merge branch 'fixes/0.24' of github.com:MythTV/mythtv into jyavenard/…
Browse files Browse the repository at this point in the history 
…backports/fixes/0.24
  • Loading branch information
@jyavenard
jyavenard committed Jun 2, 2011
2 parents a546458 + 3657f31 commit d07153d
Show file tree
Hide file tree
Showing 22 changed files with 2,668 additions and 2,332 deletions.
6 changes: 4 additions & 2 deletions mythplugins/mytharchive/i18n/mytharchive_en_gb.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,8 +665,10 @@ Place a blank DVD in the drive and select an option below.</translation>
</message>
<message>
<location filename="../mytharchive/recordingselector.cpp" line="119"/>
<source>Retrieving Recording List. Please Wait...</source>
<translation>Retrieving Recording List. Please Wait...</translation>
<source>Retrieving Recording List.
Please Wait...</source>
<translation>Retrieving Recording List.
Please Wait...</translation>
</message>
<message>
<location filename="../mytharchive/recordingselector.cpp" line="143"/>
Expand Down
Binary file modified mythplugins/mythgallery/i18n/mythgallery_en_gb.qm
View file
Binary file not shown.
162 changes: 86 additions & 76 deletions mythplugins/mythgallery/i18n/mythgallery_en_gb.ts
View file

Large diffs are not rendered by default.

101 changes: 46 additions & 55 deletions mythplugins/mythgame/i18n/mythgame_en_gb.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,10 @@
</message>
<message>
<location filename="../mythgame/gameui.cpp" line="587"/>
<location filename="../mythgame/gameui.cpp" line="651"/>
<source>Edit Details</source>
<translation>Edit Details</translation>
</message>
<message>
<location filename="../mythgame/gameui.cpp" line="651"/>
<source>Edit Metadata</source>
<translation>Edit Metadata</translation>
</message>
<message>
<location filename="../mythgame/gameui.cpp" line="1053"/>
<source>Fetching details for %1</source>
Expand All @@ -92,27 +88,27 @@
<context>
<name>MythControls</name>
<message>
<location filename="../mythgame/main.cpp" line="94"/>
<location filename="../mythgame/main.cpp" line="112"/>
<source>Game frontend</source>
<translation>Game frontend</translation>
</message>
<message>
<location filename="../mythgame/main.cpp" line="97"/>
<location filename="../mythgame/main.cpp" line="115"/>
<source>Toggle the current game as a favorite</source>
<translation>Toggle the current game as a favourite</translation>
</message>
<message>
<location filename="../mythgame/main.cpp" line="99"/>
<location filename="../mythgame/main.cpp" line="117"/>
<source>Show incremental search dialog</source>
<translation>Show incremental search dialog</translation>
</message>
<message>
<location filename="../mythgame/main.cpp" line="101"/>
<location filename="../mythgame/main.cpp" line="119"/>
<source>Incremental search find next match</source>
<translation>Incremental search find next match</translation>
</message>
<message>
<location filename="../mythgame/main.cpp" line="103"/>
<location filename="../mythgame/main.cpp" line="121"/>
<source>Download metadata for current item</source>
<translation>Download metadata for current item</translation>
</message>
Expand Down Expand Up @@ -158,83 +154,83 @@
<context>
<name>QObject</name>
<message>
<location filename="../mythgame/gamehandler.cpp" line="158"/>
<location filename="../mythgame/gamehandler.cpp" line="427"/>
<location filename="../mythgame/gamehandler.cpp" line="159"/>
<location filename="../mythgame/gamehandler.cpp" line="428"/>
<source>19xx</source>
<translation>19xx</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="159"/>
<location filename="../mythgame/gamehandler.cpp" line="160"/>
<location filename="../mythgame/gamehandler.cpp" line="161"/>
<location filename="../mythgame/gamehandler.cpp" line="162"/>
<location filename="../mythgame/gamehandler.cpp" line="163"/>
<location filename="../mythgame/gamehandler.cpp" line="424"/>
<location filename="../mythgame/gamehandler.cpp" line="164"/>
<location filename="../mythgame/gamehandler.cpp" line="425"/>
<location filename="../mythgame/gamehandler.cpp" line="428"/>
<location filename="../mythgame/gamehandler.cpp" line="426"/>
<location filename="../mythgame/gamehandler.cpp" line="429"/>
<location filename="../mythgame/gamehandler.cpp" line="430"/>
<location filename="../mythgame/gamehandler.cpp" line="436"/>
<location filename="../mythgame/gamehandler.cpp" line="431"/>
<location filename="../mythgame/gamehandler.cpp" line="437"/>
<source>Unknown</source>
<translation>Unknown</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="164"/>
<location filename="../mythgame/gamehandler.cpp" line="431"/>
<location filename="../mythgame/gamehandler.cpp" line="165"/>
<location filename="../mythgame/gamehandler.cpp" line="432"/>
<source>0</source>
<translation>0</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="225"/>
<location filename="../mythgame/gamehandler.cpp" line="607"/>
<location filename="../mythgame/gamehandler.cpp" line="226"/>
<location filename="../mythgame/gamehandler.cpp" line="608"/>
<source>No</source>
<translation>No</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="226"/>
<location filename="../mythgame/gamehandler.cpp" line="227"/>
<source>No to all</source>
<translation>No to all</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="227"/>
<location filename="../mythgame/gamehandler.cpp" line="608"/>
<location filename="../mythgame/gamehandler.cpp" line="228"/>
<location filename="../mythgame/gamehandler.cpp" line="609"/>
<source>Yes</source>
<translation>Yes</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="228"/>
<location filename="../mythgame/gamehandler.cpp" line="229"/>
<source>Yes to all</source>
<translation>Yes to all</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="233"/>
<location filename="../mythgame/gamehandler.cpp" line="234"/>
<source>File Missing</source>
<translation>File Missing</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="234"/>
<location filename="../mythgame/gamehandler.cpp" line="235"/>
<source>%1 appears to be missing.
Remove it from the database?</source>
<translation>%1 appears to be missing.
Remove it from the database?</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="398"/>
<location filename="../mythgame/gamehandler.cpp" line="399"/>
<source>Updating %1(%2) ROM database</source>
<translation>Updating %1(%2) ROM database</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="516"/>
<location filename="../mythgame/gamehandler.cpp" line="517"/>
<source>Verifying %1 files</source>
<translation>Verifying %1 files</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="612"/>
<location filename="../mythgame/gamehandler.cpp" line="613"/>
<source>Are you sure?</source>
<translation>Are you sure?</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="613"/>
<location filename="../mythgame/gamehandler.cpp" line="614"/>
<source>This will clear all Game Meta Data
from the database. Are you sure you
want to do this?</source>
Expand All @@ -243,7 +239,7 @@ from the database. Are you sure you
want to do this?</translation>
</message>
<message>
<location filename="../mythgame/gamehandler.cpp" line="719"/>
<location filename="../mythgame/gamehandler.cpp" line="720"/>
<source>Scanning for %1 game(s)...</source>
<translation>Scanning for %1 game(s)...</translation>
</message>
Expand Down Expand Up @@ -632,106 +628,101 @@ want to do this?</translation>
</message>
<message>
<location filename="themestrings.h" line="31"/>
<source>Video Manager</source>
<translation>Video Manager</translation>
</message>
<message>
<location filename="themestrings.h" line="32"/>
<source>Game Information</source>
<translation>Game Information</translation>
</message>
<message>
<location filename="themestrings.h" line="33"/>
<location filename="themestrings.h" line="32"/>
<source>Game:</source>
<translation>Game:</translation>
</message>
<message>
<location filename="themestrings.h" line="34"/>
<location filename="themestrings.h" line="33"/>
<source>Type:</source>
<translation>Type:</translation>
</message>
<message>
<location filename="themestrings.h" line="35"/>
<location filename="themestrings.h" line="34"/>
<source>Filename:</source>
<translation>Filename:</translation>
</message>
<message>
<location filename="themestrings.h" line="36"/>
<location filename="themestrings.h" line="35"/>
<source>Rompath:</source>
<translation>ROM Path:</translation>
</message>
<message>
<location filename="themestrings.h" line="37"/>
<location filename="themestrings.h" line="36"/>
<source>System(s):</source>
<translation>System(s):</translation>
</message>
<message>
<location filename="themestrings.h" line="38"/>
<location filename="themestrings.h" line="37"/>
<source>CRC:</source>
<translation>CRC:</translation>
</message>
<message>
<location filename="themestrings.h" line="39"/>
<location filename="themestrings.h" line="38"/>
<source>Edit Game Information</source>
<translation>Edit Game Information</translation>
</message>
<message>
<location filename="themestrings.h" line="40"/>
<location filename="themestrings.h" line="39"/>
<source>Game Name:</source>
<translation>Game Name:</translation>
</message>
<message>
<location filename="themestrings.h" line="41"/>
<location filename="themestrings.h" line="40"/>
<source>Description:</source>
<translation>Description:</translation>
</message>
<message>
<location filename="themestrings.h" line="42"/>
<location filename="themestrings.h" line="41"/>
<source>Boxart:</source>
<translation>Boxart:</translation>
</message>
<message>
<location filename="themestrings.h" line="43"/>
<location filename="themestrings.h" line="42"/>
<source>No Plot.</source>
<translation>No Plot.</translation>
</message>
<message>
<location filename="themestrings.h" line="44"/>
<location filename="themestrings.h" line="43"/>
<source>General Settings</source>
<translation>General Settings</translation>
</message>
<message>
<location filename="themestrings.h" line="45"/>
<location filename="themestrings.h" line="44"/>
<source>Game folders and general options</source>
<translation>Game folders and general options</translation>
</message>
<message>
<location filename="themestrings.h" line="46"/>
<location filename="themestrings.h" line="45"/>
<source>Game Players</source>
<translation>Game Players</translation>
</message>
<message>
<location filename="themestrings.h" line="47"/>
<location filename="themestrings.h" line="46"/>
<source>Configure an emulator</source>
<translation>Configure an emulator</translation>
</message>
<message>
<location filename="themestrings.h" line="48"/>
<location filename="themestrings.h" line="47"/>
<source>Scan for Games</source>
<translation>Scan for Games</translation>
</message>
<message>
<location filename="themestrings.h" line="49"/>
<location filename="themestrings.h" line="48"/>
<source>Add games to your library</source>
<translation>Add games to your library</translation>
</message>
<message>
<location filename="themestrings.h" line="50"/>
<location filename="themestrings.h" line="49"/>
<source>Clear Game Data</source>
<translation>Clear Game Data</translation>
</message>
<message>
<location filename="themestrings.h" line="51"/>
<location filename="themestrings.h" line="50"/>
<source>Empty your game library</source>
<translation>Empty your game library</translation>
</message>
Expand Down

0 comments on commit d07153d

Please sign in to comment.