COLOBOT: Gold Edition -> Colobot: Gold Edition

8 files changed, 77 insertions, 60 deletions

diff --git a/data b/data
-Subproject 617140ad6b7061b803a47d274235a9b452f6f19
+Subproject 212fd6b769782ea4372879d939bafa3722141a8
diff --git a/po/colobot.pot b/po/colobot.pot
index eac81e7..3a1ddea 100644
--- a/po/colobot.pot
+++ b/po/colobot.pot
@@ -50,10 +50,7 @@ msgstr ""
 msgid " or "
 msgstr ""
 
-msgid "COLOBOT"
-msgstr ""
-
-msgid "COLOBOT: Gold Edition"
+msgid "Colobot: Gold Edition"
 msgstr ""
 
 msgid "Programming exercises"
@@ -140,10 +137,10 @@ msgstr ""
 msgid "Strip color:"
 msgstr ""
 
-msgid "Do you want to quit COLOBOT ?"
+msgid "Do you want to quit Colobot: Gold Edition?"
 msgstr ""
 
-msgid "Quit\\Quit COLOBOT"
+msgid "Quit\\Quit Colobot: Gold Edition"
 msgstr ""
 
 msgid "Quit the mission?"
@@ -282,7 +279,7 @@ msgstr ""
 msgid "Load\\Load a saved mission"
 msgstr ""
 
-msgid "\\Return to COLOBOT"
+msgid "\\Return to Colobot: Gold Edition"
 msgstr ""
 
 msgid "<<  Back  \\Back to the previous screen"
diff --git a/po/de.po b/po/de.po
index fe44ba0..5a63f51 100644
--- a/po/de.po
+++ b/po/de.po
@@ -313,12 +313,6 @@ msgstr "Gebäude zu nahe"
 msgid "Button %1"
 msgstr "Knopf %1"
 
-msgid "COLOBOT"
-msgstr "COLOBOT"
-
-msgid "COLOBOT: Gold Edition"
-msgstr "COLOBOT: Gold Edition"
-
 msgid "Calling an unknown function"
 msgstr "Die aufgerufene Funktion existiert nicht"
 
@@ -394,6 +388,10 @@ msgstr "Es fehlt eine geschlossene Klammer \")\""
 msgid "Colobot rules!"
 msgstr "Colobot ist wunderbar!"
 
+#, fuzzy
+msgid "Colobot: Gold Edition"
+msgstr "COLOBOT: Gold Edition"
+
 msgid "Command line"
 msgstr "Befehleingabe"
 
@@ -488,7 +486,8 @@ msgstr "Wollen Sie das angewählte Gebäude wirklich zerstören ?"
 msgid "Do you want to delete %s's saved games? "
 msgstr "Wollen Sie die gespeicherten Missionen von %s löschen ?"
 
-msgid "Do you want to quit COLOBOT ?"
+#, fuzzy
+msgid "Do you want to quit Colobot: Gold Edition?"
 msgstr "Wollen Sie COLOBOT schließen ?"
 
 msgid "Doors blocked by a robot or another object "
@@ -1141,8 +1140,8 @@ msgstr "Beben bei Explosionen\\Die Kamera bebt bei Explosionen"
 msgid "Quit the mission?"
 msgstr "Mission abbrechen ?"
 
-msgid "Quit\\Quit COLOBOT"
-msgstr "Schließen\\COLOBOT schließen"
+msgid "Quit\\Quit Colobot: Gold Edition"
+msgstr ""
 
 msgid "Quit\\Quit the current mission or exercise"
 msgstr "Mission verlassen\\Eine Mission oder Übung verlassen"
@@ -1689,8 +1688,8 @@ msgstr "\\Bleistift abheben"
 msgid "\\Red flags"
 msgstr "\\Rote Fahne"
 
-msgid "\\Return to COLOBOT"
-msgstr "\\Zurück zu COLOBOT"
+msgid "\\Return to Colobot: Gold Edition"
+msgstr ""
 
 msgid "\\SatCom on standby"
 msgstr "\\SatCom in Standby"
@@ -1760,3 +1759,12 @@ msgstr "\\c; (keine)\\n;\n"
 
 msgid "www.epsitec.com"
 msgstr "www.epsitec.com"
