[mythtvfr_traduction] [170] Gilles essaie avec ceci et supprime le du SVN par la suite ( ai-je acces au ftp?)

[ Thread Index | Date Index | More lists.tuxfamily.org/mythtvfr_traduction Archives ]


Revision: 170
Author:   knight
Date:     2010-02-10 00:56:30 +0100 (Wed, 10 Feb 2010)
Log Message:
-----------
Gilles essaie avec ceci et supprime le du SVN par la suite (ai-je acces au ftp?)

Added Paths:
-----------
    trunk/fr_FR/diffs/
    trunk/fr_FR/diffs/balance_des_themestrings.diff
    trunk/fr_FR/diffs/fr_temp_combinee_avec_themestrings.diff
    trunk/fr_FR/diffs/patch_fr_temp_combinee.diff

Added: trunk/fr_FR/diffs/balance_des_themestrings.diff
===================================================================
--- trunk/fr_FR/diffs/balance_des_themestrings.diff	                        (rev 0)
+++ trunk/fr_FR/diffs/balance_des_themestrings.diff	2010-02-09 23:56:30 UTC (rev 170)
@@ -0,0 +1,728 @@
+Index: mythplugins/mythmusic/i18n/themestrings.h
+===================================================================
+--- mythplugins/mythmusic/i18n/themestrings.h	(revision 23485)
++++ mythplugins/mythmusic/i18n/themestrings.h	(working copy)
+@@ -45,8 +45,11 @@
+     ThemeUI::tr("Copy");
+     ThemeUI::tr("Please Wait ...");
+     ThemeUI::tr("General Settings");
++    ThemeUI::tr("Music folders and general options");
+     ThemeUI::tr("Player Settings");
++    ThemeUI::tr("Music playback options");
+     ThemeUI::tr("Ripper Settings");
++    ThemeUI::tr("CD copying options");
+     ThemeUI::tr("Play Music");
+     ThemeUI::tr("Select Music");
+     ThemeUI::tr("Import CD");
+Index: mythplugins/mytharchive/i18n/themestrings.h
+===================================================================
+--- mythplugins/mytharchive/i18n/themestrings.h	(revision 23485)
++++ mythplugins/mytharchive/i18n/themestrings.h	(working copy)
+@@ -5,14 +5,21 @@
+     ThemeUI::tr("A extended play profile giving approx. 6 hour of video on a single layer DVD");
+     ThemeUI::tr("Select Destination");
+     ThemeUI::tr("description goes here.");
++    ThemeUI::tr("Find");
+     ThemeUI::tr("Free Space:");
+     ThemeUI::tr("0.00Gb");
+     ThemeUI::tr("Make ISO Image");
+     ThemeUI::tr("Burn to DVD");
+     ThemeUI::tr("Force Overwrite of DVD-RW Media");
++    ThemeUI::tr("Cancel");
++    ThemeUI::tr("Prev");
++    ThemeUI::tr("Next");
+     ThemeUI::tr("Select Recordings");
+     ThemeUI::tr("Show Recordings");
++    ThemeUI::tr("OK");
+     ThemeUI::tr("File Finder");
++    ThemeUI::tr("Back");
++    ThemeUI::tr("Home");
+     ThemeUI::tr("Select Videos");
+     ThemeUI::tr("Video Category");
+     ThemeUI::tr("title goes here");
+@@ -21,6 +28,8 @@
+     ThemeUI::tr("1");
+     ThemeUI::tr("No videos available");
+     ThemeUI::tr("Log Viewer");
++    ThemeUI::tr("Update");
++    ThemeUI::tr("Exit");
+     ThemeUI::tr("Change Encoding Profile");
+     ThemeUI::tr("12.34GB");
+     ThemeUI::tr("DVD Menu Theme");
+@@ -31,6 +40,9 @@
+     ThemeUI::tr("Details");
+     ThemeUI::tr("Select Archive Items");
+     ThemeUI::tr("No files are selected for archive");
++    ThemeUI::tr("Add Recording");
++    ThemeUI::tr("Add Video");
++    ThemeUI::tr("Add File");
+     ThemeUI::tr("xxxxx mb");
+     ThemeUI::tr("0 mb");
+     ThemeUI::tr("Archive Item Details");
+@@ -44,6 +56,7 @@
+     ThemeUI::tr("0:00:00.00");
+     ThemeUI::tr("Seek Amount");
+     ThemeUI::tr("Frame");
++    ThemeUI::tr("Save");
+     ThemeUI::tr("sep 13, 2004 11:00 pm (1h 15m)");
+     ThemeUI::tr("File Finder To Import");
+     ThemeUI::tr("Start Time:");
+@@ -54,6 +67,11 @@
+     ThemeUI::tr("Callsign:");
+     ThemeUI::tr("Name:");
+     ThemeUI::tr("Local Channel");
++    ThemeUI::tr("Search Channel");
++    ThemeUI::tr("Search Callsign");
++    ThemeUI::tr("Search Name");
++    ThemeUI::tr("Finish");
++    ThemeUI::tr("Add video");
+     ThemeUI::tr("Create DVD");
+     ThemeUI::tr("Create Archive");
+     ThemeUI::tr("Encode Video File");
+Index: mythplugins/mythweather/i18n/themestrings.h
+===================================================================
+--- mythplugins/mythweather/i18n/themestrings.h	(revision 23485)
++++ mythplugins/mythweather/i18n/themestrings.h	(working copy)
+@@ -20,4 +20,9 @@
+     ThemeUI::tr("Location Search");
+     ThemeUI::tr("Enter your current location, nearest large town or city. In some countries postal codes are also supported.");
+     ThemeUI::tr("Enter Location:");
++    ThemeUI::tr("General weather plugin options");
++    ThemeUI::tr("Screen Settings");
++    ThemeUI::tr("Choose which weather forecasts to display");
++    ThemeUI::tr("Source Settings");
++    ThemeUI::tr("Configure the behavior of weather scripts");
+ }
+Index: mythplugins/mythvideo/i18n/themestrings.h
+===================================================================
+--- mythplugins/mythvideo/i18n/themestrings.h	(revision 23485)
++++ mythplugins/mythvideo/i18n/themestrings.h	(working copy)
+@@ -18,6 +18,7 @@
+     ThemeUI::tr("Runtime:");
+     ThemeUI::tr("Done");
+     ThemeUI::tr("Play");
++    ThemeUI::tr("No videos in library, or no files found.  If you have configured a video directory, press \"M\" (or the MENU key) and select \"Scan for Changes.\"");
+     ThemeUI::tr("Director:");
+     ThemeUI::tr("Rated:");
+     ThemeUI::tr("Parental Level:");
+@@ -40,6 +41,8 @@
+     ThemeUI::tr("Command:");
+     ThemeUI::tr("Use default player:");
+     ThemeUI::tr("Ignore:");
++    ThemeUI::tr("New");
++    ThemeUI::tr("Delete");
+     ThemeUI::tr("Edit Video Information");
+     ThemeUI::tr("Title:");
+     ThemeUI::tr("Subtitle:");
+@@ -73,10 +76,31 @@
+     ThemeUI::tr("Watched :");
+     ThemeUI::tr("Result");
+     ThemeUI::tr("Save as default");
++    ThemeUI::tr("Player Settings");
++    ThemeUI::tr("Default Player:");
++    ThemeUI::tr("DVD Player:");
++    ThemeUI::tr("DVD Drive:");
++    ThemeUI::tr("VCD Player:");
++    ThemeUI::tr("VCD Drive:");
++    ThemeUI::tr("Enable Alternate Player:");
++    ThemeUI::tr("Alternate Player:");
++    ThemeUI::tr("Cancel");
++    ThemeUI::tr("Video Metadata Settings");
++    ThemeUI::tr("Movie Grabber:");
++    ThemeUI::tr("TV Grabber:");
++    ThemeUI::tr("Enable Random Trailer Playback");
++    ThemeUI::tr("Display unknown file types");
++    ThemeUI::tr("Enable metadata in file browse mode");
++    ThemeUI::tr("Trailers to Play:");
+     ThemeUI::tr("General Settings");
+-    ThemeUI::tr("Player Settings");
++    ThemeUI::tr("File Paths and general options");
++    ThemeUI::tr("Player Applications and DVD/VCD Drives");
++    ThemeUI::tr("Metadata Settings");
++    ThemeUI::tr("Grabber Setup and display preferences");
+     ThemeUI::tr("File Types");
++    ThemeUI::tr("Associate new file extensions");
+     ThemeUI::tr("Rip Settings");
++    ThemeUI::tr("DVD Rip and Transcode options");
+     ThemeUI::tr("Browse Videos");
+     ThemeUI::tr("Video List");
+     ThemeUI::tr("Video Gallery");
+Index: mythplugins/mythgame/i18n/themestrings.h
+===================================================================
+--- mythplugins/mythgame/i18n/themestrings.h	(revision 23485)
++++ mythplugins/mythgame/i18n/themestrings.h	(working copy)
+@@ -26,7 +26,11 @@
+     ThemeUI::tr("Play");
+     ThemeUI::tr("Game Information");
+     ThemeUI::tr("General Settings");
++    ThemeUI::tr("Game folders and general options");
+     ThemeUI::tr("Game Players");
++    ThemeUI::tr("Configure an emulator");
+     ThemeUI::tr("Scan for Games");
++    ThemeUI::tr("Add games to your library");
+     ThemeUI::tr("Clear Game Data");
++    ThemeUI::tr("Empty your game library");
+ }
+Index: mythtv/themes/themestrings.h
+===================================================================
+--- mythtv/themes/themestrings.h	(revision 23485)
++++ mythtv/themes/themestrings.h	(working copy)
+@@ -5,18 +5,25 @@
+     ThemeUI::tr("4. Input connections");
+     ThemeUI::tr("5. Channel Editor");
+     ThemeUI::tr("6. Storage Directories");
++    ThemeUI::tr("7. System Events");
+     ThemeUI::tr("%alert_text%");
+     ThemeUI::tr("LINE #%caller_line%");
+     ThemeUI::tr("NAME: %caller_name%");
+     ThemeUI::tr("NUM : %caller_number%");
+     ThemeUI::tr("DATE: %caller_date% TIME : %caller_time%");
+-    ThemeUI::tr("Welcome to MythTV");
+-    ThemeUI::tr("MythTV is idle and will shutdown shortly.");
+-    ThemeUI::tr("Current Recording(s)");
+-    ThemeUI::tr("Retrieving Recording Status ...");
+-    ThemeUI::tr("Next Scheduled Recording(s)");
+-    ThemeUI::tr("Retrieving Scheduled Recordings ...");
+-    ThemeUI::tr("WARNING: There are conflicting scheduled recordings!");
++    ThemeUI::tr("%CHANNUM%");
++    ThemeUI::tr("%SUBTITLE|\"|\" %%ORIGINALAIRDATE|(|) %%YEARSTARS|| %%DESCRIPTION%");
++    ThemeUI::tr("%STARTDATE%  (%STARTTIME% - %ENDTIME%)  %LENMINS%");
++    ThemeUI::tr("%CALLSIGN%");
++    ThemeUI::tr("Edit");
++    ThemeUI::tr("Channel Editor");
++    ThemeUI::tr("Callsign");
++    ThemeUI::tr("Channel #");
++    ThemeUI::tr("Channel Name");
++    ThemeUI::tr("XMLTV ID");
++    ThemeUI::tr("[P]robe");
++    ThemeUI::tr("[O]k");
++    ThemeUI::tr("The BlackCurves theme was influenced by both the blootube and gray osd themes.");
+     ThemeUI::tr("General");
+     ThemeUI::tr("Core MythTV behavior and system settings");
+     ThemeUI::tr("Appearance");
+@@ -138,114 +145,40 @@
+     ThemeUI::tr("NetFlix");
+     ThemeUI::tr("Edit Keys");
+     ThemeUI::tr("Setup");
+-    ThemeUI::tr("A blue theme.");
+-    ThemeUI::tr("%SUBTITLE|\"|\"%");
+-    ThemeUI::tr("%STARS%%DESCRIPTION%");
+-    ThemeUI::tr("Scheduled Recordings:");
+-    ThemeUI::tr("(1) All  (2) Important");
+-    ThemeUI::tr("Showing:");
+-    ThemeUI::tr("%SUBTITLE|\"|\" %%STARS%%DESCRIPTION%");
+-    ThemeUI::tr("You Haven't Scheduled Any Programs To Be Recorded");
+-    ThemeUI::tr("To schedule a recording, exit this screen and");
+-    ThemeUI::tr("Select 'Program Guide' or 'Program Finder'");
+-    ThemeUI::tr("Preview Schedule Changes:");
+-    ThemeUI::tr("The recording schedule would not be affected.");
+-    ThemeUI::tr("Channel Recording Priorities");
+-    ThemeUI::tr("(1) Channel    (2) Priority");
+-    ThemeUI::tr("Source:");
+-    ThemeUI::tr("Priority:");
+-    ThemeUI::tr("Program Recording Priorities");
+-    ThemeUI::tr("Priority");
+-    ThemeUI::tr("Final Priority");
+-    ThemeUI::tr("(1) Title    (2) Priority    (4) Type");
+-    ThemeUI::tr("Record Type:");
+-    ThemeUI::tr("[");
+-    ThemeUI::tr("]");
+-    ThemeUI::tr("]  =");
+-    ThemeUI::tr("Select a recording to permanently erase:");
+-    ThemeUI::tr("Select a recording to watch:");
+-    ThemeUI::tr("Sorry, No Recordings Available");
+-    ThemeUI::tr("Select 'Schedule a Recording' from the Main Menu");
+-    ThemeUI::tr("(4) Program Guide   **(6) Program Finder **");
+-    ThemeUI::tr("Select a letter...");
+-    ThemeUI::tr("Pick the letter in which the show starts with, then press SELECT or the right arrow");
+-    ThemeUI::tr("Select a program...");
+-    ThemeUI::tr("Select the title of the program you wish to find. When finished return with the left arrow key. Press SELECT to schedule a recording.");
+-    ThemeUI::tr("No Programs");
+-    ThemeUI::tr("There are no available programs under this search. Please select another search.");
+-    ThemeUI::tr("Program Listings");
+-    ThemeUI::tr("(1)Time (2)Title");
+-    ThemeUI::tr("No listings found for this program.");
+-    ThemeUI::tr("Airdate:");
+-    ThemeUI::tr("Channel:");
+-    ThemeUI::tr("Description:");
+-    ThemeUI::tr("Show:  (1) All  (2) Important");
+-    ThemeUI::tr("(1) Sort by Title  (2) Sort by Priority  (4) Sort by Type");
+-    ThemeUI::tr("] =");
+-    ThemeUI::tr("%SUBTITLE|\"|\"% %STARS%%DESCRIPTION%");
+-    ThemeUI::tr("(4) Program Guide  (6) Program Finder");
+-    ThemeUI::tr("Select a letter.");
+-    ThemeUI::tr("Pick the letter in which the show starts with, then press SELECT or the right arrow.");
+-    ThemeUI::tr("Select a program.");
+-    ThemeUI::tr("No Programs.");
+-    ThemeUI::tr("(1) Sort by Time    (2) Sort by Title");
+-    ThemeUI::tr("Heading");
++    ThemeUI::tr("%SUBTITLE|\"|\" %%DESCRIPTION%");
++    ThemeUI::tr("(%TIMEDATE%)  %LENMINS%");
++    ThemeUI::tr("%SUBTITLE|\"|\" %");
++    ThemeUI::tr("%TITLE%");
++    ThemeUI::tr("(%STARTTIME% - %ENDTIME%)  %LENMINS%");
++    ThemeUI::tr("A transparent dark grey theme.");
++    ThemeUI::tr("0%");
+     ThemeUI::tr("Cancel");
+     ThemeUI::tr("Ok");
+-    ThemeUI::tr("0%");
+-    ThemeUI::tr("Playback starting ...");
+-    ThemeUI::tr("Icon Importer");
+-    ThemeUI::tr("Search terms:");
+-    ThemeUI::tr("Search");
+-    ThemeUI::tr("Skip");
+-    ThemeUI::tr("Channel Editor");
+-    ThemeUI::tr("List Options");
+-    ThemeUI::tr("Sort By:");
+-    ThemeUI::tr("Hide Channels without channel number.");
+-    ThemeUI::tr("Delete All");
+-    ThemeUI::tr("Global Options");
+-    ThemeUI::tr("Channel Scan");
+-    ThemeUI::tr("Icon Download");
+-    ThemeUI::tr("Edit Transports");
+-    ThemeUI::tr("Done");
+-    ThemeUI::tr("Play Games");
+-    ThemeUI::tr("System:");
+-    ThemeUI::tr("Year:");
+-    ThemeUI::tr("Genre:");
+-    ThemeUI::tr("Favorite:");
+-    ThemeUI::tr("Yes");
+-    ThemeUI::tr("No");
+-    ThemeUI::tr("Television");
+-    ThemeUI::tr("Main Menu");
+-    ThemeUI::tr("Gallery");
+-    ThemeUI::tr("Schedule");
+-    ThemeUI::tr("Programme Searches");
+-    ThemeUI::tr("CD/DVD Options");
+-    ThemeUI::tr("Media Library");
+-    ThemeUI::tr("Info Centre");
+-    ThemeUI::tr("P");
+-    ThemeUI::tr("S");
+-    ThemeUI::tr("Playing:");
+-    ThemeUI::tr("None");
+-    ThemeUI::tr("%|\"SUBTITLE|\"% %DESCRIPTION%");
+-    ThemeUI::tr("Change Displayed Groups");
++    ThemeUI::tr("Up Level");
++    ThemeUI::tr("Home");
++    ThemeUI::tr("Please Wait....");
++    ThemeUI::tr("%|\"SUBTITLE|\"% %STARS% %DESCRIPTION%");
++    ThemeUI::tr("Change View");
+     ThemeUI::tr("Show Titles");
+     ThemeUI::tr("Show Categories");
+     ThemeUI::tr("Show Recording Groups");
+     ThemeUI::tr("Show Watch List");
+     ThemeUI::tr("Show Searches");
+     ThemeUI::tr("Show LiveTV");
+-    ThemeUI::tr("Show Watched Recordings");
++    ThemeUI::tr("Show Watched Programs");
+     ThemeUI::tr("Save");
+     ThemeUI::tr("Change Recording Group Password");
+-    ThemeUI::tr("Old Password");
++    ThemeUI::tr("Old Password:");
+     ThemeUI::tr("New Password:");
+     ThemeUI::tr("OK");
+     ThemeUI::tr("Edit Recording Metadata");
+-    ThemeUI::tr("Title");
+-    ThemeUI::tr("Subtitle");
++    ThemeUI::tr("Title:");
++    ThemeUI::tr("Subtitle:");
++    ThemeUI::tr("Status Icons");
++    ThemeUI::tr("%LONGREPEAT%%YEARSTARS%%DESCRIPTION%");
+     ThemeUI::tr("Manual Recording Schedule");
+     ThemeUI::tr("Title (Optional):");
++    ThemeUI::tr("Channel:");
+     ThemeUI::tr("Date, or day of week:");
+     ThemeUI::tr("Start Time:");
+     ThemeUI::tr("Hour");
+@@ -253,17 +186,28 @@
+     ThemeUI::tr("Duration:");
+     ThemeUI::tr("Next");
+     ThemeUI::tr("Scheduled Recordings");
+-    ThemeUI::tr("Schedules Overview");
+-    ThemeUI::tr("First Conflict:");
+-    ThemeUI::tr("Filter:");
+-    ThemeUI::tr("You Haven't Scheduled Any Programs To Be Recorded\n To schedule a recording, exit this screen and Select 'Program Guide' or 'Program Finder'");
++    ThemeUI::tr("Showing:");
++    ThemeUI::tr("%|\"SUBTITLE|\"%\n%YEARSTARS%%DESCRIPTION%");
++    ThemeUI::tr("You Haven't Scheduled Any Programs To Be Recorded\n To schedule a recording, exit this screen and select 'Program Guide' or 'Program Finder'");
++    ThemeUI::tr("(1) All  (2) Important");
++    ThemeUI::tr("Channel Recording Priorities");
++    ThemeUI::tr("Source:");
+     ThemeUI::tr("Callsign:");
++    ThemeUI::tr("Priority:");
+     ThemeUI::tr("(1) Channel (2) Priority");
+     ThemeUI::tr("Schedule Priorities");
++    ThemeUI::tr("Priority");
+     ThemeUI::tr("Final");
+     ThemeUI::tr("Type Priority:");
+     ThemeUI::tr("Final Priority:");
+     ThemeUI::tr("(1) Title (2) Priority (4) Type");
++    ThemeUI::tr("Manage Recording Rules");
++    ThemeUI::tr("Channel");
++    ThemeUI::tr("Last Recorded");
++    ThemeUI::tr("Recording Group:");
++    ThemeUI::tr("Category:");
++    ThemeUI::tr("Storage Group:");
++    ThemeUI::tr("Recording Profile:");
+     ThemeUI::tr("Custom Priority Rules");
+     ThemeUI::tr("Existing Rules:");
+     ThemeUI::tr("Rule Name:");
+@@ -280,12 +224,18 @@
+     ThemeUI::tr("Optional title phrase:");
+     ThemeUI::tr("Optional subtitle phrase:");
+     ThemeUI::tr("Optional description phrase:");
+-    ThemeUI::tr("List Overview");
+-    ThemeUI::tr("Current View:");
+-    ThemeUI::tr("Position:");
+-    ThemeUI::tr("Program Details");
+-    ThemeUI::tr("Schedule Editor");
+-    ThemeUI::tr("Rule Overview");
++    ThemeUI::tr("Program Listings");
++    ThemeUI::tr("No listings found for this program.");
++    ThemeUI::tr("Program Details:");
++    ThemeUI::tr("Enter Search Text");
++    ThemeUI::tr("Close");
++    ThemeUI::tr("%|\"SUBTITLE|\"%\n%LONGREPEAT%%STARS| %%DESCRIPTION%");
++    ThemeUI::tr("Search For:");
++    ThemeUI::tr("Custom Record Rules");
++    ThemeUI::tr("Additional Tables:");
++    ThemeUI::tr("Record");
++    ThemeUI::tr("Store");
++    ThemeUI::tr("%|\"SUBTITLE|\"% %LONGREPEAT%%STARS| %%DESCRIPTION%");
+     ThemeUI::tr("Select the recording rule");
+     ThemeUI::tr("Schedule Options");
+     ThemeUI::tr("Storage Options");
+@@ -306,74 +256,155 @@
+     ThemeUI::tr("No episode limit");
+     ThemeUI::tr("Keep at most %n episode(s)", 0, 1);
+     ThemeUI::tr("Allow recordings to expire?");
+-    ThemeUI::tr("Post-Processing Options");
+     ThemeUI::tr("Commercial Flag new recordings");
+     ThemeUI::tr("Transcode new recordings");
+-    ThemeUI::tr("123");
+-    ThemeUI::tr("Search For:");
+-    ThemeUI::tr("%SUBTITLE|\"|\" %%REPEAT%%STARS%%DESCRIPTION%");
+-    ThemeUI::tr("Search Results");
+-    ThemeUI::tr("Cast Members");
+-    ThemeUI::tr("Full Plot");
+-    ThemeUI::tr("Video List Filters");
+-    ThemeUI::tr("Text Filter:");
+-    ThemeUI::tr("Category");
+-    ThemeUI::tr("Genre");
+-    ThemeUI::tr("Country");
+-    ThemeUI::tr("Actor/Actress");
+-    ThemeUI::tr("Year");
+-    ThemeUI::tr("Runtime");
+-    ThemeUI::tr("User Rating");
+-    ThemeUI::tr("Browse");
+-    ThemeUI::tr("InetRef");
+-    ThemeUI::tr("Cover File");
+-    ThemeUI::tr("Sort by");
+-    ThemeUI::tr("Watched");
+-    ThemeUI::tr("Make default");
+-    ThemeUI::tr("Video Manager");
++    ThemeUI::tr("A blue theme.");
++    ThemeUI::tr("Directed by:");
++    ThemeUI::tr("Year:");
++    ThemeUI::tr("User Rating:");
++    ThemeUI::tr("Runtime:");
++    ThemeUI::tr("Done");
++    ThemeUI::tr("Play");
++    ThemeUI::tr("No videos in library, or no files found.  If you have configured a video directory, press \"M\" (or the MENU key) and select \"Scan for Changes.\"");
+     ThemeUI::tr("Director:");
+-    ThemeUI::tr("Parental:");
++    ThemeUI::tr("Rated:");
++    ThemeUI::tr("Parental Level:");
+     ThemeUI::tr("Lowest");
+     ThemeUI::tr("Low");
+     ThemeUI::tr("Medium");
+     ThemeUI::tr("High");
+-    ThemeUI::tr("Rated:");
+     ThemeUI::tr("Browsable:");
+-    ThemeUI::tr("Runtime:");
++    ThemeUI::tr("Plot:");
+     ThemeUI::tr("Filename:");
+     ThemeUI::tr("Cover File:");
+-    ThemeUI::tr("IMDB ID:");
+-    ThemeUI::tr("Video Browser");
+-    ThemeUI::tr("Videos - Gallery");
+-    ThemeUI::tr("Videos - Tree");
++    ThemeUI::tr("Video Num.:");
++    ThemeUI::tr("Directed by");
++    ThemeUI::tr("Runtime");
++    ThemeUI::tr("Year");
++    ThemeUI::tr("User Rating");
+     ThemeUI::tr("Parental Level");
+-    ThemeUI::tr("Video File Associations");
++    ThemeUI::tr("MythVideo File Associations");
+     ThemeUI::tr("Extension:");
+     ThemeUI::tr("Command:");
+     ThemeUI::tr("Use default player:");
+     ThemeUI::tr("Ignore:");
+-    ThemeUI::tr("Edit Video Metadata");
+-    ThemeUI::tr("Title:");
+-    ThemeUI::tr("Subtitle:");
++    ThemeUI::tr("New");
++    ThemeUI::tr("Edit Video Information");
+     ThemeUI::tr("Season:");
+     ThemeUI::tr("Episode:");
+-    ThemeUI::tr("Category:");
+     ThemeUI::tr("Parental Control:");
+     ThemeUI::tr("File to Always Play Next:");
+     ThemeUI::tr("Include while Browsing:");
+-    ThemeUI::tr("Item has been Watched:");
++    ThemeUI::tr("Item has been watched:");
+     ThemeUI::tr("Cover Art:");
+     ThemeUI::tr("Screenshot:");
+     ThemeUI::tr("Banner:");
+     ThemeUI::tr("Fanart:");
+     ThemeUI::tr("Trailer:");
+     ThemeUI::tr("Unique Player Command:");
+-    ThemeUI::tr("Directed by:");
+-    ThemeUI::tr("Play");
++    ThemeUI::tr("/path/to/the/thing.jpg");
++    ThemeUI::tr("Filters video list");
++    ThemeUI::tr("Text Filter:");
++    ThemeUI::tr("Category :");
++    ThemeUI::tr("Genre :");
++    ThemeUI::tr("Country :");
++    ThemeUI::tr("Actor/Actress :");
++    ThemeUI::tr("Year :");
++    ThemeUI::tr("Runtime :");
++    ThemeUI::tr("User Rating :");
++    ThemeUI::tr("Browse :");
++    ThemeUI::tr("InetRef :");
++    ThemeUI::tr("Cover File :");
++    ThemeUI::tr("Sort by :");
++    ThemeUI::tr("Watched :");
++    ThemeUI::tr("Result");
++    ThemeUI::tr("Save as default");
++    ThemeUI::tr("Heading");
++    ThemeUI::tr("Playback starting …");
++    ThemeUI::tr("Bookmark Manager");
++    ThemeUI::tr("Web Page");
++    ThemeUI::tr("Icon Importer");
++    ThemeUI::tr("Search terms:");
++    ThemeUI::tr("Search");
++    ThemeUI::tr("Skip");
++    ThemeUI::tr("List Options");
++    ThemeUI::tr("Sort By:");
++    ThemeUI::tr("Hide Channels without channel number.");
++    ThemeUI::tr("Delete All");
++    ThemeUI::tr("Global Options");
++    ThemeUI::tr("Channel Scan");
++    ThemeUI::tr("Icon Download");
++    ThemeUI::tr("Edit Transports");
++    ThemeUI::tr("Image Gallery");
++    ThemeUI::tr("No images found in configured directory.  Are you sure you have set up the plugin properly?");
++    ThemeUI::tr("Play Games");
++    ThemeUI::tr("System:");
++    ThemeUI::tr("Genre:");
++    ThemeUI::tr("Favorite:");
++    ThemeUI::tr("Yes");
++    ThemeUI::tr("No");
++    ThemeUI::tr("Emulator:");
++    ThemeUI::tr("Television");
++    ThemeUI::tr("Main Menu");
++    ThemeUI::tr("Gallery");
++    ThemeUI::tr("Schedule");
++    ThemeUI::tr("Programme Searches");
++    ThemeUI::tr("CD/DVD Options");
++    ThemeUI::tr("Media Library");
++    ThemeUI::tr("Info Centre");
++    ThemeUI::tr("P");
++    ThemeUI::tr("S");
++    ThemeUI::tr("Playing:");
++    ThemeUI::tr("None");
++    ThemeUI::tr("Internet Video Browser");
++    ThemeUI::tr("No sites configured!");
++    ThemeUI::tr("Videos - Gallery");
++    ThemeUI::tr("Videos - Tree");
++    ThemeUI::tr("%|\"SUBTITLE|\"% %DESCRIPTION%");
++    ThemeUI::tr("Change Displayed Groups");
++    ThemeUI::tr("Show Watched Recordings");
++    ThemeUI::tr("Old Password");
++    ThemeUI::tr("Title");
++    ThemeUI::tr("Subtitle");
++    ThemeUI::tr("Schedules Overview");
++    ThemeUI::tr("First Conflict:");
++    ThemeUI::tr("Filter:");
++    ThemeUI::tr("Recording Rule Priorities");
++    ThemeUI::tr("Type");
++    ThemeUI::tr("List Overview");
++    ThemeUI::tr("Current View:");
++    ThemeUI::tr("Position:");
++    ThemeUI::tr("Program Details");
++    ThemeUI::tr("Schedule Editor");
++    ThemeUI::tr("Rule Overview");
++    ThemeUI::tr("Post-Processing Options");
++    ThemeUI::tr("This screen displays the status of various system components");
++    ThemeUI::tr("Search Results");
++    ThemeUI::tr("Cast Members");
++    ThemeUI::tr("Full Plot");
++    ThemeUI::tr("Video List Filters");
++    ThemeUI::tr("Category");
++    ThemeUI::tr("Genre");
++    ThemeUI::tr("Country");
++    ThemeUI::tr("Actor/Actress");
++    ThemeUI::tr("Browse");
++    ThemeUI::tr("InetRef");
++    ThemeUI::tr("Cover File");
++    ThemeUI::tr("Sort by");
++    ThemeUI::tr("Watched");
++    ThemeUI::tr("Make default");
++    ThemeUI::tr("Video Manager");
++    ThemeUI::tr("Parental:");
++    ThemeUI::tr("IMDB ID:");
++    ThemeUI::tr("Video Browser");
++    ThemeUI::tr("Video File Associations");
++    ThemeUI::tr("Edit Video Metadata");
++    ThemeUI::tr("Item has been Watched:");
+     ThemeUI::tr("Change mythtv key bindings.");
+     ThemeUI::tr("MythStream Settings");
+     ThemeUI::tr("Weather Station Settings");
+     ThemeUI::tr("TV");
++    ThemeUI::tr("Internet Video");
+     ThemeUI::tr("Play Online Streams");
+     ThemeUI::tr("Weather Station");
+     ThemeUI::tr("A long menu which breaks down the options by their category. TV, Music, Video etc");
+@@ -386,75 +417,70 @@
+     ThemeUI::tr("1280 x 720");
+     ThemeUI::tr("0 x 0");
+     ThemeUI::tr("1 pixel");
+-    ThemeUI::tr("Up Level");
+-    ThemeUI::tr("Home");
+-    ThemeUI::tr("Please Wait....");
+     ThemeUI::tr("Sort Mode:");
+     ThemeUI::tr("Video Source:");
+     ThemeUI::tr("Contexts");
+     ThemeUI::tr("Actions");
+-    ThemeUI::tr("%|\"SUBTITLE|\"% %STARS% %DESCRIPTION%");
+-    ThemeUI::tr("Change View");
+-    ThemeUI::tr("Show Watched Programs");
+-    ThemeUI::tr("Old Password:");
+-    ThemeUI::tr("Status Icons");
+-    ThemeUI::tr("%LONGREPEAT%%YEARSTARS%%DESCRIPTION%");
+-    ThemeUI::tr("%|\"SUBTITLE|\"%\n%YEARSTARS%%DESCRIPTION%");
+-    ThemeUI::tr("You Haven't Scheduled Any Programs To Be Recorded\n To schedule a recording, exit this screen and select 'Program Guide' or 'Program Finder'");
+-    ThemeUI::tr("Manage Recording Rules");
+-    ThemeUI::tr("Channel");
+-    ThemeUI::tr("Last Recorded");
+-    ThemeUI::tr("Recording Group:");
+-    ThemeUI::tr("Storage Group:");
+-    ThemeUI::tr("Recording Profile:");
+-    ThemeUI::tr("Program Details:");
+-    ThemeUI::tr("Enter Search Text");
+-    ThemeUI::tr("Close");
+-    ThemeUI::tr("%|\"SUBTITLE|\"%\n%LONGREPEAT%%STARS| %%DESCRIPTION%");
+-    ThemeUI::tr("Custom Record Rules");
+-    ThemeUI::tr("Additional Tables:");
+-    ThemeUI::tr("Record");
+-    ThemeUI::tr("Store");
+-    ThemeUI::tr("%|\"SUBTITLE|\"% %LONGREPEAT%%STARS| %%DESCRIPTION%");
++    ThemeUI::tr("Preview Schedule Changes");
++    ThemeUI::tr("You Haven't Scheduled Any Programs To Be Recorded");
+     ThemeUI::tr("Details");
+-    ThemeUI::tr("This screen displays the status of various system components");
++    ThemeUI::tr("Welcome to MythTV");
++    ThemeUI::tr("MythTV is idle and will shutdown shortly.");
++    ThemeUI::tr("Current Recording(s)");
++    ThemeUI::tr("Retrieving Recording Status ...");
++    ThemeUI::tr("Next Scheduled Recording(s)");
++    ThemeUI::tr("Retrieving Scheduled Recordings ...");
++    ThemeUI::tr("WARNING: There are conflicting scheduled recordings!");
++    ThemeUI::tr("Start Frontend");
++    ThemeUI::tr("(1)Time (2)Title");
++    ThemeUI::tr("Sample Clauses:");
+     ThemeUI::tr("Run User Job #1");
+     ThemeUI::tr("Run User job #2");
+     ThemeUI::tr("Run User Job #3");
+     ThemeUI::tr("Run User Job #4");
+-    ThemeUI::tr("Make or accept a VoIP call");
+     ThemeUI::tr("Keep up with the news");
++    ThemeUI::tr("Twitter");
++    ThemeUI::tr("Send and receive tweets");
+     ThemeUI::tr("See when local movies are playing");
+     ThemeUI::tr("Local weather forecast");
+     ThemeUI::tr("Manage your NetFlix queue");
+     ThemeUI::tr("Browse the web");
+     ThemeUI::tr("Start cooking!");
++    ThemeUI::tr("See what your system is doing");
+     ThemeUI::tr("Home surveillance");
+     ThemeUI::tr("Hardware profile");
+     ThemeUI::tr("Tell us what hardware you have so we can support it");
+-    ThemeUI::tr("Play recordings");
++    ThemeUI::tr("Browse your recordings");
+     ThemeUI::tr("Watch Videos");
+-    ThemeUI::tr("Play videos");
++    ThemeUI::tr("Browse your video library");
+     ThemeUI::tr("Listen to Music");
++    ThemeUI::tr("Browse your music library");
+     ThemeUI::tr("Listen to the radio");
+-    ThemeUI::tr("Image Gallery");
++    ThemeUI::tr("Search Internet Video");
++    ThemeUI::tr("Search popular video sites");
++    ThemeUI::tr("Browse Internet Video");
++    ThemeUI::tr("Browse highlights and entire sites");
+     ThemeUI::tr("Look at Pictures");
+     ThemeUI::tr("Play video games");
++    ThemeUI::tr("Pick the theme, font, size, and locale");
+     ThemeUI::tr("Media Settings");
+     ThemeUI::tr("Settings for all non-TV media");
+     ThemeUI::tr("Info Center Settings");
+     ThemeUI::tr("Configure weather, news, movie info, web, and recipes");
++    ThemeUI::tr("System Event Handlers");
++    ThemeUI::tr("Configure System Event handler commands");
+     ThemeUI::tr("Play any of your media");
+     ThemeUI::tr("Manage Recordings");
+-    ThemeUI::tr("Pick and prioritize shows to record");
++    ThemeUI::tr("Pick and prioritize recordings");
+     ThemeUI::tr("Information Center");
+     ThemeUI::tr("Information and Communications");
+     ThemeUI::tr("Optical Disks");
+     ThemeUI::tr("Play or import CDs and DVDs");
+     ThemeUI::tr("Configure MythTV and plugins");
++    ThemeUI::tr("See what you have recorded");
+     ThemeUI::tr("Set Priorities");
+     ThemeUI::tr("Play DVD");
+-    ThemeUI::tr("Play the video on a movie DVD");
++    ThemeUI::tr("Play a film on DVD");
+     ThemeUI::tr("Play VCD");
+     ThemeUI::tr("Play the video on a VCD");
+     ThemeUI::tr("Import DVD");
+@@ -464,23 +490,23 @@
+     ThemeUI::tr("Import music from an audio CD");
+     ThemeUI::tr("Eject media");
+     ThemeUI::tr("Eject CD or DVD from drive");
++    ThemeUI::tr("Prioritize some channels over others");
++    ThemeUI::tr("Prioritize some recordings over others");
++    ThemeUI::tr("Choose which menu options appear during playback");
++    ThemeUI::tr("Group your favorite channels together");
++    ThemeUI::tr("Change the quality of your recordings");
+     ThemeUI::tr("Music Tools");
+     ThemeUI::tr("Select, import, or play music");
+-    ThemeUI::tr("Scan for new videos, edit metadata, or delete");
+-    ThemeUI::tr("%SUBTITLE%%BR%%DESCRIPTION%");
+-    ThemeUI::tr("%DESCRIPTION%");
+-    ThemeUI::tr("%STARTDATE%");
+-    ThemeUI::tr("Callsign");
+-    ThemeUI::tr("Channel #");
+-    ThemeUI::tr("Channel Name");
+-    ThemeUI::tr("XMLTV ID");
+-    ThemeUI::tr("[P]robe");
+-    ThemeUI::tr("[O]k");
+-    ThemeUI::tr("%DESCRIPTION%%BR%(%STARTTIME% - %LENMINS%)");
++    ThemeUI::tr("Change MythTV key bindings.");
+     ThemeUI::tr("%CALLSIGN% - %CHANNUM%");
+-    ThemeUI::tr("A simple transparent black and white theme.");
++    ThemeUI::tr("(%STARTDATE% %STARTTIME% - %ENDTIME%)  %LENMINS%");
++    ThemeUI::tr("A very simple blue and black theme.");
++    ThemeUI::tr("Pick and prioritize shows to record");
+     ThemeUI::tr("Play or import audio or video CDs or DVDs");
++    ThemeUI::tr("Play recordings");
++    ThemeUI::tr("Play videos");
+     ThemeUI::tr("Watch A DVD");
++    ThemeUI::tr("Play the video on a movie DVD");
+     ThemeUI::tr("Watch Live TV");
+     ThemeUI::tr("Watch Online Streams");
+     ThemeUI::tr("Plugins");

