Release 0.1.11-alpha: Merge branch 'dev'

ai/lady01.txt

@@ -38,11 +38,12 @@ int object::WaspCount()
 	while ( true )
 	{
 		item = retobject(i++);
-		if ( item == null )  return total;
+		if ( item == null )  break;
 
 		if ( item.category == AlienWasp )
 		{
 			total ++;
 		}
 	}
+	return total;
 }

ai/lady02.txt

@@ -64,11 +64,12 @@ int object::AlienCount()
 	while ( true )
 	{
 		item = retobject(i++);
-		if ( item == null )  return total;
+		if ( item == null )  break;
 
 		if ( item.category == AlienAnt )
 		{
 			total ++;
 		}
 	}
+	return total;
 }

help/cbot/E/category.txt

@@ -102,7 +102,7 @@ Below are the different categories available:
        \c;\l;VioletFlag\u object\flag;        \n;Violet Flag
        \c;\l;WayPoint\u object\waypoint;          \n;Checkpoint
        \c;\l;Target2\u object\target2;           \n;Flying checkpoint
-       \c;\l;EnergySpot\u object\enerspot;        \n;Underground Energy Deposit
+       \c;\l;PowerSpot\u object\enerspot;        \n;Underground Energy Deposit
        \c;\l;TitaniumSpot\u object\stonspot;      \n;Underground Titanium Deposit
        \c;\l;UraniumSpot\u object\uranspot;       \n;Underground Uranium Deposit
 

help/cbot/E/deletef.txt

@@ -1,7 +1,7 @@
 \b;Instruction \c;deletefile\n;
 The deletefile instruction deletes an existing file in the files/ folder. 
 
-Files can only be deleted in the files/ folder which is located in the folder where Colobot has been installed. You cannot not delete files that are located elsewhere than in the files/ folder.
+Files can only be deleted in the files/ folder which is located in the folder inside Colobot save directory. You cannot not delete files that are located elsewhere than in the files/ folder.
 
 Syntax:
 \s;\c;deletefile ( filename );\n;

help/cbot/E/file.txt

@@ -5,7 +5,7 @@ This type is used for accessing files in the files/ folder.
 \n;
 Use the syntax above for declaring a file handle. You must use () to create an instance of the \c;file\n; class. Without the () the handle would have the value \c;\l;null\u cbot\null;\n;.
 
-Files can only be created and opened in the files/ folder which is located in the folder where Colobot has been installed. You cannot not create or open files elsewhere than in the files/ folder.
+Files can only be created and opened in the files/ folder which is located in the folder inside Colobot save directory. You cannot not create or open files elsewhere than in the files/ folder.
 
 \b;For specialists
 \c;file\n; is actually not a simple type but a class. \c;open\n;, \c;close\n;, \c;writeln\n; etc. are methods of the \c;file\n; class. This is the reason why we always write \c;handle.method()\n;:

help/cbot/E/open.txt

@@ -14,7 +14,7 @@ To open a file, proceed as follows:
 \c;"w"\n; mode: open for writing.
 \c;"a"\n; mode: open for appending.
 
-Files can only be created and opened in the files/ folder which is located in the folder where Colobot has been installed. You cannot not create or open files that are located elsewhere than in the files/ folder.
+Files can only be created and opened in the files/ folder which is located in the folder inside Colobot save directory. You cannot not create or open files that are located elsewhere than in the files/ folder.
 
 \t;See also
 \c;\l;file\u cbot\file;\n;, \c;\l;close\u cbot\close;\n;, \c;\l;readln\u cbot\readln;\n;, \c;\l;writeln\u cbot\writeln;\n; and \c;\l;eof\u cbot\eof;\n;.

help/cbot/po/cbot.pot

@@ -617,7 +617,7 @@ msgstr ""
 #. type: Plain text
 #: ../E/deletef.txt:4
 #, no-wrap
-msgid "Files can only be deleted in the files/ folder which is located in the folder where Colobot has been installed. You cannot not delete files that are located elsewhere than in the files/ folder."
+msgid "Files can only be deleted in the files/ folder which is located in the folder inside Colobot save directory. You cannot not delete files that are located elsewhere than in the files/ folder."
 msgstr ""
 
 #. type: Source code