+
+#~ msgid "COLOBOT"
+#~ msgstr "COLOBOT"
+
+#~ msgid "Quit\\Quit COLOBOT"
+#~ msgstr "Schließen\\COLOBOT schließen"
+
+#~ msgid "\\Return to COLOBOT"
+#~ msgstr "\\Zurück zu COLOBOT"
diff --git a/po/fr.po b/po/fr.po
index 136d445..a72fc23 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -308,12 +308,6 @@ msgstr "Bâtiment trop proche"
 msgid "Button %1"
 msgstr "Bouton %1"
 
-msgid "COLOBOT"
-msgstr "COLOBOT"
-
-msgid "COLOBOT: Gold Edition"
-msgstr "COLOBOT: Gold Edition"
-
 msgid "Calling an unknown function"
 msgstr "Appel d'une fonction inexistante"
 
@@ -389,6 +383,10 @@ msgstr "Il manque une parenthèse fermante"
 msgid "Colobot rules!"
 msgstr "Colobot est super!"
 
+#, fuzzy
+msgid "Colobot: Gold Edition"
+msgstr "COLOBOT: Gold Edition"
+
 msgid "Command line"
 msgstr "Console de commande"
 
@@ -483,7 +481,8 @@ msgstr "Voulez-vous vraiment détruire le bâtiment sélectionné ?"
 msgid "Do you want to delete %s's saved games? "
 msgstr "Voulez-vous détruire les sauvegardes de %s ?"
 
-msgid "Do you want to quit COLOBOT ?"
+#, fuzzy
+msgid "Do you want to quit Colobot: Gold Edition?"
 msgstr "Voulez-vous quitter COLOBOT ?"
 
 msgid "Doors blocked by a robot or another object "
@@ -1137,8 +1136,8 @@ msgstr "Secousses lors d'explosions\\L'écran vibre lors d'une explosion"
 msgid "Quit the mission?"
 msgstr "Quitter la mission ?"
 
-msgid "Quit\\Quit COLOBOT"
-msgstr "Quitter\\Quitter COLOBOT"
+msgid "Quit\\Quit Colobot: Gold Edition"
+msgstr ""
 
 msgid "Quit\\Quit the current mission or exercise"
 msgstr "Quitter la mission en cours\\Terminer un exercice ou une mssion"
@@ -1685,8 +1684,8 @@ msgstr "\\Relève le crayon"
 msgid "\\Red flags"
 msgstr "\\Drapeaux rouges"
 
-msgid "\\Return to COLOBOT"
-msgstr "\\Retourner dans COLOBOT"
+msgid "\\Return to Colobot: Gold Edition"
+msgstr ""
 
 msgid "\\SatCom on standby"
 msgstr "\\Mettre le SatCom en veille"
@@ -1756,3 +1755,12 @@ msgstr "\\c; (aucun)\\n;\n"
 
 msgid "www.epsitec.com"
 msgstr "www.epsitec.com"
+
+#~ msgid "COLOBOT"
+#~ msgstr "COLOBOT"
+
+#~ msgid "Quit\\Quit COLOBOT"
+#~ msgstr "Quitter\\Quitter COLOBOT"
+
+#~ msgid "\\Return to COLOBOT"
+#~ msgstr "\\Retourner dans COLOBOT"
diff --git a/po/pl.po b/po/pl.po
index 2c7ae2c..322bd92 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -315,12 +315,6 @@ msgstr "Budynek za blisko"
 msgid "Button %1"
 msgstr "Przycisk %1"
 
-msgid "COLOBOT"
-msgstr "COLOBOT"
-
-msgid "COLOBOT: Gold Edition"
-msgstr "COLOBOT: Gold Edition"
-
 msgid "Calling an unknown function"
 msgstr "Odwołanie do nieznanej funkcji"
 
@@ -396,6 +390,9 @@ msgstr "Brak nawiasu zamykającego"
 msgid "Colobot rules!"
 msgstr "Colobot rządzi!"
 
+msgid "Colobot: Gold Edition"
+msgstr "Colobot: Gold Edition"
+
 msgid "Command line"
 msgstr "Linia polecenia"
 