Added: trunk/fr_FR/diffs/fr_temp_combinee_avec_themestrings.diff
===================================================================
--- trunk/fr_FR/diffs/fr_temp_combinee_avec_themestrings.diff	                        (rev 0)
+++ trunk/fr_FR/diffs/fr_temp_combinee_avec_themestrings.diff	2010-02-09 23:56:30 UTC (rev 170)
@@ -0,0 +1,830 @@
+Index: mythplugins/mythnetvision/i18n/themestrings.h
+===================================================================
+--- mythplugins/mythnetvision/i18n/themestrings.h	(revision 23485)
++++ mythplugins/mythnetvision/i18n/themestrings.h	(working copy)
+@@ -1,4 +1,29 @@
+ void strings_null() {
++    ThemeUI::tr("Search Term:");
++    ThemeUI::tr("Author: %1");
++    ThemeUI::tr("Size: %1");
++    ThemeUI::tr("Description: %1");
++    ThemeUI::tr("Can't find any search scripts!  This usually indicates missing search script prerequisites.  Try running a script from the command line.");
++    ThemeUI::tr("Manage Site Subscriptions");
++    ThemeUI::tr("Edit");
++    ThemeUI::tr("New");
++    ThemeUI::tr("Remove");
++    ThemeUI::tr("Manage RSS Subscriptions");
++    ThemeUI::tr("Feed Name:");
++    ThemeUI::tr("Feed URL:");
++    ThemeUI::tr("Site Description:");
++    ThemeUI::tr("Feed Author:");
++    ThemeUI::tr("Download this feed automatically");
++    ThemeUI::tr("Choose Image");
+     ThemeUI::tr("Cancel");
+-    ThemeUI::tr("Ok");
++    ThemeUI::tr("Save");
++    ThemeUI::tr("Posted: %1");
++    ThemeUI::tr("You haven't added any Sites/RSS Feeds yet!  To add a site, press MENU, then choose \"Scan/Manage Subscriptions,\" then \"Manage Site Subscriptions.\"");
++    ThemeUI::tr("Runtime");
++    ThemeUI::tr("Author");
++    ThemeUI::tr("Rating");
++    ThemeUI::tr("Search Internet Video");
++    ThemeUI::tr("Search popular video sites");
++    ThemeUI::tr("Browse Internet Video");
++    ThemeUI::tr("Browse highlights and entire sites");
+ }
+Index: mythplugins/mythnetvision/i18n/translate.pro
+===================================================================
+--- mythplugins/mythnetvision/i18n/translate.pro	(revision 23485)
++++ mythplugins/mythnetvision/i18n/translate.pro	(working copy)
+@@ -2,3 +2,4 @@
+ SOURCES += ../mythnetvision/*.h
+ SOURCES += ./themestrings.h
+ 
++TRANSLATIONS  = mythnetvision_fr.ts 
+Index: mythplugins/mythnetvision/i18n/i18n.pro
+===================================================================
+--- mythplugins/mythnetvision/i18n/i18n.pro	(revision 23485)
++++ mythplugins/mythnetvision/i18n/i18n.pro	(working copy)
+@@ -5,6 +5,7 @@
+ CONFIG -= moc qt
+ 
+ trans.path = $${PREFIX}/share/mythtv/i18n/
++trans.files += mythnetvision_fr.qm 
+ 
+ INSTALLS += trans
+ 
+Index: mythplugins/mythmusic/i18n/themestrings.h
+===================================================================
+--- mythplugins/mythmusic/i18n/themestrings.h	(revision 23485)
++++ mythplugins/mythmusic/i18n/themestrings.h	(working copy)
+@@ -45,8 +45,11 @@
+     ThemeUI::tr("Copy");
+     ThemeUI::tr("Please Wait ...");
+     ThemeUI::tr("General Settings");
++    ThemeUI::tr("Music folders and general options");
+     ThemeUI::tr("Player Settings");
++    ThemeUI::tr("Music playback options");
+     ThemeUI::tr("Ripper Settings");
++    ThemeUI::tr("CD copying options");
+     ThemeUI::tr("Play Music");
+     ThemeUI::tr("Select Music");
+     ThemeUI::tr("Import CD");
+Index: mythplugins/mytharchive/i18n/themestrings.h
+===================================================================
+--- mythplugins/mytharchive/i18n/themestrings.h	(revision 23485)
++++ mythplugins/mytharchive/i18n/themestrings.h	(working copy)
+@@ -5,14 +5,21 @@
+     ThemeUI::tr("A extended play profile giving approx. 6 hour of video on a single layer DVD");
+     ThemeUI::tr("Select Destination");
+     ThemeUI::tr("description goes here.");
++    ThemeUI::tr("Find");
+     ThemeUI::tr("Free Space:");
+     ThemeUI::tr("0.00Gb");
+     ThemeUI::tr("Make ISO Image");
+     ThemeUI::tr("Burn to DVD");
+     ThemeUI::tr("Force Overwrite of DVD-RW Media");
++    ThemeUI::tr("Cancel");
++    ThemeUI::tr("Prev");
++    ThemeUI::tr("Next");
+     ThemeUI::tr("Select Recordings");
+     ThemeUI::tr("Show Recordings");
++    ThemeUI::tr("OK");
+     ThemeUI::tr("File Finder");
++    ThemeUI::tr("Back");
++    ThemeUI::tr("Home");
+     ThemeUI::tr("Select Videos");
+     ThemeUI::tr("Video Category");
+     ThemeUI::tr("title goes here");
+@@ -21,6 +28,8 @@
+     ThemeUI::tr("1");
+     ThemeUI::tr("No videos available");
+     ThemeUI::tr("Log Viewer");
++    ThemeUI::tr("Update");
++    ThemeUI::tr("Exit");
+     ThemeUI::tr("Change Encoding Profile");
+     ThemeUI::tr("12.34GB");
+     ThemeUI::tr("DVD Menu Theme");
+@@ -31,6 +40,9 @@
+     ThemeUI::tr("Details");
+     ThemeUI::tr("Select Archive Items");
+     ThemeUI::tr("No files are selected for archive");
++    ThemeUI::tr("Add Recording");
++    ThemeUI::tr("Add Video");
++    ThemeUI::tr("Add File");
+     ThemeUI::tr("xxxxx mb");
+     ThemeUI::tr("0 mb");
+     ThemeUI::tr("Archive Item Details");
+@@ -44,6 +56,7 @@
+     ThemeUI::tr("0:00:00.00");
+     ThemeUI::tr("Seek Amount");
+     ThemeUI::tr("Frame");
++    ThemeUI::tr("Save");
+     ThemeUI::tr("sep 13, 2004 11:00 pm (1h 15m)");
+     ThemeUI::tr("File Finder To Import");
+     ThemeUI::tr("Start Time:");
+@@ -54,6 +67,11 @@
+     ThemeUI::tr("Callsign:");
+     ThemeUI::tr("Name:");
+     ThemeUI::tr("Local Channel");
++    ThemeUI::tr("Search Channel");
++    ThemeUI::tr("Search Callsign");
++    ThemeUI::tr("Search Name");
++    ThemeUI::tr("Finish");
++    ThemeUI::tr("Add video");
+     ThemeUI::tr("Create DVD");
+     ThemeUI::tr("Create Archive");
+     ThemeUI::tr("Encode Video File");
+Index: mythplugins/mythweather/i18n/themestrings.h
+===================================================================
+--- mythplugins/mythweather/i18n/themestrings.h	(revision 23485)
++++ mythplugins/mythweather/i18n/themestrings.h	(working copy)
+@@ -20,4 +20,9 @@
+     ThemeUI::tr("Location Search");
+     ThemeUI::tr("Enter your current location, nearest large town or city. In some countries postal codes are also supported.");
+     ThemeUI::tr("Enter Location:");
++    ThemeUI::tr("General weather plugin options");
++    ThemeUI::tr("Screen Settings");
++    ThemeUI::tr("Choose which weather forecasts to display");
++    ThemeUI::tr("Source Settings");
++    ThemeUI::tr("Configure the behavior of weather scripts");
+ }
+Index: mythplugins/mythmovies/i18n/translate.pro
+===================================================================
+--- mythplugins/mythmovies/i18n/translate.pro	(revision 23485)
++++ mythplugins/mythmovies/i18n/translate.pro	(working copy)
+@@ -2,4 +2,4 @@
+ SOURCES += ../mythmovies/*.h
+ SOURCES += ./themestrings.h
+ 
+-TRANSLATIONS = mythmovies_sv.ts mythmovies_hu.ts
++TRANSLATIONS = mythmovies_sv.ts mythmovies_hu.ts mythmovies_fr.ts
+Index: mythplugins/mythmovies/i18n/i18n.pro
+===================================================================
+--- mythplugins/mythmovies/i18n/i18n.pro	(revision 23485)
++++ mythplugins/mythmovies/i18n/i18n.pro	(working copy)
+@@ -5,7 +5,7 @@
+ CONFIG -= moc qt
+ 
+ trans.path = $${PREFIX}/share/mythtv/i18n/
+-trans.files += mythmovies_sv.qm mythmovies_hu.qm
++trans.files += mythmovies_sv.qm mythmovies_hu.qm mythmovies_fr.qm
+ 
+ INSTALLS += trans
+ 
+Index: mythplugins/mythvideo/i18n/themestrings.h
+===================================================================
+--- mythplugins/mythvideo/i18n/themestrings.h	(revision 23485)
++++ mythplugins/mythvideo/i18n/themestrings.h	(working copy)
+@@ -18,6 +18,7 @@
+     ThemeUI::tr("Runtime:");
+     ThemeUI::tr("Done");
+     ThemeUI::tr("Play");
++    ThemeUI::tr("No videos in library, or no files found.  If you have configured a video directory, press \"M\" (or the MENU key) and select \"Scan for Changes.\"");
+     ThemeUI::tr("Director:");
+     ThemeUI::tr("Rated:");
+     ThemeUI::tr("Parental Level:");
+@@ -40,6 +41,8 @@
+     ThemeUI::tr("Command:");
+     ThemeUI::tr("Use default player:");
+     ThemeUI::tr("Ignore:");
++    ThemeUI::tr("New");
++    ThemeUI::tr("Delete");
+     ThemeUI::tr("Edit Video Information");
+     ThemeUI::tr("Title:");
+     ThemeUI::tr("Subtitle:");
+@@ -73,10 +76,31 @@
+     ThemeUI::tr("Watched :");
+     ThemeUI::tr("Result");
+     ThemeUI::tr("Save as default");
++    ThemeUI::tr("Player Settings");
++    ThemeUI::tr("Default Player:");
++    ThemeUI::tr("DVD Player:");
++    ThemeUI::tr("DVD Drive:");
++    ThemeUI::tr("VCD Player:");
++    ThemeUI::tr("VCD Drive:");
++    ThemeUI::tr("Enable Alternate Player:");
++    ThemeUI::tr("Alternate Player:");
++    ThemeUI::tr("Cancel");
++    ThemeUI::tr("Video Metadata Settings");
++    ThemeUI::tr("Movie Grabber:");
++    ThemeUI::tr("TV Grabber:");
++    ThemeUI::tr("Enable Random Trailer Playback");
++    ThemeUI::tr("Display unknown file types");
++    ThemeUI::tr("Enable metadata in file browse mode");
++    ThemeUI::tr("Trailers to Play:");
+     ThemeUI::tr("General Settings");
+-    ThemeUI::tr("Player Settings");
++    ThemeUI::tr("File Paths and general options");
++    ThemeUI::tr("Player Applications and DVD/VCD Drives");
++    ThemeUI::tr("Metadata Settings");
++    ThemeUI::tr("Grabber Setup and display preferences");
+     ThemeUI::tr("File Types");
++    ThemeUI::tr("Associate new file extensions");
+     ThemeUI::tr("Rip Settings");
++    ThemeUI::tr("DVD Rip and Transcode options");
+     ThemeUI::tr("Browse Videos");
+     ThemeUI::tr("Video List");
+     ThemeUI::tr("Video Gallery");
+Index: mythplugins/mythgame/i18n/themestrings.h
+===================================================================
+--- mythplugins/mythgame/i18n/themestrings.h	(revision 23485)
++++ mythplugins/mythgame/i18n/themestrings.h	(working copy)
+@@ -26,7 +26,11 @@
+     ThemeUI::tr("Play");
+     ThemeUI::tr("Game Information");
+     ThemeUI::tr("General Settings");
++    ThemeUI::tr("Game folders and general options");
+     ThemeUI::tr("Game Players");
++    ThemeUI::tr("Configure an emulator");
+     ThemeUI::tr("Scan for Games");
++    ThemeUI::tr("Add games to your library");
+     ThemeUI::tr("Clear Game Data");
++    ThemeUI::tr("Empty your game library");
+ }
+Index: mythplugins/mythzoneminder/i18n/translate.pro
+===================================================================
+--- mythplugins/mythzoneminder/i18n/translate.pro	(revision 23485)
++++ mythplugins/mythzoneminder/i18n/translate.pro	(working copy)
+@@ -2,4 +2,4 @@
+ SOURCES += ../mythzoneminder/*.h
+ SOURCES += ./themestrings.h
+ 
+-TRANSLATIONS = mythzoneminder_sv.ts mythzoneminder_hu.ts
++TRANSLATIONS = mythzoneminder_sv.ts mythzoneminder_hu.ts mythzoneminder_fr.ts
+Index: mythplugins/mythzoneminder/i18n/i18n.pro
+===================================================================
+--- mythplugins/mythzoneminder/i18n/i18n.pro	(revision 23485)
++++ mythplugins/mythzoneminder/i18n/i18n.pro	(working copy)
+@@ -5,7 +5,7 @@
+ CONFIG -= moc qt
+ 
+ trans.path = $${PREFIX}/share/mythtv/i18n/
+-trans.files += mythzoneminder_sv.qm mythzoneminder_hu.qm
++trans.files += mythzoneminder_sv.qm mythzoneminder_hu.qm mythzoneminder_fr.qm
+ 
+ INSTALLS += trans
+ 
+Index: mythtv/themes/themestrings.h
+===================================================================
+--- mythtv/themes/themestrings.h	(revision 23485)
++++ mythtv/themes/themestrings.h	(working copy)
+@@ -5,18 +5,25 @@
+     ThemeUI::tr("4. Input connections");
+     ThemeUI::tr("5. Channel Editor");
+     ThemeUI::tr("6. Storage Directories");
++    ThemeUI::tr("7. System Events");
+     ThemeUI::tr("%alert_text%");
+     ThemeUI::tr("LINE #%caller_line%");
+     ThemeUI::tr("NAME: %caller_name%");
+     ThemeUI::tr("NUM : %caller_number%");
+     ThemeUI::tr("DATE: %caller_date% TIME : %caller_time%");
+-    ThemeUI::tr("Welcome to MythTV");
+-    ThemeUI::tr("MythTV is idle and will shutdown shortly.");
+-    ThemeUI::tr("Current Recording(s)");
+-    ThemeUI::tr("Retrieving Recording Status ...");
+-    ThemeUI::tr("Next Scheduled Recording(s)");
+-    ThemeUI::tr("Retrieving Scheduled Recordings ...");
+-    ThemeUI::tr("WARNING: There are conflicting scheduled recordings!");
++    ThemeUI::tr("%CHANNUM%");
++    ThemeUI::tr("%SUBTITLE|\"|\" %%ORIGINALAIRDATE|(|) %%YEARSTARS|| %%DESCRIPTION%");
++    ThemeUI::tr("%STARTDATE%  (%STARTTIME% - %ENDTIME%)  %LENMINS%");
++    ThemeUI::tr("%CALLSIGN%");
++    ThemeUI::tr("Edit");
++    ThemeUI::tr("Channel Editor");
++    ThemeUI::tr("Callsign");
++    ThemeUI::tr("Channel #");
++    ThemeUI::tr("Channel Name");
++    ThemeUI::tr("XMLTV ID");
++    ThemeUI::tr("[P]robe");
++    ThemeUI::tr("[O]k");
++    ThemeUI::tr("The BlackCurves theme was influenced by both the blootube and gray osd themes.");
+     ThemeUI::tr("General");
+     ThemeUI::tr("Core MythTV behavior and system settings");
+     ThemeUI::tr("Appearance");
+@@ -138,114 +145,40 @@
+     ThemeUI::tr("NetFlix");
+     ThemeUI::tr("Edit Keys");
+     ThemeUI::tr("Setup");
+-    ThemeUI::tr("A blue theme.");
+-    ThemeUI::tr("%SUBTITLE|\"|\"%");
+-    ThemeUI::tr("%STARS%%DESCRIPTION%");
+-    ThemeUI::tr("Scheduled Recordings:");
+-    ThemeUI::tr("(1) All  (2) Important");
+-    ThemeUI::tr("Showing:");
+-    ThemeUI::tr("%SUBTITLE|\"|\" %%STARS%%DESCRIPTION%");
+-    ThemeUI::tr("You Haven't Scheduled Any Programs To Be Recorded");
+-    ThemeUI::tr("To schedule a recording, exit this screen and");
+-    ThemeUI::tr("Select 'Program Guide' or 'Program Finder'");
+-    ThemeUI::tr("Preview Schedule Changes:");
+-    ThemeUI::tr("The recording schedule would not be affected.");
+-    ThemeUI::tr("Channel Recording Priorities");
+-    ThemeUI::tr("(1) Channel    (2) Priority");
+-    ThemeUI::tr("Source:");
+-    ThemeUI::tr("Priority:");
+-    ThemeUI::tr("Program Recording Priorities");
+-    ThemeUI::tr("Priority");
+-    ThemeUI::tr("Final Priority");
+-    ThemeUI::tr("(1) Title    (2) Priority    (4) Type");
+-    ThemeUI::tr("Record Type:");
+-    ThemeUI::tr("[");
+-    ThemeUI::tr("]");
+-    ThemeUI::tr("]  =");
+-    ThemeUI::tr("Select a recording to permanently erase:");
+-    ThemeUI::tr("Select a recording to watch:");
+-    ThemeUI::tr("Sorry, No Recordings Available");
+-    ThemeUI::tr("Select 'Schedule a Recording' from the Main Menu");
+-    ThemeUI::tr("(4) Program Guide   **(6) Program Finder **");
+-    ThemeUI::tr("Select a letter...");
+-    ThemeUI::tr("Pick the letter in which the show starts with, then press SELECT or the right arrow");
+-    ThemeUI::tr("Select a program...");
+-    ThemeUI::tr("Select the title of the program you wish to find. When finished return with the left arrow key. Press SELECT to schedule a recording.");
+-    ThemeUI::tr("No Programs");
+-    ThemeUI::tr("There are no available programs under this search. Please select another search.");
+-    ThemeUI::tr("Program Listings");
+-    ThemeUI::tr("(1)Time (2)Title");
+-    ThemeUI::tr("No listings found for this program.");
+-    ThemeUI::tr("Airdate:");
+-    ThemeUI::tr("Channel:");
+-    ThemeUI::tr("Description:");
+-    ThemeUI::tr("Show:  (1) All  (2) Important");
+-    ThemeUI::tr("(1) Sort by Title  (2) Sort by Priority  (4) Sort by Type");
+-    ThemeUI::tr("] =");
+-    ThemeUI::tr("%SUBTITLE|\"|\"% %STARS%%DESCRIPTION%");
+-    ThemeUI::tr("(4) Program Guide  (6) Program Finder");
+-    ThemeUI::tr("Select a letter.");
+-    ThemeUI::tr("Pick the letter in which the show starts with, then press SELECT or the right arrow.");
+-    ThemeUI::tr("Select a program.");
+-    ThemeUI::tr("No Programs.");
+-    ThemeUI::tr("(1) Sort by Time    (2) Sort by Title");
+-    ThemeUI::tr("Heading");
++    ThemeUI::tr("%SUBTITLE|\"|\" %%DESCRIPTION%");
++    ThemeUI::tr("(%TIMEDATE%)  %LENMINS%");
++    ThemeUI::tr("%SUBTITLE|\"|\" %");
++    ThemeUI::tr("%TITLE%");
++    ThemeUI::tr("(%STARTTIME% - %ENDTIME%)  %LENMINS%");
++    ThemeUI::tr("A transparent dark grey theme.");
++    ThemeUI::tr("0%");
+     ThemeUI::tr("Cancel");
+     ThemeUI::tr("Ok");
+-    ThemeUI::tr("0%");
+-    ThemeUI::tr("Playback starting ...");
+-    ThemeUI::tr("Icon Importer");
+-    ThemeUI::tr("Search terms:");
+-    ThemeUI::tr("Search");
+-    ThemeUI::tr("Skip");
+-    ThemeUI::tr("Channel Editor");
+-    ThemeUI::tr("List Options");
+-    ThemeUI::tr("Sort By:");
+-    ThemeUI::tr("Hide Channels without channel number.");
+-    ThemeUI::tr("Delete All");
+-    ThemeUI::tr("Global Options");
+-    ThemeUI::tr("Channel Scan");
+-    ThemeUI::tr("Icon Download");
+-    ThemeUI::tr("Edit Transports");
+-    ThemeUI::tr("Done");
+-    ThemeUI::tr("Play Games");
+-    ThemeUI::tr("System:");
+-    ThemeUI::tr("Year:");
+-    ThemeUI::tr("Genre:");
+-    ThemeUI::tr("Favorite:");
+-    ThemeUI::tr("Yes");
+-    ThemeUI::tr("No");
+-    ThemeUI::tr("Television");
+-    ThemeUI::tr("Main Menu");
+-    ThemeUI::tr("Gallery");
+-    ThemeUI::tr("Schedule");
+-    ThemeUI::tr("Programme Searches");
+-    ThemeUI::tr("CD/DVD Options");
+-    ThemeUI::tr("Media Library");
+-    ThemeUI::tr("Info Centre");
+-    ThemeUI::tr("P");
+-    ThemeUI::tr("S");
+-    ThemeUI::tr("Playing:");
+-    ThemeUI::tr("None");
+-    ThemeUI::tr("%|\"SUBTITLE|\"% %DESCRIPTION%");
+-    ThemeUI::tr("Change Displayed Groups");
++    ThemeUI::tr("Up Level");
++    ThemeUI::tr("Home");
++    ThemeUI::tr("Please Wait....");
++    ThemeUI::tr("%|\"SUBTITLE|\"% %STARS% %DESCRIPTION%");
++    ThemeUI::tr("Change View");
+     ThemeUI::tr("Show Titles");
+     ThemeUI::tr("Show Categories");
+     ThemeUI::tr("Show Recording Groups");
+     ThemeUI::tr("Show Watch List");
+     ThemeUI::tr("Show Searches");
+     ThemeUI::tr("Show LiveTV");
+-    ThemeUI::tr("Show Watched Recordings");
++    ThemeUI::tr("Show Watched Programs");
+     ThemeUI::tr("Save");
+     ThemeUI::tr("Change Recording Group Password");
+-    ThemeUI::tr("Old Password");
++    ThemeUI::tr("Old Password:");
+     ThemeUI::tr("New Password:");
+     ThemeUI::tr("OK");
+     ThemeUI::tr("Edit Recording Metadata");
+-    ThemeUI::tr("Title");
+-    ThemeUI::tr("Subtitle");
++    ThemeUI::tr("Title:");
++    ThemeUI::tr("Subtitle:");
++    ThemeUI::tr("Status Icons");
++    ThemeUI::tr("%LONGREPEAT%%YEARSTARS%%DESCRIPTION%");
+     ThemeUI::tr("Manual Recording Schedule");
+     ThemeUI::tr("Title (Optional):");
++    ThemeUI::tr("Channel:");
+     ThemeUI::tr("Date, or day of week:");
+     ThemeUI::tr("Start Time:");
+     ThemeUI::tr("Hour");
+@@ -253,17 +186,28 @@
+     ThemeUI::tr("Duration:");
+     ThemeUI::tr("Next");
+     ThemeUI::tr("Scheduled Recordings");
+-    ThemeUI::tr("Schedules Overview");
+-    ThemeUI::tr("First Conflict:");
+-    ThemeUI::tr("Filter:");
+-    ThemeUI::tr("You Haven't Scheduled Any Programs To Be Recorded\n To schedule a recording, exit this screen and Select 'Program Guide' or 'Program Finder'");
++    ThemeUI::tr("Showing:");
++    ThemeUI::tr("%|\"SUBTITLE|\"%\n%YEARSTARS%%DESCRIPTION%");
++    ThemeUI::tr("You Haven't Scheduled Any Programs To Be Recorded\n To schedule a recording, exit this screen and select 'Program Guide' or 'Program Finder'");
++    ThemeUI::tr("(1) All  (2) Important");
++    ThemeUI::tr("Channel Recording Priorities");
++    ThemeUI::tr("Source:");
+     ThemeUI::tr("Callsign:");
++    ThemeUI::tr("Priority:");
+     ThemeUI::tr("(1) Channel (2) Priority");
+     ThemeUI::tr("Schedule Priorities");
++    ThemeUI::tr("Priority");
+     ThemeUI::tr("Final");
+     ThemeUI::tr("Type Priority:");
+     ThemeUI::tr("Final Priority:");
+     ThemeUI::tr("(1) Title (2) Priority (4) Type");
++    ThemeUI::tr("Manage Recording Rules");
++    ThemeUI::tr("Channel");
++    ThemeUI::tr("Last Recorded");
++    ThemeUI::tr("Recording Group:");
++    ThemeUI::tr("Category:");
++    ThemeUI::tr("Storage Group:");
++    ThemeUI::tr("Recording Profile:");
+     ThemeUI::tr("Custom Priority Rules");
+     ThemeUI::tr("Existing Rules:");
+     ThemeUI::tr("Rule Name:");
+@@ -280,12 +224,18 @@
+     ThemeUI::tr("Optional title phrase:");
+     ThemeUI::tr("Optional subtitle phrase:");
+     ThemeUI::tr("Optional description phrase:");
+-    ThemeUI::tr("List Overview");
+-    ThemeUI::tr("Current View:");
+-    ThemeUI::tr("Position:");
+-    ThemeUI::tr("Program Details");
+-    ThemeUI::tr("Schedule Editor");
+-    ThemeUI::tr("Rule Overview");
++    ThemeUI::tr("Program Listings");
++    ThemeUI::tr("No listings found for this program.");
++    ThemeUI::tr("Program Details:");
++    ThemeUI::tr("Enter Search Text");
++    ThemeUI::tr("Close");
++    ThemeUI::tr("%|\"SUBTITLE|\"%\n%LONGREPEAT%%STARS| %%DESCRIPTION%");
++    ThemeUI::tr("Search For:");
++    ThemeUI::tr("Custom Record Rules");
++    ThemeUI::tr("Additional Tables:");
++    ThemeUI::tr("Record");
++    ThemeUI::tr("Store");
++    ThemeUI::tr("%|\"SUBTITLE|\"% %LONGREPEAT%%STARS| %%DESCRIPTION%");
+     ThemeUI::tr("Select the recording rule");
+     ThemeUI::tr("Schedule Options");
+     ThemeUI::tr("Storage Options");
+@@ -306,74 +256,155 @@
+     ThemeUI::tr("No episode limit");
+     ThemeUI::tr("Keep at most %n episode(s)", 0, 1);
+     ThemeUI::tr("Allow recordings to expire?");
+-    ThemeUI::tr("Post-Processing Options");
+     ThemeUI::tr("Commercial Flag new recordings");
+     ThemeUI::tr("Transcode new recordings");
+-    ThemeUI::tr("123");
+-    ThemeUI::tr("Search For:");
+-    ThemeUI::tr("%SUBTITLE|\"|\" %%REPEAT%%STARS%%DESCRIPTION%");
+-    ThemeUI::tr("Search Results");
+-    ThemeUI::tr("Cast Members");
+-    ThemeUI::tr("Full Plot");
+-    ThemeUI::tr("Video List Filters");
+-    ThemeUI::tr("Text Filter:");
+-    ThemeUI::tr("Category");
+-    ThemeUI::tr("Genre");
+-    ThemeUI::tr("Country");
+-    ThemeUI::tr("Actor/Actress");
+-    ThemeUI::tr("Year");
+-    ThemeUI::tr("Runtime");
+-    ThemeUI::tr("User Rating");
+-    ThemeUI::tr("Browse");
+-    ThemeUI::tr("InetRef");
+-    ThemeUI::tr("Cover File");
+-    ThemeUI::tr("Sort by");
+-    ThemeUI::tr("Watched");
+-    ThemeUI::tr("Make default");
+-    ThemeUI::tr("Video Manager");
++    ThemeUI::tr("A blue theme.");
++    ThemeUI::tr("Directed by:");
++    ThemeUI::tr("Year:");
++    ThemeUI::tr("User Rating:");
++    ThemeUI::tr("Runtime:");
++    ThemeUI::tr("Done");
++    ThemeUI::tr("Play");
++    ThemeUI::tr("No videos in library, or no files found.  If you have configured a video directory, press \"M\" (or the MENU key) and select \"Scan for Changes.\"");
+     ThemeUI::tr("Director:");
+-    ThemeUI::tr("Parental:");
++    ThemeUI::tr("Rated:");
++    ThemeUI::tr("Parental Level:");
+     ThemeUI::tr("Lowest");
+     ThemeUI::tr("Low");
+     ThemeUI::tr("Medium");
+     ThemeUI::tr("High");
+-    ThemeUI::tr("Rated:");
+     ThemeUI::tr("Browsable:");
+-    ThemeUI::tr("Runtime:");
++    ThemeUI::tr("Plot:");
+     ThemeUI::tr("Filename:");
+     ThemeUI::tr("Cover File:");
+-    ThemeUI::tr("IMDB ID:");
+-    ThemeUI::tr("Video Browser");
+-    ThemeUI::tr("Videos - Gallery");
+-    ThemeUI::tr("Videos - Tree");
++    ThemeUI::tr("Video Num.:");
++    ThemeUI::tr("Directed by");
++    ThemeUI::tr("Runtime");
++    ThemeUI::tr("Year");
++    ThemeUI::tr("User Rating");
+     ThemeUI::tr("Parental Level");
+-    ThemeUI::tr("Video File Associations");
++    ThemeUI::tr("MythVideo File Associations");
+     ThemeUI::tr("Extension:");
+     ThemeUI::tr("Command:");
+     ThemeUI::tr("Use default player:");
+     ThemeUI::tr("Ignore:");
+-    ThemeUI::tr("Edit Video Metadata");
+-    ThemeUI::tr("Title:");
+-    ThemeUI::tr("Subtitle:");
++    ThemeUI::tr("New");
++    ThemeUI::tr("Edit Video Information");
+     ThemeUI::tr("Season:");
+     ThemeUI::tr("Episode:");
+-    ThemeUI::tr("Category:");
+     ThemeUI::tr("Parental Control:");
+     ThemeUI::tr("File to Always Play Next:");
+     ThemeUI::tr("Include while Browsing:");
+-    ThemeUI::tr("Item has been Watched:");
++    ThemeUI::tr("Item has been watched:");
+     ThemeUI::tr("Cover Art:");
+     ThemeUI::tr("Screenshot:");
+     ThemeUI::tr("Banner:");
+     ThemeUI::tr("Fanart:");
+     ThemeUI::tr("Trailer:");
+     ThemeUI::tr("Unique Player Command:");
+-    ThemeUI::tr("Directed by:");
+-    ThemeUI::tr("Play");
++    ThemeUI::tr("/path/to/the/thing.jpg");
++    ThemeUI::tr("Filters video list");
++    ThemeUI::tr("Text Filter:");
++    ThemeUI::tr("Category :");
++    ThemeUI::tr("Genre :");
++    ThemeUI::tr("Country :");
++    ThemeUI::tr("Actor/Actress :");
++    ThemeUI::tr("Year :");
++    ThemeUI::tr("Runtime :");
++    ThemeUI::tr("User Rating :");
++    ThemeUI::tr("Browse :");
++    ThemeUI::tr("InetRef :");
++    ThemeUI::tr("Cover File :");
++    ThemeUI::tr("Sort by :");
++    ThemeUI::tr("Watched :");
++    ThemeUI::tr("Result");
++    ThemeUI::tr("Save as default");
++    ThemeUI::tr("Heading");
++    ThemeUI::tr("Playback starting …");
++    ThemeUI::tr("Bookmark Manager");
++    ThemeUI::tr("Web Page");
++    ThemeUI::tr("Icon Importer");
++    ThemeUI::tr("Search terms:");
++    ThemeUI::tr("Search");
++    ThemeUI::tr("Skip");
++    ThemeUI::tr("List Options");
++    ThemeUI::tr("Sort By:");
++    ThemeUI::tr("Hide Channels without channel number.");
++    ThemeUI::tr("Delete All");
++    ThemeUI::tr("Global Options");
++    ThemeUI::tr("Channel Scan");
++    ThemeUI::tr("Icon Download");
++    ThemeUI::tr("Edit Transports");
++    ThemeUI::tr("Image Gallery");
++    ThemeUI::tr("No images found in configured directory.  Are you sure you have set up the plugin properly?");
++    ThemeUI::tr("Play Games");
++    ThemeUI::tr("System:");
++    ThemeUI::tr("Genre:");
++    ThemeUI::tr("Favorite:");
++    ThemeUI::tr("Yes");
++    ThemeUI::tr("No");
++    ThemeUI::tr("Emulator:");
++    ThemeUI::tr("Television");
++    ThemeUI::tr("Main Menu");
++    ThemeUI::tr("Gallery");
++    ThemeUI::tr("Schedule");
++    ThemeUI::tr("Programme Searches");
++    ThemeUI::tr("CD/DVD Options");
++    ThemeUI::tr("Media Library");
++    ThemeUI::tr("Info Centre");
++    ThemeUI::tr("P");
++    ThemeUI::tr("S");
++    ThemeUI::tr("Playing:");
++    ThemeUI::tr("None");
++    ThemeUI::tr("Internet Video Browser");
++    ThemeUI::tr("No sites configured!");
++    ThemeUI::tr("Videos - Gallery");
++    ThemeUI::tr("Videos - Tree");
++    ThemeUI::tr("%|\"SUBTITLE|\"% %DESCRIPTION%");
++    ThemeUI::tr("Change Displayed Groups");
++    ThemeUI::tr("Show Watched Recordings");
++    ThemeUI::tr("Old Password");
++    ThemeUI::tr("Title");
++    ThemeUI::tr("Subtitle");
++    ThemeUI::tr("Schedules Overview");
++    ThemeUI::tr("First Conflict:");
++    ThemeUI::tr("Filter:");
++    ThemeUI::tr("Recording Rule Priorities");
++    ThemeUI::tr("Type");
++    ThemeUI::tr("List Overview");
++    ThemeUI::tr("Current View:");
++    ThemeUI::tr("Position:");
++    ThemeUI::tr("Program Details");
++    ThemeUI::tr("Schedule Editor");
++    ThemeUI::tr("Rule Overview");
++    ThemeUI::tr("Post-Processing Options");
++    ThemeUI::tr("This screen displays the status of various system components");
++    ThemeUI::tr("Search Results");
++    ThemeUI::tr("Cast Members");
++    ThemeUI::tr("Full Plot");
++    ThemeUI::tr("Video List Filters");
++    ThemeUI::tr("Category");
++    ThemeUI::tr("Genre");
++    ThemeUI::tr("Country");
++    ThemeUI::tr("Actor/Actress");
++    ThemeUI::tr("Browse");
++    ThemeUI::tr("InetRef");
++    ThemeUI::tr("Cover File");
++    ThemeUI::tr("Sort by");
++    ThemeUI::tr("Watched");
++    ThemeUI::tr("Make default");
++    ThemeUI::tr("Video Manager");
++    ThemeUI::tr("Parental:");
++    ThemeUI::tr("IMDB ID:");
++    ThemeUI::tr("Video Browser");
++    ThemeUI::tr("Video File Associations");
++    ThemeUI::tr("Edit Video Metadata");
++    ThemeUI::tr("Item has been Watched:");
+     ThemeUI::tr("Change mythtv key bindings.");
+     ThemeUI::tr("MythStream Settings");
+     ThemeUI::tr("Weather Station Settings");
+     ThemeUI::tr("TV");
++    ThemeUI::tr("Internet Video");
+     ThemeUI::tr("Play Online Streams");
+     ThemeUI::tr("Weather Station");
+     ThemeUI::tr("A long menu which breaks down the options by their category. TV, Music, Video etc");
+@@ -386,75 +417,70 @@
+     ThemeUI::tr("1280 x 720");
+     ThemeUI::tr("0 x 0");
+     ThemeUI::tr("1 pixel");
+-    ThemeUI::tr("Up Level");
+-    ThemeUI::tr("Home");
+-    ThemeUI::tr("Please Wait....");
+     ThemeUI::tr("Sort Mode:");
+     ThemeUI::tr("Video Source:");
+     ThemeUI::tr("Contexts");
+     ThemeUI::tr("Actions");
+-    ThemeUI::tr("%|\"SUBTITLE|\"% %STARS% %DESCRIPTION%");
+-    ThemeUI::tr("Change View");
+-    ThemeUI::tr("Show Watched Programs");
+-    ThemeUI::tr("Old Password:");
+-    ThemeUI::tr("Status Icons");
+-    ThemeUI::tr("%LONGREPEAT%%YEARSTARS%%DESCRIPTION%");
+-    ThemeUI::tr("%|\"SUBTITLE|\"%\n%YEARSTARS%%DESCRIPTION%");
+-    ThemeUI::tr("You Haven't Scheduled Any Programs To Be Recorded\n To schedule a recording, exit this screen and select 'Program Guide' or 'Program Finder'");
+-    ThemeUI::tr("Manage Recording Rules");
+-    ThemeUI::tr("Channel");
+-    ThemeUI::tr("Last Recorded");
+-    ThemeUI::tr("Recording Group:");
+-    ThemeUI::tr("Storage Group:");
+-    ThemeUI::tr("Recording Profile:");
+-    ThemeUI::tr("Program Details:");
+-    ThemeUI::tr("Enter Search Text");
+-    ThemeUI::tr("Close");
+-    ThemeUI::tr("%|\"SUBTITLE|\"%\n%LONGREPEAT%%STARS| %%DESCRIPTION%");
+-    ThemeUI::tr("Custom Record Rules");
+-    ThemeUI::tr("Additional Tables:");
+-    ThemeUI::tr("Record");
+-    ThemeUI::tr("Store");
+-    ThemeUI::tr("%|\"SUBTITLE|\"% %LONGREPEAT%%STARS| %%DESCRIPTION%");
++    ThemeUI::tr("Preview Schedule Changes");
++    ThemeUI::tr("You Haven't Scheduled Any Programs To Be Recorded");
+     ThemeUI::tr("Details");
+-    ThemeUI::tr("This screen displays the status of various system components");
++    ThemeUI::tr("Welcome to MythTV");
++    ThemeUI::tr("MythTV is idle and will shutdown shortly.");
++    ThemeUI::tr("Current Recording(s)");
++    ThemeUI::tr("Retrieving Recording Status ...");
++    ThemeUI::tr("Next Scheduled Recording(s)");
++    ThemeUI::tr("Retrieving Scheduled Recordings ...");
++    ThemeUI::tr("WARNING: There are conflicting scheduled recordings!");
++    ThemeUI::tr("Start Frontend");
++    ThemeUI::tr("(1)Time (2)Title");
++    ThemeUI::tr("Sample Clauses:");
+     ThemeUI::tr("Run User Job #1");
+     ThemeUI::tr("Run User job #2");
+     ThemeUI::tr("Run User Job #3");
+     ThemeUI::tr("Run User Job #4");
+-    ThemeUI::tr("Make or accept a VoIP call");
+     ThemeUI::tr("Keep up with the news");
++    ThemeUI::tr("Twitter");
++    ThemeUI::tr("Send and receive tweets");
+     ThemeUI::tr("See when local movies are playing");
+     ThemeUI::tr("Local weather forecast");
+     ThemeUI::tr("Manage your NetFlix queue");
+     ThemeUI::tr("Browse the web");
+     ThemeUI::tr("Start cooking!");
++    ThemeUI::tr("See what your system is doing");
+     ThemeUI::tr("Home surveillance");
+     ThemeUI::tr("Hardware profile");
+     ThemeUI::tr("Tell us what hardware you have so we can support it");
+-    ThemeUI::tr("Play recordings");
++    ThemeUI::tr("Browse your recordings");
+     ThemeUI::tr("Watch Videos");
+-    ThemeUI::tr("Play videos");
++    ThemeUI::tr("Browse your video library");
+     ThemeUI::tr("Listen to Music");
++    ThemeUI::tr("Browse your music library");
+     ThemeUI::tr("Listen to the radio");
+-    ThemeUI::tr("Image Gallery");
++    ThemeUI::tr("Search Internet Video");
++    ThemeUI::tr("Search popular video sites");
++    ThemeUI::tr("Browse Internet Video");
++    ThemeUI::tr("Browse highlights and entire sites");
+     ThemeUI::tr("Look at Pictures");
+     ThemeUI::tr("Play video games");
++    ThemeUI::tr("Pick the theme, font, size, and locale");
+     ThemeUI::tr("Media Settings");
+     ThemeUI::tr("Settings for all non-TV media");
+     ThemeUI::tr("Info Center Settings");
+     ThemeUI::tr("Configure weather, news, movie info, web, and recipes");
++    ThemeUI::tr("System Event Handlers");
++    ThemeUI::tr("Configure System Event handler commands");
+     ThemeUI::tr("Play any of your media");
+     ThemeUI::tr("Manage Recordings");
+-    ThemeUI::tr("Pick and prioritize shows to record");
++    ThemeUI::tr("Pick and prioritize recordings");
+     ThemeUI::tr("Information Center");
+     ThemeUI::tr("Information and Communications");
+     ThemeUI::tr("Optical Disks");
+     ThemeUI::tr("Play or import CDs and DVDs");
+     ThemeUI::tr("Configure MythTV and plugins");
++    ThemeUI::tr("See what you have recorded");
+     ThemeUI::tr("Set Priorities");
+     ThemeUI::tr("Play DVD");
+-    ThemeUI::tr("Play the video on a movie DVD");
++    ThemeUI::tr("Play a film on DVD");
+     ThemeUI::tr("Play VCD");
+     ThemeUI::tr("Play the video on a VCD");
+     ThemeUI::tr("Import DVD");
+@@ -464,23 +490,23 @@
+     ThemeUI::tr("Import music from an audio CD");
+     ThemeUI::tr("Eject media");
+     ThemeUI::tr("Eject CD or DVD from drive");
++    ThemeUI::tr("Prioritize some channels over others");
++    ThemeUI::tr("Prioritize some recordings over others");
++    ThemeUI::tr("Choose which menu options appear during playback");
++    ThemeUI::tr("Group your favorite channels together");
++    ThemeUI::tr("Change the quality of your recordings");
+     ThemeUI::tr("Music Tools");
+     ThemeUI::tr("Select, import, or play music");
+-    ThemeUI::tr("Scan for new videos, edit metadata, or delete");
+-    ThemeUI::tr("%SUBTITLE%%BR%%DESCRIPTION%");
+-    ThemeUI::tr("%DESCRIPTION%");
+-    ThemeUI::tr("%STARTDATE%");
+-    ThemeUI::tr("Callsign");
+-    ThemeUI::tr("Channel #");
+-    ThemeUI::tr("Channel Name");
+-    ThemeUI::tr("XMLTV ID");
+-    ThemeUI::tr("[P]robe");
+-    ThemeUI::tr("[O]k");
+-    ThemeUI::tr("%DESCRIPTION%%BR%(%STARTTIME% - %LENMINS%)");
++    ThemeUI::tr("Change MythTV key bindings.");
+     ThemeUI::tr("%CALLSIGN% - %CHANNUM%");
+-    ThemeUI::tr("A simple transparent black and white theme.");
++    ThemeUI::tr("(%STARTDATE% %STARTTIME% - %ENDTIME%)  %LENMINS%");
++    ThemeUI::tr("A very simple blue and black theme.");
++    ThemeUI::tr("Pick and prioritize shows to record");
+     ThemeUI::tr("Play or import audio or video CDs or DVDs");
++    ThemeUI::tr("Play recordings");
++    ThemeUI::tr("Play videos");
+     ThemeUI::tr("Watch A DVD");
++    ThemeUI::tr("Play the video on a movie DVD");
+     ThemeUI::tr("Watch Live TV");
+     ThemeUI::tr("Watch Online Streams");
+     ThemeUI::tr("Plugins");

Added: trunk/fr_FR/diffs/patch_fr_temp_combinee.diff
===================================================================
--- trunk/fr_FR/diffs/patch_fr_temp_combinee.diff	                        (rev 0)
+++ trunk/fr_FR/diffs/patch_fr_temp_combinee.diff	2010-02-09 23:56:30 UTC (rev 170)
@@ -0,0 +1,106 @@
+Index: mythplugins/mythnetvision/i18n/themestrings.h
+===================================================================
+--- mythplugins/mythnetvision/i18n/themestrings.h	(revision 23357)
++++ mythplugins/mythnetvision/i18n/themestrings.h	(working copy)
+@@ -1,4 +1,29 @@
+ void strings_null() {
++    ThemeUI::tr("Search Term:");
++    ThemeUI::tr("Author: %1");
++    ThemeUI::tr("Size: %1");
++    ThemeUI::tr("Description: %1");
++    ThemeUI::tr("Can't find any search scripts!  This usually indicates missing search script prerequisites.  Try running a script from the command line.");
++    ThemeUI::tr("Manage Site Subscriptions");
++    ThemeUI::tr("Edit");
++    ThemeUI::tr("New");
++    ThemeUI::tr("Remove");
++    ThemeUI::tr("Manage RSS Subscriptions");
++    ThemeUI::tr("Feed Name:");
++    ThemeUI::tr("Feed URL:");
++    ThemeUI::tr("Site Description:");
++    ThemeUI::tr("Feed Author:");
++    ThemeUI::tr("Download this feed automatically");
++    ThemeUI::tr("Choose Image");
+     ThemeUI::tr("Cancel");
+-    ThemeUI::tr("Ok");
++    ThemeUI::tr("Save");
++    ThemeUI::tr("Posted: %1");
++    ThemeUI::tr("You haven't added any Sites/RSS Feeds yet!  To add a site, press MENU, then choose \"Scan/Manage Subscriptions,\" then \"Manage Site Subscriptions.\"");
++    ThemeUI::tr("Runtime");
++    ThemeUI::tr("Author");
++    ThemeUI::tr("Rating");
++    ThemeUI::tr("Search Internet Video");
++    ThemeUI::tr("Search popular video sites");
++    ThemeUI::tr("Browse Internet Video");
++    ThemeUI::tr("Browse highlights and entire sites");
+ }
+
+Index: mythplugins/mythnetvision/i18n/translate.pro
+===================================================================
+--- mythplugins/mythnetvision/i18n/translate.pro	(revision 23357)
++++ mythplugins/mythnetvision/i18n/translate.pro	(working copy)
+@@ -2,3 +2,4 @@
+ SOURCES += ../mythnetvision/*.h
+ SOURCES += ./themestrings.h
+ 
++TRANSLATIONS  = mythnetvision_fr.ts 
+
+Index: mythplugins/mythnetvision/i18n/i18n.pro
+===================================================================
+--- mythplugins/mythnetvision/i18n/i18n.pro	(revision 23357)
++++ mythplugins/mythnetvision/i18n/i18n.pro	(working copy)
+@@ -5,6 +5,7 @@
+ CONFIG -= moc qt
+ 
+ trans.path = $${PREFIX}/share/mythtv/i18n/
++trans.files += mythnetvision_fr.qm 
+ 
+ INSTALLS += trans
+
+Index: mythplugins/mythmovies/i18n/translate.pro
+===================================================================
+--- mythplugins/mythmovies/i18n/translate.pro	(revision 23321)
++++ mythplugins/mythmovies/i18n/translate.pro	(working copy)
+@@ -2,4 +2,4 @@
+ SOURCES += ../mythmovies/*.h
+ SOURCES += ./themestrings.h
+ 
+-TRANSLATIONS = mythmovies_sv.ts mythmovies_hu.ts
++TRANSLATIONS = mythmovies_sv.ts mythmovies_hu.ts mythmovies_fr.ts
+
+Index: mythplugins/mythmovies/i18n/i18n.pro
+===================================================================
+--- mythplugins/mythmovies/i18n/i18n.pro	(revision 23321)
++++ mythplugins/mythmovies/i18n/i18n.pro	(working copy)
+@@ -5,7 +5,7 @@
+ CONFIG -= moc qt
+ 
+ trans.path = $${PREFIX}/share/mythtv/i18n/
+-trans.files += mythmovies_sv.qm mythmovies_hu.qm
++trans.files += mythmovies_sv.qm mythmovies_hu.qm mythmovies_fr.qm
+ 
+ INSTALLS += trans
+
+Index: mythplugins/mythzoneminder/i18n/translate.pro
+===================================================================
+--- mythplugins/mythzoneminder/i18n/translate.pro	(revision 23264)
++++ mythplugins/mythzoneminder/i18n/translate.pro	(working copy)
+@@ -2,4 +2,4 @@
+ SOURCES += ../mythzoneminder/*.h
+ SOURCES += ./themestrings.h
+ 
+-TRANSLATIONS = mythzoneminder_sv.ts mythzoneminder_hu.ts
++TRANSLATIONS = mythzoneminder_sv.ts mythzoneminder_hu.ts mythzoneminder_fr.ts
+
+Index: mythplugins/mythzoneminder/i18n/i18n.pro
+===================================================================
+--- mythplugins/mythzoneminder/i18n/i18n.pro	(revision 23264)
++++ mythplugins/mythzoneminder/i18n/i18n.pro	(working copy)
+@@ -5,7 +5,7 @@
+ CONFIG -= moc qt
+ 
+ trans.path = $${PREFIX}/share/mythtv/i18n/
+-trans.files += mythzoneminder_sv.qm mythzoneminder_hu.qm
++trans.files += mythzoneminder_sv.qm mythzoneminder_hu.qm mythzoneminder_fr.qm
+ 
+ INSTALLS += trans
+ 


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/