aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--game/languages/French.ini13
-rw-r--r--game/languages/Italian.ini12
-rw-r--r--game/languages/readme.txt38
-rw-r--r--src/screens/UScreenEdit.pas70
4 files changed, 50 insertions, 83 deletions
diff --git a/game/languages/French.ini b/game/languages/French.ini
index 2a1bdf4a..8a841fab 100644
--- a/game/languages/French.ini
+++ b/game/languages/French.ini
@@ -92,6 +92,18 @@ SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=Compteur de titres chantés
SING_OPTIONS_ADVANCED_ONSONGCLICK=Choix ap. chanson
SING_OPTIONS_ADVANCED_PARTYPOPUP=Menu multi auto
+SING_EDIT=Éditeur
+SING_EDIT_MENU_DESCRIPTION=Créer vos propre chansons
+
+SING_EDIT_BUTTON_DESCRIPTION_CONVERT=Importer texte à une dossier de midi file
+SING_EDIT_BUTTON_DESCRIPTION_EXIT=Retour
+SING_EDIT_BUTTON_CONVERT=Importer
+SING_EDIT_BUTTON_EXIT=Retour
+
+SING_EDIT_NAVIGATE=Naviguer
+SING_EDIT_SELECT=Valider
+SING_EDIT_EXIT=Retour
+
SING_LEGEND_SELECT=Valider
SING_LEGEND_NAVIGATE=Naviguer
SING_LEGEND_CONTINUE=Valider
@@ -179,7 +191,6 @@ SONG_MENU_NO=Non
SONG_MENU_NAME_PLAYLIST_DEL=Supprimer la playlist ?
-
SONG_MENU_NAME_PLAYLIST_LOAD=Ouvrir une playlist
SONG_MENU_PLAYLIST_LOAD=Ouvrir
SONG_MENU_PLAYLIST_DELCURRENT=Supprimer la playlist actuel
diff --git a/game/languages/Italian.ini b/game/languages/Italian.ini
index 669deedb..1d319203 100644
--- a/game/languages/Italian.ini
+++ b/game/languages/Italian.ini
@@ -92,6 +92,18 @@ SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=
SING_OPTIONS_ADVANCED_ONSONGCLICK=se Sel. Canzone
SING_OPTIONS_ADVANCED_PARTYPOPUP=Auto MenuParty
+SING_EDIT=editor
+SING_EDIT_MENU_DESCRIPTION=crea nuove canzoni
+
+SING_EDIT_BUTTON_DESCRIPTION_CONVERT=importa il testo da uno schedario di midi
+SING_EDIT_BUTTON_DESCRIPTION_EXIT=indietro
+SING_EDIT_BUTTON_CONVERT=importa
+SING_EDIT_BUTTON_EXIT=indietro
+
+SING_EDIT_NAVIGATE=naviga
+SING_EDIT_SELECT=seleziona
+SING_EDIT_EXIT=indietro
+
SING_LEGEND_SELECT=seleziona
SING_LEGEND_NAVIGATE=naviga
SING_LEGEND_CONTINUE=continua
diff --git a/game/languages/readme.txt b/game/languages/readme.txt
index 270406dc..83ba6cd6 100644
--- a/game/languages/readme.txt
+++ b/game/languages/readme.txt
@@ -1,24 +1,22 @@
-.o0 Ultrastar Deluxe in your Language 0o.
+.o0 Ultrastar Deluxe in your language 0o.
-----------------------
Table of Contents
-----------------------
1. Introduction
-2. Statistic Wild-Cards
-3. Texts to Add
-
-
+2. Statistic wildcards
+3. Texts to add
-----------------------
1. Introduction:
-----------------------
-To translate USD to a new language, take the English Language File, or another one that is up to date and Edit the Texts behind the Equal Mark(=).
+To translate USD to a new language, take the English language file, or another one that is up to date and edit the texts behind the equal mark(=).
-----------------------
2. Statistic Wild-Cards:
-----------------------
-Here are some Information about the Wild-Cars in the Language Texts for the Statistic Screens (STAT_...):
-Information that will replace the Wild-Cards:
+Here are some informations about the wildcards in the language texts for the statistic screens (STAT_...):
+Information that will replace the wildcards:
STAT_OVERVIEW_INTRO:
Format:
@@ -68,19 +66,19 @@ STAT_FORMAT_BANDS:
%0:s Artist Name
%1:d Times Sung
-Some further Explantation about the Wild-Cards:
+Some further explanations about the wildcards:
%x:[.y]z
-Where X is the Number of the Wildcard,
-Y is optional, it is the number of digits for Decimal Numbers (Z=d). So if y is 2 there and the number is only 0 to 9 there will be a Zero added in front of the number.
-z can be d for Numbers and s for texts
+Where X is the number of the wildcard,
+Y is optional, it is the number of digits for deciaml numbers (Z=d). So, if y is 2 there and the number is only 0 to 9 there will be a zero added in front of the number.
+z can be d for numbers and s for texts
-For the date thing in STAT_OVERVIEW_INTRO you may use %1:.2d for the day and %2:.2d for the Month.
+For the date thing in STAT_OVERVIEW_INTRO you may use %1:.2d for the day and %2:.2d for the month.
-----------------------
3. Texts to Add:
-----------------------
-To port a LanguageFile from Ultrastar 0.5.2 or Higher add the following Texts to the end of the file:
+To port a language file from Ultrastar 0.5.2 or higher add the following texts to the end of the file:
#Main Screen
SING_MENU=Main Menu
@@ -126,17 +124,17 @@ POPUP_BAD=bad!
POPUP_POOR=poor!
POPUP_AWFUL=awful!
-#To connect Strigns with, e.g.: He, you and I
+#To connect strings with, e.g.: He, you and I
IMPLODE_GLUE1=,
IMPLODE_GLUE2= and
#Song Screen Legend
PLAYLIST_CATTEXT=Playlist: %s
-#Text for the Legend Bar at the bottom
+#Text for the legend bar at the bottom
SING_LEGEND_CONTINUE=Continue
-#Texts of the Menu that appears when M is Pressed at the SongSelection
+#Texts of the menu that appears when M is pressed at the song selection
SONG_MENU_NAME_MAIN=Song Menu
SONG_MENU_PLAY=Sing
SONG_MENU_EDIT=Edit
@@ -181,7 +179,7 @@ SONG_MENU_JOKER=Joker
SONG_MENU_NAME_PARTY_JOKER=take Joker
-#Texts of the jumpto Window
+#Texts of the jump to window
SONG_JUMPTO_DESC=Jump to Song
SONG_JUMPTO_TYPE_DESC=Search for:
SONG_JUMPTO_TYPE1=All
@@ -233,7 +231,7 @@ PARTY_SCORE_WINS2=wins!
PARTY_SONG_WHEREAMI=Party Song-Selection
PARTY_SONG_LEGEND_CONTINUE=Party-Menu
-#Texts that descripts Plugins or Modis
+#Texts describing Plugins or Modi
PLUGIN_HDL_NAME=Hold the Line
PLUGIN_HDL_DESC=Don't get worse than the pointer at the rating bar shows you.
PLUGIN_UNTIL5000_NAME=Until 5000
@@ -246,7 +244,7 @@ PLUGIN_TEAMDUELL_NAME=Team Duell
PLUGIN_TEAMDUELL_DESC=Pass The Mic!
#Statistics Screen
-#For more Info about the Format Strings look at the SorceCode (UScreenStatMain)
+#For more info about the format strings look at the source code (UScreenStatMain)
STAT_MAIN=Statistics
STAT_MAIN_DESC=General
STAT_MAIN_WHEREAMI=Statistics
diff --git a/src/screens/UScreenEdit.pas b/src/screens/UScreenEdit.pas
index 7ad39c45..d255c6ac 100644
--- a/src/screens/UScreenEdit.pas
+++ b/src/screens/UScreenEdit.pas
@@ -41,12 +41,6 @@ uses
type
TScreenEdit = class(TMenu)
public
-{
- Tex_Background: TTexture;
- FadeOut: boolean;
- Path: string;
- FileName: string;
-}
TextDescription: integer;
TextDescriptionLong: integer;
@@ -59,10 +53,6 @@ type
procedure InteractInc; override;
procedure InteractDec; override;
procedure SetAnimationProgress(Progress: real); override;
-{
- function Draw: boolean; override;
- procedure Finish;
-}
end;
implementation
@@ -101,7 +91,6 @@ begin
begin
AudioPlayback.PlaySound(SoundLib.Back);
FadeTo(@ScreenMain);
-// Result := false;
end;
SDLK_RETURN:
begin
@@ -110,11 +99,6 @@ begin
AudioPlayback.PlaySound(SoundLib.Start);
FadeTo(@ScreenEditConvert);
end;
-// if Interaction = 1 then
-// begin
-// Music.PlayStart;
-// FadeTo(@ScreenEditHeader);
-// end;
if Interaction = 1 then
begin
@@ -136,66 +120,41 @@ begin
inherited Create;
TextDescription := AddText(Theme.Edit.TextDescription);
-// TextDescriptionLong := AddText(Theme.Edit.TextDescriptionLong);
LoadFromTheme(Theme.Edit);
-// AddButton(400-200, 100 + 0*70, 400, 40, Skin.GetTextureFileName('ButtonF'));
-// AddButtonText(10, 5, 0, 0, 0, 'Convert Midi to Txt');
-// Button[High(Button)].Text[0].Size := 11;
-
-// AddButton(400-200, 100 + 1*60, 400, 40, 'ButtonF');
-// AddButtonText(10, 5, 0, 0, 0, 'Edit Headers');
-
-// AddButton(400-200, 100 + 2*60, 400, 40, 'ButtonF');
-// AddButtonText(10, 5, 0, 0, 0, 'Set GAP');
-
-// AddButton(400-200, 100 + 3*60, 400, 40, Skin.GetTextureFileName('ButtonF'));
-// AddButtonText(10, 5, 0, 0, 0, 'Exit');
-
AddButton(Theme.Edit.ButtonConvert);
+{ Some ideas for more:
+ AddButton(Theme.Edit.ButtonEditHeaders);
+ AddButton(Theme.Edit.ButtonAdjustGap);
+}
AddButton(Theme.Edit.ButtonExit);
-{
- if (Length(Button[0].Text)=0) then
- AddButtonText(14, 20, Theme.Edit.Description[0]);
-}
Interaction := 0;
end;
-procedure TScreenEdit.onShow;
-begin
- inherited;
-
-// Interaction := 0;
-end;
-
procedure TScreenEdit.InteractNext;
begin
inherited InteractNext;
- Text[TextDescription].Text := Theme.Edit.Description[Interaction];
-// Text[TextDescriptionLong].Text := Theme.Edit.DescriptionLong[Interaction];
+ Text[TextDescription].Text := Theme.Edit.Description[Interaction];
end;
procedure TScreenEdit.InteractPrev;
begin
inherited InteractPrev;
- Text[TextDescription].Text := Theme.Edit.Description[Interaction];
-// Text[TextDescriptionLong].Text := Theme.Edit.DescriptionLong[Interaction];
+ Text[TextDescription].Text := Theme.Edit.Description[Interaction];
end;
procedure TScreenEdit.InteractDec;
begin
inherited InteractDec;
- Text[TextDescription].Text := Theme.Edit.Description[Interaction];
-// Text[TextDescriptionLong].Text := Theme.Edit.DescriptionLong[Interaction];
+ Text[TextDescription].Text := Theme.Edit.Description[Interaction];
end;
procedure TScreenEdit.InteractInc;
begin
inherited InteractInc;
- Text[TextDescription].Text := Theme.Edit.Description[Interaction];
-// Text[TextDescriptionLong].Text := Theme.Edit.DescriptionLong[Interaction];
+ Text[TextDescription].Text := Theme.Edit.Description[Interaction];
end;
procedure TScreenEdit.SetAnimationProgress(Progress: real);
@@ -204,17 +163,4 @@ begin
Static[0].Texture.ScaleH := Progress;
end;
-(*function TScreenEdit.Draw: boolean;
-var
- Min: integer;
- Sec: integer;
- AktBeat: integer;
-begin
-end;
-
-procedure TScreenEdit.Finish;
-begin
-//
-end;*)
-
end.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 17:20:58 +0000