@@ -490,8 +487,8 @@ msgstr "Czy na pewno chcesz zniszczyć zaznaczony budynek?"
 msgid "Do you want to delete %s's saved games? "
 msgstr "Czy na pewno chcesz skasować zapisane gry gracza %s? "
 
-msgid "Do you want to quit COLOBOT ?"
-msgstr "Czy na pewno chcesz opuścić grę COLOBOT?"
+msgid "Do you want to quit Colobot: Gold Edition?"
+msgstr "Czy na pewno chcesz opuścić grę Colobot: Gold Edition?"
 
 msgid "Doors blocked by a robot or another object "
 msgstr "Drzwi zablokowane przez robota lub inny obiekt "
@@ -1147,8 +1144,8 @@ msgstr "Wstrząsy przy wybuchach\\Ekran trzęsie się podczas wybuchów"
 msgid "Quit the mission?"
 msgstr "Opuścić misję?"
 
-msgid "Quit\\Quit COLOBOT"
-msgstr "Zakończ\\Kończy grę COLOBOT"
+msgid "Quit\\Quit Colobot: Gold Edition"
+msgstr "Wyjdź\\Kończy grę Colobot: Gold Edition"
 
 msgid "Quit\\Quit the current mission or exercise"
 msgstr "Zakończ\\Kończy bieżącą misję lub ćwiczenie"
@@ -1697,8 +1694,8 @@ msgstr "\\Relčve le crayon"
 msgid "\\Red flags"
 msgstr "\\Czerwone flagi"
 
-msgid "\\Return to COLOBOT"
-msgstr "\\Powróć do gry COLOBOT"
+msgid "\\Return to Colobot: Gold Edition"
+msgstr "\\Powróć do gry Colobot: Gold Edition"
 
 msgid "\\SatCom on standby"
 msgstr "\\Przełącz przekaźnik SatCom w stan gotowości"
diff --git a/po/ru.po b/po/ru.po
index 76bc87b..f0276bf 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -308,12 +308,6 @@ msgstr "Здание слишком близко"
 msgid "Button %1"
 msgstr "Кнопка %1"
 
-msgid "COLOBOT"
-msgstr "КОЛОБОТ"
-
-msgid "COLOBOT: Gold Edition"
-msgstr ""
-
 msgid "Calling an unknown function"
 msgstr "Вызов неизвестной функции"
 
@@ -389,6 +383,9 @@ msgstr "Закрывающая скобка отсутствует"
 msgid "Colobot rules!"
 msgstr "Правила игры!"
 
+msgid "Colobot: Gold Edition"
+msgstr ""
+
 msgid "Command line"
 msgstr "Командная строка"
 
@@ -483,7 +480,8 @@ msgstr "Вы действительно хотите уничтожить выб
 msgid "Do you want to delete %s's saved games? "
 msgstr "Вы действительно хотите удалить сохраненные игры игрока %s?"
 
-msgid "Do you want to quit COLOBOT ?"
+#, fuzzy
+msgid "Do you want to quit Colobot: Gold Edition?"
 msgstr "Вы хотите закрыть COLOBOT?"
 
 msgid "Doors blocked by a robot or another object "
@@ -1138,8 +1136,8 @@ msgstr "Землетряс. при взрывах\\Тряска экрана п�
 msgid "Quit the mission?"
 msgstr "Завершить миссию?"
 
-msgid "Quit\\Quit COLOBOT"
-msgstr "Выход\\Выход из COLOBOT"
+msgid "Quit\\Quit Colobot: Gold Edition"
+msgstr ""
 
 msgid "Quit\\Quit the current mission or exercise"
 msgstr "Выход\\Выход из текущей миссии"
@@ -1686,8 +1684,8 @@ msgstr "\\Поднять перо"
 msgid "\\Red flags"
 msgstr "\\Красный флаг"
 
-msgid "\\Return to COLOBOT"
-msgstr "\\Вернуться в COLOBOT"
+msgid "\\Return to Colobot: Gold Edition"
+msgstr ""
 
 msgid "\\SatCom on standby"
 msgstr "\\SatCom ждет"