@@ -1203,7 +1203,7 @@ msgstr ""
 #. type: Plain text
 #: ../E/file.txt:8
 #, no-wrap
-msgid "Files can only be created and opened in the files/ folder which is located in the folder where Colobot has been installed. You cannot not create or open files elsewhere than in the files/ folder."
+msgid "Files can only be created and opened in the files/ folder which is located in the folder inside Colobot save directory. You cannot not create or open files elsewhere than in the files/ folder."
 msgstr ""
 
 #. type: Plain text
@@ -2306,7 +2306,7 @@ msgstr ""
 #. type: Plain text
 #: ../E/open.txt:17
 #, no-wrap
-msgid "Files can only be created and opened in the files/ folder which is located in the folder where Colobot has been installed. You cannot not create or open files that are located elsewhere than in the files/ folder."
+msgid "Files can only be created and opened in the files/ folder which is located in the folder inside Colobot save directory. You cannot not create or open files that are located elsewhere than in the files/ folder."
 msgstr ""
 
 #. type: Plain text
@@ -7341,7 +7341,7 @@ msgid ""
 "       <code><a object|flag>VioletFlag</a>        </code>Violet Flag\n"
 "       <code><a object|waypoint>WayPoint</a>          </code>Checkpoint\n"
 "       <code><a object|target2>Target2</a>           </code>Flying checkpoint\n"
-"       <code><a object|enerspot>EnergySpot</a>        </code>Underground Energy Deposit\n"
+"       <code><a object|enerspot>PowerSpot</a>        </code>Underground Energy Deposit\n"
 "       <code><a object|stonspot>TitaniumSpot</a>      </code>Underground Titanium Deposit\n"
 "       <code><a object|uranspot>UraniumSpot</a>       </code>Underground Uranium Deposit"
 msgstr ""

help/cbot/po/de.po

@@ -703,7 +703,7 @@ msgstr "Diese Anweisung löscht eine bestehende Datei im Ordner <c/>\\files\\<n/
 #. type: Plain text
 #: ../E/deletef.txt:4
 #, no-wrap
-msgid "Files can only be deleted in the files/ folder which is located in the folder where Colobot has been installed. You cannot not delete files that are located elsewhere than in the files/ folder."
+msgid "Files can only be deleted in the files/ folder which is located in the folder inside Colobot save directory. You cannot not delete files that are located elsewhere than in the files/ folder."
 msgstr "Dateien können nur gelöscht werden, wenn sie sich im Ordner <c/>\\files\\<n/> befinden, der sich im Ordner befindet, in dem Colobot installiert wurde. Dateien in anderen Ordnern können mit dieser Anweisung nicht gelöscht werden."
 
 #. type: Source code
@@ -1365,7 +1365,7 @@ msgstr "Benutzen Sie diese Syntax, um eine Handle zu einer Datei zu erstellen. S
 #. type: Plain text
 #: ../E/file.txt:8
 #, no-wrap
-msgid "Files can only be created and opened in the files/ folder which is located in the folder where Colobot has been installed. You cannot not create or open files elsewhere than in the files/ folder."
+msgid "Files can only be created and opened in the files/ folder which is located in the folder inside Colobot save directory. You cannot not create or open files elsewhere than in the files/ folder."
 msgstr "Von Programmen in Colobot aus können nur Dateien im Ordner files/ erstellt werden, der sich im Ordner befindet, in dem Colobot installiert wurde. Auf Dateien in anderen Ordnern kann nicht zugegriffen werden."
 
 #. type: Plain text
@@ -2616,7 +2616,7 @@ msgstr ""
 #. type: Plain text
 #: ../E/open.txt:17
 #, no-wrap
