All comments are English now (Polish ones have been translated)

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

15 files changed, 145 insertions, 158 deletions

diff --git a/src/base/UDraw.pas b/src/base/UDraw.pas
index d3f19019..97b526c5 100644
--- a/src/base/UDraw.pas
+++ b/src/base/UDraw.pas
@@ -81,9 +81,6 @@ var
   TickOld: cardinal;
   TickOld2:cardinal;
 
-const
-  Przedz = 32;
-
 implementation
 
 uses
@@ -307,8 +304,8 @@ begin
           end //Else all Notes same Color
           else
             glColor4f(1, 1, 1, 1);        // We set alpha to 1, cause we can control the transparency through the png itself
-                                          // Czesci == teil, element == piece, element | koniec == end / ending
-          // lewa czesc  -  left part
+
+          // left part
           Rec.Left := (Start-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left + 0.5 + 10*ScreenX;
           Rec.Right := Rec.Left + NotesW;
           Rec.Top := Top - (Tone-BaseNote)*Space/2 - NotesH;
@@ -327,7 +324,7 @@ begin
 
          // middle part
         Rec.Left := Rec.Right;
-        Rec.Right := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - NotesW - 0.5 + 10*ScreenX;    // Dlugosc == length
+        Rec.Right := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - NotesW - 0.5 + 10*ScreenX;
 
         glBindTexture(GL_TEXTURE_2D, Tex_plain_Mid[PlayerNumber].TexNum);
         glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
@@ -428,7 +425,7 @@ begin
         Rec.Left := Rec.Right;
         Rec.Right := X + (Start+Length-Lines[0].Line[Lines[0].Current].Note[0].Start) * TempR - NotesW - 0.5  + 10*ScreenX;
 
-        // (nowe) - dunno
+        // new
         if (Start+Length-1 = LyricsState.CurrentBeatD) then
           Rec.Right := Rec.Right - (1-Frac(LyricsState.MidBeatD)) * TempR;
         // the left note is more right than the right note itself, sounds weird - so we fix that xD
@@ -527,10 +524,10 @@ begin
             W := NotesW * 2 + 2;
             H := NotesH * 1.5 + 3.5;
 
-            X2 := (Start-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left + 0.5 + 10*ScreenX + 4; // wciecie
+            X2 := (Start-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left + 0.5 + 10*ScreenX + 4;
             X1 := X2-W;
 
-            X3 := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - 0.5 + 10*ScreenX - 4; // wciecie
+            X3 := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - 0.5 + 10*ScreenX - 4;
             X4 := X3+W;
 
             // left
@@ -547,7 +544,7 @@ begin
               glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
             glEnd;
 
-            // srodkowa czesc
+            // middle part
             Rec.Left := X2;
             Rec.Right := X3;
 
@@ -559,7 +556,7 @@ begin
               glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
             glEnd;
 
-            // prawa czesc
+            // right part
             Rec.Left := X3;
             Rec.Right := X4;
 
@@ -1276,7 +1273,7 @@ begin
 
 
 
-          // lewa czesc  -  left part
+          // left part
           Rec.Left := (Start-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left + 0.5 + 10*ScreenX;
           Rec.Right := Rec.Left + NotesW;
           Rec.Top := Top - (Tone-BaseNote)*Space/2 - NotesH;
@@ -1289,7 +1286,7 @@ begin
             glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
           glEnd;
 
-         // srodkowa czesc  -  middle part
+         // middle part
         Rec.Left := Rec.Right;
         Rec.Right := (Start+Length-Lines[NrLines].Line[Lines[NrLines].Current].Note[0].Start) * TempR + Left - NotesW - 0.5 + 10*ScreenX;
 
@@ -1301,7 +1298,7 @@ begin
           glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top);
         glEnd;
 
-        // prawa czesc  -  right part
+        // right part
         Rec.Left := Rec.Right;
         Rec.Right := Rec.Right + NotesW;
 
diff --git a/src/base/UGraphic.pas b/src/base/UGraphic.pas
index b525c170..c328d016 100644
--- a/src/base/UGraphic.pas
+++ b/src/base/UGraphic.pas
@@ -301,10 +301,13 @@ var
   Col:      integer;
 begin
   Log.LogStatus('Loading Textures', 'LoadTextures');
-  
-  Tex_Left[0]  := Texture.LoadTexture(Skin.GetTextureFileName('GrayLeft'),  TEXTURE_TYPE_TRANSPARENT, 0);     //brauch man die noch?
-  Tex_Mid[0]   := Texture.LoadTexture(Skin.GetTextureFileName('GrayMid'),   TEXTURE_TYPE_PLAIN, 0);           //brauch man die noch?
-  Tex_Right[0] := Texture.LoadTexture(Skin.GetTextureFileName('GrayRight'), TEXTURE_TYPE_TRANSPARENT, 0);     //brauch man die noch?
+
+  // FIXME: do we need this? (REMOVE otherwise)
+  Tex_Left[0]  := Texture.LoadTexture(Skin.GetTextureFileName('GrayLeft'),  TEXTURE_TYPE_TRANSPARENT, 0);
+  // FIXME: do we need this? (REMOVE otherwise)
+  Tex_Mid[0]   := Texture.LoadTexture(Skin.GetTextureFileName('GrayMid'),   TEXTURE_TYPE_PLAIN, 0);
+  // FIXME: do we need this? (REMOVE otherwise)
+  Tex_Right[0] := Texture.LoadTexture(Skin.GetTextureFileName('GrayRight'), TEXTURE_TYPE_TRANSPARENT, 0);
 
   Log.LogStatus('Loading Textures - A', 'LoadTextures');
   
diff --git a/src/base/USkins.pas b/src/base/USkins.pas
index df736684..59c590e5 100644
--- a/src/base/USkins.pas
+++ b/src/base/USkins.pas
@@ -78,7 +78,7 @@ constructor TSkin.Create;
 begin
   inherited;
   LoadList;
-//  LoadSkin('Lisek');
+//  LoadSkin('...');
 //  SkinColor := Color;
 end;
 
diff --git a/src/base/USong.pas b/src/base/USong.pas
index cff56c1d..525f7bcc 100644
--- a/src/base/USong.pas
+++ b/src/base/USong.pas
@@ -985,7 +985,7 @@ begin
 
   If (Lines[LineNumberP].Line[Lines[LineNumberP].High].HighNote  <> -1) then
   begin //Update old Sentence if it has notes and create a new sentence
-    // stara czesc //Alter Satz //Update Old Part
+    // Update old part
     Lines[LineNumberP].Line[Lines[LineNumberP].High].BaseNote := Base[LineNumberP];
     Lines[LineNumberP].Line[Lines[LineNumberP].High].LyricWidth := glTextWidth(Lines[LineNumberP].Line[Lines[LineNumberP].High].Lyric);
 
@@ -1002,7 +1002,7 @@ begin
     //Total Notes Patch End
 
 
-    // nowa czesc //Neuer Satz //Update New Part
+    // Update new part
     SetLength(Lines[LineNumberP].Line, Lines[LineNumberP].Number + 1);
     Lines[LineNumberP].High := Lines[LineNumberP].High + 1;
     Lines[LineNumberP].Number := Lines[LineNumberP].Number + 1;
diff --git a/src/menu/UDrawTexture.pas b/src/menu/UDrawTexture.pas
index 33082765..bc136f11 100644
--- a/src/menu/UDrawTexture.pas
+++ b/src/menu/UDrawTexture.pas
@@ -74,7 +74,6 @@ var
 begin
   with Texture do
   begin
-    // rysuje paski gracza
     glColor4f(ColR * Int, ColG * Int, ColB * Int, Alpha);
     glEnable(GL_TEXTURE_2D);
     glEnable(GL_BLEND);
diff --git a/src/menu/UMenuText.pas b/src/menu/UMenuText.pas
index 3fc60384..a3d13834 100644
--- a/src/menu/UMenuText.pas
+++ b/src/menu/UMenuText.pas
@@ -82,8 +82,8 @@ type
 
       procedure Draw;
       constructor Create; overload;
-      constructor Create(X, Y: real; Tekst: string); overload;
-      constructor Create(ParX, ParY, ParW: real; ParStyle: integer; ParSize, ParColR, ParColG, ParColB: real; ParAlign: integer; ParTekst: string; ParReflection: boolean; ParReflectionSpacing: real; ParZ: real); overload;
+      constructor Create(X, Y: real; Text: string); overload;
+      constructor Create(ParX, ParY, ParW: real; ParStyle: integer; ParSize, ParColR, ParColG, ParColB: real; ParAlign: integer; ParText: string; ParReflection: boolean; ParReflectionSpacing: real; ParZ: real); overload;
   end;
 
 implementation
@@ -346,12 +346,12 @@ begin
   Create(0, 0, '');
 end;
 
-constructor TText.Create(X, Y: real; Tekst: string);
+constructor TText.Create(X, Y: real; Text: string);
 begin
-  Create(X, Y, 0, 0, 30, 0, 0, 0, 0, Tekst, false, 0, 0);
+  Create(X, Y, 0, 0, 30, 0, 0, 0, 0, Text, false, 0, 0);
 end;
 
-constructor TText.Create(ParX, ParY, ParW: real; ParStyle: integer; ParSize, ParColR, ParColG, ParColB: real; ParAlign: integer; ParTekst: string; ParReflection: boolean; ParReflectionSpacing: real; ParZ:real);
+constructor TText.Create(ParX, ParY, ParW: real; ParStyle: integer; ParSize, ParColR, ParColG, ParColB: real; ParAlign: integer; ParText: string; ParReflection: boolean; ParReflectionSpacing: real; ParZ:real);
 begin
   inherited Create;
   Alpha := 1;
@@ -361,7 +361,7 @@ begin
   Z := ParZ;
   Style := ParStyle;
   Size := ParSize;
-  Text := ParTekst;
+  Text := ParText;
   ColR := ParColR;
   ColG := ParColG;
   ColB := ParColB;
diff --git a/src/screens/UScreenEdit.pas b/src/screens/UScreenEdit.pas
index f141edee..caeaac11 100644
--- a/src/screens/UScreenEdit.pas
+++ b/src/screens/UScreenEdit.pas
@@ -136,8 +136,6 @@ end;
 var
   Min:    integer;
   Sec:    integer;
-  Tekst:  string;
-  Pet:    integer;
   AktBeat:  integer;
 begin
 end;
diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 8cc6c59d..97a4bf2c 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -328,7 +328,7 @@ begin
   Lines.Line[C].HighNote := -1;
 
   for Nu := 0 to High(Note) do begin
-    if Note[Nu].NewSentence then begin // nowa linijka
+    if Note[Nu].NewSentence then begin // new line
       SetLength(Lines.Line, Length(Lines.Line)+1);
       Lines.Number := Lines.Number + 1;
       Lines.High := Lines.High + 1;
@@ -359,10 +359,10 @@ begin
       end;
     end;
 
-    // tworzy miejsce na nowa nute
+    // create space for new note
     SetLength(Lines.Line[C].Note, Length(Lines.Line[C].Note)+1);
 
-    // dopisuje
+    // initialize note
     Lines.Line[C].Note[N].Start := Note[Nu].Start;
     Lines.Line[C].Note[N].Length := Note[Nu].Len;
     Lines.Line[C].Note[N].Tone := Note[Nu].Tone;
@@ -526,8 +526,8 @@ end;
 
 function TScreenEditConvert.Draw: boolean;
 var
-  Pet:    integer;
-  Pet2:   integer;
+  Count:    integer;
+  Count2:   integer;
   Bottom: real;
   X:      real;
   Y:      real;
@@ -549,18 +549,18 @@ begin
   DrawQuad(10, Y+Sel*YSkip, 780, YSkip, 0.8, 0.8, 0.8);
 
   // selected - now me use Status System
-  for Pet := 0 to High(ATrack) do
-    if ATrack[Pet].Hear then
-      DrawQuad(10, Y+Pet*YSkip, 50, YSkip, 0.8, 0.3, 0.3);
+  for Count := 0 to High(ATrack) do
+    if ATrack[Count].Hear then
+      DrawQuad(10, Y+Count*YSkip, 50, YSkip, 0.8, 0.3, 0.3);
   glColor3f(0, 0, 0);
-  for Pet := 0 to High(ATrack) do begin
-    if ((ATrack[Pet].Status div 1) and 1) = 1 then begin
-      SetFontPos(25, Y + Pet*YSkip + 10);
+  for Count := 0 to High(ATrack) do begin
+    if ((ATrack[Count].Status div 1) and 1) = 1 then begin
+      SetFontPos(25, Y + Count*YSkip + 10);
       SetFontSize(15);
       glPrint('N');
     end;
-    if ((ATrack[Pet].Status div 2) and 1) = 1 then begin
-      SetFontPos(40, Y + Pet*YSkip + 10);
+    if ((ATrack[Count].Status div 2) and 1) = 1 then begin
+      SetFontPos(40, Y + Count*YSkip + 10);
       SetFontSize(15);
       glPrint('L');
     end;
@@ -570,21 +570,21 @@ begin
   DrawLine(60, Y,   60, Bottom, 0, 0, 0);
   DrawLine(790, Y, 790, Bottom, 0, 0, 0);
 
-  for Pet := 0 to Length(ATrack) do
-    DrawLine(10, Y+Pet*YSkip, 790, Y+Pet*YSkip, 0, 0, 0);
+  for Count := 0 to Length(ATrack) do
+    DrawLine(10, Y+Count*YSkip, 790, Y+Count*YSkip, 0, 0, 0);
 
-  for Pet := 0 to High(ATrack) do begin
-    SetFontPos(11, Y + 10 + Pet*YSkip);
+  for Count := 0 to High(ATrack) do begin
+    SetFontPos(11, Y + 10 + Count*YSkip);
     SetFontSize(15);
-    glPrint(ATrack[Pet].Name);
+    glPrint(ATrack[Count].Name);
   end;
 
-  for Pet := 0 to High(ATrack) do
-    for Pet2 := 0 to High(ATrack[Pet].Note) do begin
-      if ATrack[Pet].Note[Pet2].EventType = 9 then
-        DrawQuad(60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + (Pet+1)*YSkip - ATrack[Pet].Note[Pet2].Data1*35/127, 3, 3, ColR[Pet], ColG[Pet], ColB[Pet]);
-      if ATrack[Pet].Note[Pet2].EventType = 15 then
-        DrawLine(60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + 0.75 * YSkip + Pet*YSkip, 60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + YSkip + Pet*YSkip, ColR[Pet], ColG[Pet], ColB[Pet]);
+  for Count := 0 to High(ATrack) do
+    for Count2 := 0 to High(ATrack[Count].Note) do begin
+      if ATrack[Count].Note[Count2].EventType = 9 then
+        DrawQuad(60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + (Count+1)*YSkip - ATrack[Count].Note[Count2].Data1*35/127, 3, 3, ColR[Count], ColG[Count], ColB[Count]);
+      if ATrack[Count].Note[Count2].EventType = 15 then
+        DrawLine(60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + 0.75 * YSkip + Count*YSkip, 60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + YSkip + Count*YSkip, ColR[Count], ColG[Count], ColB[Count]);
     end;
 
   // playing line
diff --git a/src/screens/UScreenEditHeader.pas b/src/screens/UScreenEditHeader.pas
index 5ff3dde5..3678973e 100644
--- a/src/screens/UScreenEditHeader.pas
+++ b/src/screens/UScreenEditHeader.pas
@@ -275,8 +275,7 @@ end;
 var
   Min:    integer;
   Sec:    integer;
-  Tekst:  string;
-  Pet:    integer;
+  Count:    integer;
   AktBeat:  integer;
 begin
 {  glClearColor(1,1,1,1);
@@ -294,8 +293,8 @@ begin
       AktBeat := Floor(CurrentSong.BPM[0].BPM * (Music.Position - CurrentSong.GAP / 1000) / 60);
       Text[TextDebug].Text := IntToStr(AktBeat);
       if AktBeat <> LastClick then begin
-        for Pet := 0 to Czesci[0].Czesc[Czesci[0].Akt].HighNut do
-          if (Czesci[0].Czesc[Czesci[0].Akt].Nuta[Pet].Start = AktBeat) then begin
+        for Count := 0 to Czesci[0].Czesc[Czesci[0].Akt].HighNut do
+          if (Czesci[0].Czesc[Czesci[0].Akt].Nuta[Count].Start = AktBeat) then begin
             Music.PlayClick;
             LastClick := AktBeat;
           end;
@@ -314,7 +313,7 @@ begin
   Text[TextNStart].Text :=    IntToStr(Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Start);
   Text[TextNDlugosc].Text :=  IntToStr(Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Dlugosc);
   Text[TextNTon].Text :=      IntToStr(Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Ton);
-  Text[TextNText].Text :=              Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Tekst;
+  Text[TextNText].Text :=              Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Text;
 
   // draw static menu
   inherited Draw;
diff --git a/src/screens/UScreenEditSub.pas b/src/screens/UScreenEditSub.pas
index 167d94b4..963d50de 100644
--- a/src/screens/UScreenEditSub.pas
+++ b/src/screens/UScreenEditSub.pas
@@ -434,10 +434,6 @@ begin
         begin
         end;
 
-      SDLK_LCTRL:
-        begin
-        end;
-
       SDLK_DELETE:
         begin
           if SDL_ModState = KMOD_LCTRL then begin
diff --git a/src/screens/UScreenOpen.pas b/src/screens/UScreenOpen.pas
index 116fd175..989e2ff9 100644
--- a/src/screens/UScreenOpen.pas
+++ b/src/screens/UScreenOpen.pas
@@ -143,9 +143,9 @@ constructor TScreenOpen.Create;
 begin
   inherited Create;
 
-  // linijka
+  // line
 {  AddStatic(20, 10, 80, 30, 0, 0, 0, 'MainBar', 'JPG', TEXTURE_TYPE_COLORIZED);
-  AddText(35, 17, 1, 18, 1, 1, 1, 'Linijka');
+  AddText(35, 17, 1, 18, 1, 1, 1, 'line');
   TextSentence := AddText(120, 14, 1, 24, 0, 0, 0, '0 / 0');}
 
   // file list
@@ -186,8 +186,6 @@ end;
 var
   Min:    integer;
   Sec:    integer;
-  Tekst:  string;
-  Pet:    integer;
   AktBeat:  integer;
 begin
 
diff --git a/src/screens/UScreenSingModi.pas b/src/screens/UScreenSingModi.pas
index c4d4723f..892bfe6a 100644
--- a/src/screens/UScreenSingModi.pas
+++ b/src/screens/UScreenSingModi.pas
@@ -180,7 +180,7 @@ begin
       Result.Sentence[I].Note[J].Start     := Lines.Line[I].Note[J].Start;
       Result.Sentence[I].Note[J].Length    := Lines.Line[I].Note[J].Length;
       Result.Sentence[I].Note[J].Tone      := Lines.Line[I].Note[J].Tone;
-      //Result.Sentence[I].Note[J].Text      := Lines.Line[I].Note[J].Tekst;
+      //Result.Sentence[I].Note[J].Text      := Lines.Line[I].Note[J].Text;
       Result.Sentence[I].Note[J].FreeStyle := (Lines.Line[I].Note[J].NoteType = ntFreestyle);
     end;
   end;
@@ -299,7 +299,7 @@ function TScreenSingModi.Draw: boolean;
 var
   Min:    integer;
   Sec:    integer;
-  Tekst:  string;
+  TextStr:  string;
   S, I:   integer;
   T:      integer;
   CurLyricsTime: real;
@@ -445,82 +445,82 @@ begin
 
     // .. and scores
     {if PlayersPlay = 1 then begin
-      Tekst := IntToStr(Player[0].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP1Score].Text := Tekst;
+      TextStr := IntToStr(Player[0].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP1Score].Text := TextStr;
     end;
 
     if PlayersPlay = 2 then begin
-      Tekst := IntToStr(Player[0].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP1TwoPScore].Text := Tekst;
+      TextStr := IntToStr(Player[0].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP1TwoPScore].Text := TextStr;
 
-      Tekst := IntToStr(Player[1].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP2RScore].Text := Tekst;
+      TextStr := IntToStr(Player[1].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP2RScore].Text := TextStr;
     end;
 
     if PlayersPlay = 3 then begin
-      Tekst := IntToStr(Player[0].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP1ThreePScore].Text := Tekst;
+      TextStr := IntToStr(Player[0].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP1ThreePScore].Text := TextStr;
 
-      Tekst := IntToStr(Player[1].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP2MScore].Text := Tekst;
+      TextStr := IntToStr(Player[1].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP2MScore].Text := TextStr;
 
-      Tekst := IntToStr(Player[2].ScoreTotalI);
-      while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-      Text[TextP3RScore].Text := Tekst;
+      TextStr := IntToStr(Player[2].ScoreTotalI);
+      while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+      Text[TextP3RScore].Text := TextStr;
     end;
 
     if PlayersPlay = 4 then begin
       if ScreenAct = 1 then begin
-        Tekst := IntToStr(Player[0].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP1TwoPScore].Text := Tekst;
+        TextStr := IntToStr(Player[0].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP1TwoPScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[1].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP2RScore].Text := Tekst;
+        TextStr := IntToStr(Player[1].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP2RScore].Text := TextStr;
       end;
       if ScreenAct = 2 then begin
-        Tekst := IntToStr(Player[2].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP1TwoPScore].Text := Tekst;
+        TextStr := IntToStr(Player[2].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP1TwoPScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[3].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP2RScore].Text := Tekst;
+        TextStr := IntToStr(Player[3].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP2RScore].Text := TextStr;
       end;
     end;
 
     if PlayersPlay = 6 then begin
       if ScreenAct = 1 then begin
-        Tekst := IntToStr(Player[0].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP1ThreePScore].Text := Tekst;
+        TextStr := IntToStr(Player[0].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP1ThreePScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[1].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP2MScore].Text := Tekst;
+        TextStr := IntToStr(Player[1].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP2MScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[2].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP3RScore].Text := Tekst;
+        TextStr := IntToStr(Player[2].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP3RScore].Text := TextStr;
       end;
       if ScreenAct = 2 then begin
-        Tekst := IntToStr(Player[3].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP1ThreePScore].Text := Tekst;
+        TextStr := IntToStr(Player[3].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP1ThreePScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[4].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP2MScore].Text := Tekst;
+        TextStr := IntToStr(Player[4].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP2MScore].Text := TextStr;
 
-        Tekst := IntToStr(Player[5].ScoreTotalI);
-        while Length(Tekst) < 5 do Tekst := '0' + Tekst;
-        Text[TextP3RScore].Text := Tekst;
+        TextStr := IntToStr(Player[5].ScoreTotalI);
+        while Length(TextStr) < 5 do TextStr := '0' + TextStr;
+        Text[TextP3RScore].Text := TextStr;
       end;
     end;   }
 
@@ -553,9 +553,7 @@ begin
   if (DllMan.Selected.LoadSong) AND (DllMan.Selected.LoadBack) then
     SingDrawBackground;
 
-  // comment by blindy: wo zum henker wird denn in diesem screen ein video abgespielt?
   // update and draw movie
-  // <mog> wie wo wadd? also in der selben funktion in der uscreensing kommt des video in der zeile 995, oder was wollteste wissen? :X
 {  if ShowFinish and CurrentSong.VideoLoaded AND DllMan.Selected.LoadVideo then begin
     UpdateSmpeg; // this only draws
   end;}
diff --git a/src/screens/UScreenSong.pas b/src/screens/UScreenSong.pas
index 9fc74aae..6aa8e955 100644
--- a/src/screens/UScreenSong.pas
+++ b/src/screens/UScreenSong.pas
@@ -1059,10 +1059,10 @@ end;
 procedure TScreenSong.SetScroll2;
 var
   B:      integer;
-  //Wsp:    integer; // wspolczynnik przesuniecia wzgledem srodka ekranu 
-  //Wsp2:   real;
+  //Factor:    integer; // factor of position relative to center of screen
+  //Factor2:   real;
 begin
-  // liniowe
+  // line
   for B := 0 to High(Button) do
     Button[B].X := 300 + (B - Interaction) * 260;
 
@@ -1074,12 +1074,12 @@ begin
       Button[0].X := 300 + 260;
   end;
 
-  // kolowe
+  // circle
   {
   for B := 0 to High(Button) do begin
-    Wsp := (B - Interaction); // 0 dla srodka, -1 dla lewego, +1 dla prawego itd.
-    Wsp2 := Wsp / Length(Button);
-    Button[B].X := 300 + 10000 * sin(2*pi*Wsp2);
+    Factor := (B - Interaction); // 0 to center, -1: to left, +1 to right
+    Factor2 := Factor / Length(Button);
+    Button[B].X := 300 + 10000 * sin(2*pi*Factor2);
     //Button[B].Y := 140 + 50 * ;
   end;
   }
@@ -1089,12 +1089,12 @@ end;
 procedure TScreenSong.SetScroll3; // with slide
 var
   B:      integer;
-  //Wsp:    integer; // wspolczynnik przesuniecia wzgledem srodka ekranu
-  //Wsp2:   real;
+  //Factor:    integer; // factor of position relative to center of screen
+  //Factor2:   real;
 begin
   SongTarget := Interaction;
 
-  // liniowe
+  // line
   for B := 0 to High(Button) do
   begin
     Button[B].X := 300 + (B - SongCurrent) * 260;
@@ -1114,12 +1114,12 @@ begin
   end;
   }
 
-  // kolowe
+  // circle
   {
   for B := 0 to High(Button) do begin
-    Wsp := (B - Interaction); // 0 dla srodka, -1 dla lewego, +1 dla prawego itd.
-    Wsp2 := Wsp / Length(Button);
-    Button[B].X := 300 + 10000 * sin(2*pi*Wsp2);
+    Factor := (B - Interaction); // 0 to center, -1: to left, +1 to right
+    Factor2 := Factor / Length(Button);
+    Button[B].X := 300 + 10000 * sin(2*pi*Factor2);
     //Button[B].Y := 140 + 50 * ;
   end;
   }
@@ -1253,25 +1253,25 @@ var
   VS:     integer;
   diff:     real;
   X:        Real;
-  Wsp:    real;
+  Factor:    real;
   Z, Z2:      real;
 begin
   VS := CatSongs.VisibleSongs;
   if VS <= 5 then
   begin
-    // kolowe
+    // circle
     for B := 0 to High(Button) do
     begin
-      Button[B].Visible := CatSongs.Song[B].Visible; // nowe
+      Button[B].Visible := CatSongs.Song[B].Visible;
       if Button[B].Visible then begin // optimization for 1000 songs - updates only visible songs, hiding in tabs becomes useful for maintaing good speed
 
-      Wsp := 2 * pi * (CatSongs.VisibleIndex(B) - SongCurrent) /  VS {CatSongs.VisibleSongs};// 0.5.0 (II): takes another 16ms
+      Factor := 2 * pi * (CatSongs.VisibleIndex(B) - SongCurrent) /  VS {CatSongs.VisibleSongs};// 0.5.0 (II): takes another 16ms
 
-      Z := (1 + cos(Wsp)) / 2;
+      Z := (1 + cos(Factor)) / 2;
       Z2 := (1 + 2*Z) / 3;
 
 
-      Button[B].Y := Theme.Song.Cover.Y + (0.185 * Theme.Song.Cover.H * VS * sin(Wsp)) * Z2 - ((Button[B].H - Theme.Song.Cover.H)/2); // 0.5.0 (I): 2 times faster by not calling CatSongs.VisibleSongs
+      Button[B].Y := Theme.Song.Cover.Y + (0.185 * Theme.Song.Cover.H * VS * sin(Factor)) * Z2 - ((Button[B].H - Theme.Song.Cover.H)/2); // 0.5.0 (I): 2 times faster by not calling CatSongs.VisibleSongs
       Button[B].Z := Z / 2 + 0.3;
 
       Button[B].W := Theme.Song.Cover.H * Z2;
@@ -1547,7 +1547,7 @@ begin
 
   end;
 
-  // Interaction -> Button, ktorego okladke przeczytamy
+  // Interaction -> Button, load cover
   // show uncached texture
   //Button[Interaction].Texture := Texture.GetTexture(Button[Interaction].Texture.Name, TEXTURE_TYPE_PLAIN, false);
 end;
diff --git a/src/screens/UScreenTop5.pas b/src/screens/UScreenTop5.pas
index cf5ee257..59f5972b 100644
--- a/src/screens/UScreenTop5.pas
+++ b/src/screens/UScreenTop5.pas
@@ -159,11 +159,10 @@ function TScreenTop5.Draw: boolean;
 //var
 {  Min:    real;
   Max:    real;
-  Wsp:    real;
-  Wsp2:   real;
-  Pet:    integer;}
+  Factor:    real;
+  Factor2:   real;
 
-{  Item:   integer;
+  Item:   integer;
   P:      integer;
   C:      integer;}
 begin
diff --git a/src/screens/UScreenWelcome.pas b/src/screens/UScreenWelcome.pas
index 6655f023..485ebedb 100644
--- a/src/screens/UScreenWelcome.pas
+++ b/src/screens/UScreenWelcome.pas
@@ -94,8 +94,8 @@ function TScreenWelcome.Draw: boolean;
 var
   Min:    real;
   Max:    real;
-  Wsp:    real;
-  Pet:    integer;
+  Factor:    real;
+  Count:    integer;
 begin
   // star animation
   Animation := Animation + TimeSkip*1000;
@@ -108,34 +108,34 @@ begin
   // popup
   Min := 1000; Max := 1120;
   if (Animation >= Min) and (Animation < Max) then begin
-    Wsp := (Animation - Min) / (Max - Min);
+    Factor := (Animation - Min) / (Max - Min);
     Static[0].Texture.X := 600;
-    Static[0].Texture.Y := 600 - Wsp * 230;
+    Static[0].Texture.Y := 600 - Factor * 230;
     Static[0].Texture.W := 200;
-    Static[0].Texture.H := Wsp * 230;
+    Static[0].Texture.H := Factor * 230;
   end;
 
   // bounce
   Min := 1120; Max := 1200;
   if (Animation >= Min) and (Animation < Max) then begin
-    Wsp := (Animation - Min) / (Max - Min);
-    Static[0].Texture.Y := 370 + Wsp * 50;
-    Static[0].Texture.H := 230 - Wsp * 50;
+    Factor := (Animation - Min) / (Max - Min);
+    Static[0].Texture.Y := 370 + Factor * 50;
+    Static[0].Texture.H := 230 - Factor * 50;
   end;
 
   // run
   Min := 1500; Max := 3500;
   if (Animation >= Min) and (Animation < Max) then begin
-    Wsp := (Animation - Min) / (Max - Min);
+    Factor := (Animation - Min) / (Max - Min);
 
-    Static[0].Texture.X := 600 - Wsp * 1400;
+    Static[0].Texture.X := 600 - Factor * 1400;
     Static[0].Texture.H := 180;
 
 
-    for Pet := 1 to 5 do begin
-      Static[Pet].Texture.X := 770 - Wsp * 1400;
-      Static[Pet].Texture.W := 150 + Wsp * 200;
-      Static[Pet].Texture.Alpha := Wsp * 0.5;
+    for Count := 1 to 5 do begin
+      Static[Count].Texture.X := 770 - Factor * 1400;
+      Static[Count].Texture.W := 150 + Factor * 200;
+      Static[Count].Texture.Alpha := Factor * 0.5;
     end;
   end;