merged trunk into lua branch

plugin loading is disabled atm because of a bug reading the files (lua may be the reason). 
Reading the files in usdx and passing the contents to lua may solve this

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2019 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 100 insertions, 9 deletions

diff --git a/Lua/game/languages/English.ini b/Lua/game/languages/English.ini
index 05559c1a..243415fb 100644
--- a/Lua/game/languages/English.ini
+++ b/Lua/game/languages/English.ini
@@ -1,4 +1,80 @@
-[Text]
+[Text]
+OPTION_VALUE_CATALAN=Catalan
+OPTION_VALUE_CROATIAN=Croatian
+OPTION_VALUE_DUTCH=Dutch
+OPTION_VALUE_ENGLISH=English
+OPTION_VALUE_EUSKARA=Euskara
+OPTION_VALUE_FINNISH=Finnish
+OPTION_VALUE_FRENCH=French
+OPTION_VALUE_GERMAN=German
+OPTION_VALUE_GREEK=Greek
+OPTION_VALUE_ITALIAN=Italian
+OPTION_VALUE_JAPANESE=Japanese
+OPTION_VALUE_LUXEMBOURGISH=Luxembourgish
+OPTION_VALUE_PORTUGUESE=Portuguese
+OPTION_VALUE_SPANISH=Spanish
+OPTION_VALUE_SWEDISH=Swedish
+
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BLACK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=Loading...
 
 SING_CHOOSE_MODE=choose mode
@@ -157,6 +233,7 @@ SING_SCORE_ULTRASTAR=Ultrastar
 SING_TOP_5_CHARTS=top 5 Players
 SING_TOP_5_CHARTS_WHEREAMI=top 5
 SING_TOP_5_CHARTS_CONTINUE=to song selection
+SING_TOP_5_CHARTS_SWITCH_DIFFICULTY=switch difficulty
 
 POPUP_PERFECT=perfect!
 POPUP_AWESOME=awesome!
@@ -167,8 +244,8 @@ POPUP_BAD=bad!
 POPUP_POOR=poor!
 POPUP_AWFUL=awful!
 
-IMPLODE_GLUE1=, 
-IMPLODE_GLUE2= and 
+IMPLODE_GLUE1=,
+IMPLODE_GLUE2= and
 
 SONG_MENU_NAME_MAIN=song menu
 SONG_MENU_PLAY=Sing
@@ -190,7 +267,7 @@ SONG_MENU_NAME_PLAYLIST_NEW=New Playlist
 SONG_MENU_PLAYLIST_NEW_CREATE=Create
 SONG_MENU_PLAYLIST_NEW_UNNAMED=Unnamed
 
-SONG_MENU_NAME_PLAYLIST_DEL=Really Delete?
+SONG_MENU_NAME_PLAYLIST_DELITEM=Really Delete?
 SONG_MENU_YES=Yes
 SONG_MENU_NO=No
 
@@ -241,8 +318,8 @@ PARTY_ROUND_DESC=next players to the mics
 PARTY_ROUND_WHEREAMI=Party Next Round
 PARTY_ROUND_LEGEND_CONTINUE=start round
 
-PARTY_SONG_WHEREAMI=Party Song-Selection 	 
-PARTY_SONG_LEGEND_CONTINUE=sing 	 
+PARTY_SONG_WHEREAMI=Party Song-Selection
+PARTY_SONG_LEGEND_CONTINUE=sing
 PARTY_SONG_MENU=party menu
 
 PARTY_SCORE_DESC=score of the last round
@@ -259,7 +336,7 @@ PARTY_NOBODY=nobody
 NEXT_ROUND=Next round:
 
 PARTY_DISMISSED=Dismissed!
-PARTY_SCORE_WINS=%s 
+PARTY_SCORE_WINS=%s
 PARTY_SCORE_WINS2=wins!
 
 PLUGIN_HDL_NAME=Hold the Line
@@ -285,6 +362,8 @@ STAT_OVERVIEW_INTRO=%0:s Statistics.  \n Last Reset at %2:.2d.%1:.2d.%3:d
 STAT_OVERVIEW_SONG=%0:d Songs(%3:d with Video), whereof %1:d already were played  and %2:d were not played yet.\n The most popular Song is %5:s from %4:s.
 STAT_OVERVIEW_PLAYER=Since the last Reset there were/was %0:d different Player(s).\n The best Player is %1:s with an average Score of %2:d Points.\n %3:s did the highest Score with %4:d Points.
 
+STAT_FORMAT_DATE=%1:.2d.%0:.2d.%2:d
+
 STAT_DETAIL=Statistics
 STAT_DETAIL_WHEREAMI=Detail Statistics
 
@@ -295,7 +374,7 @@ STAT_PAGE=Seite %0:d of %1:d Pages\n (%2:d of %3:d Entrys)
 
 STAT_DESC_SCORES=HighScores
 STAT_DESC_SCORES_REVERSED=LowScores
-STAT_FORMAT_SCORES=%0:s - %1:d  [%2:s] \n (%3:s - %4:s)
+STAT_FORMAT_SCORES=%0:s - %1:d  [%2:s]  %5:s \n (%3:s - %4:s)
 
 STAT_DESC_SINGERS=Best Singers
 STAT_DESC_SINGERS_REVERSED=Worst Singers
@@ -309,10 +388,22 @@ STAT_DESC_BANDS=Most popular Bands
 STAT_DESC_BANDS_REVERSED=Least popular Bands
 STAT_FORMAT_BANDS=%0:s \n %1:dx Sung
 
+SCREENSHOT_SAVED=Screenshot saved
+SCREENSHOT_FAILED=Couldn''t save screenshot
+
+INFO_FILE_SAVED=File saved
+ERROR_SAVE_FILE_FAILED=Couldn''t save file 
+ERROR_FILE_NOT_FOUND=File not found
+
+ENCODING_ERROR_ASK_FOR_UTF8=Cannot save changes in current encoding. Convert to UTF-8?
+EDITOR_ERROR_NO_TRACK_SELECTED=No track selected
+
 MSG_ERROR_TITLE=Error
+MSG_INFO_TITLE=Information
 MSG_QUESTION_TITLE=Question
 MSG_QUIT_USDX=Really leave UltraStar?
-MSG_END_PARTY=Really end Party Mode?
+MSG_END_PARTY=Really leave Party Mode?
+
 ERROR_NO_SONGS=No Songs loaded
 ERROR_NO_PLUGINS=No Plugins loaded
 ERROR_CORRUPT_SONG=Song could not be loaded.