-msgid "Files can only be created and opened in the files/ folder which is located in the folder where Colobot has been installed. You cannot not create or open files that are located elsewhere than in the files/ folder."
+msgid "Files can only be created and opened in the files/ folder which is located in the folder inside Colobot save directory. You cannot not create or open files that are located elsewhere than in the files/ folder."
 msgstr "Dateien können nur geöffnet werden, wenn sie sich im Ordner <c/>\\files\\<n/> befinden, der sich im Ordner befindet, in dem Colobot installiert wurde. Dateien in anderen Ordnern können mit diesem Befehl nicht geöffnet werden."
 
 #. type: Plain text
@@ -8042,7 +8042,7 @@ msgid ""
 "       <code><a object|flag>VioletFlag</a>        </code>Violet Flag\n"
 "       <code><a object|waypoint>WayPoint</a>          </code>Checkpoint\n"
 "       <code><a object|target2>Target2</a>           </code>Flying checkpoint\n"
-"       <code><a object|enerspot>EnergySpot</a>        </code>Underground Energy Deposit\n"
+"       <code><a object|enerspot>PowerSpot</a>        </code>Underground Energy Deposit\n"
 "       <code><a object|stonspot>TitaniumSpot</a>      </code>Underground Titanium Deposit\n"
 "       <code><a object|uranspot>UraniumSpot</a>       </code>Underground Uranium Deposit"
 msgstr ""

help/cbot/po/fr.po

@@ -754,7 +754,7 @@ msgstr "L'instruction <c/>deletefile();<n/> supprime un fichier dans le dossier
 #. type: Plain text
 #: ../E/deletef.txt:4
 #, no-wrap
-msgid "Files can only be deleted in the files/ folder which is located in the folder where Colobot has been installed. You cannot not delete files that are located elsewhere than in the files/ folder."
+msgid "Files can only be deleted in the files/ folder which is located in the folder inside Colobot save directory. You cannot not delete files that are located elsewhere than in the files/ folder."
 msgstr "Les fichiers ne peuvent être supprimés que dans le dossier files/, situé là où Colobot a été installé. Il n'est pas possible de supprimer des fichiers situés ailleurs que dans ce dossier files/."
 
 #. type: Source code
@@ -1415,7 +1415,7 @@ msgstr "Notez la présence des parenthèses, indispensables pour créer une inst
 #. type: Plain text
 #: ../E/file.txt:8
 #, no-wrap
-msgid "Files can only be created and opened in the files/ folder which is located in the folder where Colobot has been installed. You cannot not create or open files elsewhere than in the files/ folder."
+msgid "Files can only be created and opened in the files/ folder which is located in the folder inside Colobot save directory. You cannot not create or open files elsewhere than in the files/ folder."
 msgstr "Les fichiers ne peuvent être créés et ouverts que dans le dossier files/, situé là où Colobot a été installé. Il n'est pas possible de créer ou ouvrir des fichiers situés ailleurs que dans ce dossier files/."
 
 #. type: Plain text
@@ -2662,7 +2662,7 @@ msgstr ""
 #. type: Plain text
 #: ../E/open.txt:17
 #, no-wrap
-msgid "Files can only be created and opened in the files/ folder which is located in the folder where Colobot has been installed. You cannot not create or open files that are located elsewhere than in the files/ folder."
+msgid "Files can only be created and opened in the files/ folder which is located in the folder inside Colobot save directory. You cannot not create or open files that are located elsewhere than in the files/ folder."
 msgstr "Les fichiers ne peuvent être créés et ouverts que dans le dossier files/, situé là où Colobot a été installé. Il n'est pas possible de créer ou ouvrir des fichiers situés ailleurs que dans ce dossier files/."
 
 #. type: Plain text
@@ -8043,7 +8043,7 @@ msgid ""
 "       <code><a object|flag>VioletFlag</a>        </code>Violet Flag\n"
 "       <code><a object|waypoint>WayPoint</a>          </code>Checkpoint\n"
 "       <code><a object|target2>Target2</a>           </code>Flying checkpoint\n"