@@ -1757,3 +1755,12 @@ msgstr "\\c; (нет)\\n;\n"
 
 msgid "www.epsitec.com"
 msgstr "www.epsitec.com"
+
+#~ msgid "COLOBOT"
+#~ msgstr "КОЛОБОТ"
+
+#~ msgid "Quit\\Quit COLOBOT"
+#~ msgstr "Выход\\Выход из COLOBOT"
+
+#~ msgid "\\Return to COLOBOT"
+#~ msgstr "\\Вернуться в COLOBOT"
diff --git a/src/app/app.cpp b/src/app/app.cpp
index 93fb554..6f33389 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -116,7 +116,7 @@ CApplication::CApplication()
     m_debugModes = 0;
     m_restart   = false;
 
-    m_windowTitle = "COLOBOT: Gold Edition";
+    m_windowTitle = "Colobot: Gold Edition";
 
     m_simulationSuspended = false;
 
diff --git a/src/common/restext.cpp b/src/common/restext.cpp
index 95e015c..66e3606 100644
--- a/src/common/restext.cpp
+++ b/src/common/restext.cpp
@@ -65,8 +65,8 @@ void InitializeRestext()
     stringsText[RT_IO_NEW]           = TR("New ...");
     stringsText[RT_KEY_OR]           = TR(" or ");
 
-    stringsText[RT_TITLE_BASE]       = TR("COLOBOT");
-    stringsText[RT_TITLE_INIT]       = TR("COLOBOT: Gold Edition");
+    stringsText[RT_TITLE_BASE]       = TR("Colobot: Gold Edition");
+    stringsText[RT_TITLE_INIT]       = TR("Colobot: Gold Edition");
     stringsText[RT_TITLE_TRAINER]    = TR("Programming exercises");
     stringsText[RT_TITLE_DEFI]       = TR("Challenges");
     stringsText[RT_TITLE_MISSION]    = TR("Missions");
@@ -102,9 +102,9 @@ void InitializeRestext()
     stringsText[RT_PERSO_COMBI]      = TR("Suit color:");
     stringsText[RT_PERSO_BAND]       = TR("Strip color:");
 
-    stringsText[RT_DIALOG_QUIT]      = TR("Do you want to quit COLOBOT ?");
-    stringsText[RT_DIALOG_TITLE]     = TR("COLOBOT");
-    stringsText[RT_DIALOG_YESQUIT]   = TR("Quit\\Quit COLOBOT");
+    stringsText[RT_DIALOG_QUIT]      = TR("Do you want to quit Colobot: Gold Edition?");
+    stringsText[RT_DIALOG_TITLE]     = TR("Colobot: Gold Edition");
+    stringsText[RT_DIALOG_YESQUIT]   = TR("Quit\\Quit Colobot: Gold Edition");
     stringsText[RT_DIALOG_ABORT]     = TR("Quit the mission?");
     stringsText[RT_DIALOG_YES]       = TR("Abort\\Abort the current mission");
     stringsText[RT_DIALOG_NO]        = TR("Continue\\Continue the current mission");
@@ -163,8 +163,8 @@ void InitializeRestext()
     stringsEvent[EVENT_INTERFACE_AGAIN]     = TR("Restart\\Restart the mission from the beginning");
     stringsEvent[EVENT_INTERFACE_WRITE]     = TR("Save\\Save the current mission ");
     stringsEvent[EVENT_INTERFACE_READ]      = TR("Load\\Load a saved mission");
-    stringsEvent[EVENT_INTERFACE_ABORT]     = TR("\\Return to COLOBOT");
-    stringsEvent[EVENT_INTERFACE_QUIT]      = TR("Quit\\Quit COLOBOT");
+    stringsEvent[EVENT_INTERFACE_ABORT]     = TR("\\Return to Colobot: Gold Edition");
+    stringsEvent[EVENT_INTERFACE_QUIT]      = TR("Quit\\Quit Colobot: Gold Edition");
     stringsEvent[EVENT_INTERFACE_BACK]      = TR("<<  Back  \\Back to the previous screen");
     stringsEvent[EVENT_INTERFACE_PLAY]      = TR("Play\\Start mission!");
     stringsEvent[EVENT_INTERFACE_SETUPd]    = TR("Device\\Driver and resolution settings");