-"       <code><a object|enerspot>EnergySpot</a>        </code>Underground Energy Deposit\n"
+"       <code><a object|enerspot>PowerSpot</a>        </code>Underground Energy Deposit\n"
 "       <code><a object|stonspot>TitaniumSpot</a>      </code>Underground Titanium Deposit\n"
 "       <code><a object|uranspot>UraniumSpot</a>       </code>Underground Uranium Deposit"
 msgstr ""

help/cbot/po/pl.po

@@ -753,8 +753,8 @@ msgstr "Instrukcja deletefile usuwa istniejący plik z folderu files/. "
 #. type: Plain text
 #: ../E/deletef.txt:4
 #, no-wrap
-msgid "Files can only be deleted in the files/ folder which is located in the folder where Colobot has been installed. You cannot not delete files that are located elsewhere than in the files/ folder."
-msgstr "Pliki mogą być usuwane tylko w folderze files/ znajdującym się w folderze, w którym została zainstalowana gra Colobot. Nie jest możliwe usuwanie plików znajdujących się w innych folderach."
+msgid "Files can only be deleted in the files/ folder which is located in the folder inside Colobot save directory. You cannot not delete files that are located elsewhere than in the files/ folder."
+msgstr "Pliki mogą być usuwane tylko w folderze files/ znajdującym się w folderze zapisów gry Colobot. Nie jest możliwe usuwanie plików znajdujących się w innych folderach."
 
 #. type: Source code
 #: ../E/deletef.txt:7
@@ -1409,8 +1409,8 @@ msgstr "Powyższej składni należ używać do deklarowania zmiennej plikowej. K
 #. type: Plain text
 #: ../E/file.txt:8
 #, no-wrap
-msgid "Files can only be created and opened in the files/ folder which is located in the folder where Colobot has been installed. You cannot not create or open files elsewhere than in the files/ folder."
-msgstr "Pliki mogą być tworzone i otwierane tylko w folderze files/, który znajduje sie w folderze instalacji gry Colobot. Nie jest możliwe tworzenie ani otwieranie plików poza folderem files/."
+msgid "Files can only be created and opened in the files/ folder which is located in the folder inside Colobot save directory. You cannot not create or open files elsewhere than in the files/ folder."
+msgstr "Pliki mogą być tworzone i otwierane tylko w folderze files/, który znajduje sie w folderze zapisów gry Colobot. Nie jest możliwe tworzenie ani otwieranie plików poza folderem files/."
 
 #. type: Plain text
 #: ../E/file.txt:11
@@ -2661,8 +2661,8 @@ msgstr ""
 #. type: Plain text
 #: ../E/open.txt:17
 #, no-wrap
-msgid "Files can only be created and opened in the files/ folder which is located in the folder where Colobot has been installed. You cannot not create or open files that are located elsewhere than in the files/ folder."
-msgstr "Pliki mogą być tworzone tylko w folderze files/ znajdującym się w folderze, w którym została zainstalowana gra Colobot. Nie jest możliwe tworzenie ani otwieranie plików znajdujących się w innych folderach."
+msgid "Files can only be created and opened in the files/ folder which is located in the folder inside Colobot save directory. You cannot not create or open files that are located elsewhere than in the files/ folder."
+msgstr "Pliki mogą być tworzone tylko w folderze files/ znajdującym się w folderze zapisów gry Colobot. Nie jest możliwe tworzenie ani otwieranie plików znajdujących się w innych folderach."
 
 #. type: Plain text
 #: ../E/open.txt:20
@@ -8208,7 +8208,7 @@ msgid ""
 "       <code><a object|flag>VioletFlag</a>        </code>Violet Flag\n"
 "       <code><a object|waypoint>WayPoint</a>          </code>Checkpoint\n"
 "       <code><a object|target2>Target2</a>           </code>Flying checkpoint\n"
-"       <code><a object|enerspot>EnergySpot</a>        </code>Underground Energy Deposit\n"
+"       <code><a object|enerspot>PowerSpot</a>        </code>Underground Energy Deposit\n"
 "       <code><a object|stonspot>TitaniumSpot</a>      </code>Underground Titanium Deposit\n"
 "       <code><a object|uranspot>UraniumSpot</a>       </code>Underground Uranium Deposit"
 msgstr ""