fix icon behavior and update translation

Author: Olivier Butler

data/po/cn/strings.po

@@ -265,3 +265,21 @@ msgstr "BetterPushback是開源軟件。請參閱COPYING以獲取更多信息。
 
 msgid "Hint: hover your mouse cursor over any label to show a short description of what it does."
 msgstr "提示：將鼠標光標懸停在任何標籤上以顯示其功能的簡短描述。"
+
+msgid   "Push-back waiting to be called"
+msgstr  "推机等待被呼叫"
+
+msgid "The tug appears next to the plane avoiding in certain case that he is "
+    "travelling inside the buildings."
+msgstr  "拖车出现在飞机旁，避免在某些情况下穿过建筑物内部。"
+
+msgid "The tug will appear once the beacon light is switched from off to on "
+      "then the process will proceed as 'connect the tug first'."
+msgstr  "拖车将在信标灯从关闭切换到开启时出现，"
+        "然后按照'首先连接拖车'的步骤继续进行。"
+
+msgid "Tug starts near the aircraft"
+msgstr  "拖车从飞机附近开始"
+
+msgid "Tug called by activating the beacon"
+msgstr  "通过激活信标呼叫拖车"

data/po/de/strings.po

@@ -251,4 +251,22 @@ msgid "Sound output device"
 msgstr "Tonausgabegerät"
 
 msgid "Audio settings"
-msgstr "Audioeinstellungen"
+msgstr "Audioeinstellungen"
+
+msgid   "Push-back waiting to be called"
+msgstr  "Schleppvorgang wartet auf Aufruf"
+
+msgid "The tug appears next to the plane avoiding in certain case that he is "
+    "travelling inside the buildings."
+msgstr  "Das Schleppfahrzeug erscheint neben dem Flugzeug und vermeidet in bestimmten Fällen, dass es durch Gebäude fährt."
+
+msgid "The tug will appear once the beacon light is switched from off to on "
+      "then the process will proceed as 'connect the tug first'."
+msgstr  "Der Schlepper erscheint, sobald das Beacon-Licht von aus auf an geschaltet wird, "
+        "dann wird der Prozess mit der Anweisung 'zuerst den Schlepper verbinden' fortgesetzt."
+        
+msgid "Tug starts near the aircraft"
+msgstr  "Das Schleppfahrzeug startet in der Nähe des Flugzeugs"
+
+msgid "Tug called by activating the beacon"
+msgstr  "Das Schleppfahrzeug wird durch Aktivierung des Beacon-Lichts gerufen"

data/po/es/strings.po

@@ -251,3 +251,21 @@ msgstr "Dispositivo de salida de sonido"
 
 msgid "Audio settings"
 msgstr "Configuración de audio"
+
+msgid   "Push-back waiting to be called"
+msgstr  "Retroceso en espera de ser llamado"
+
+msgid "The tug appears next to the plane avoiding in certain case that he is "
+    "travelling inside the buildings."
+msgstr  "El remolcador aparece junto al avión, evitando en ciertos casos que pase por dentro de los edificios."
+
+msgid "The tug will appear once the beacon light is switched from off to on "
+      "then the process will proceed as 'connect the tug first'."
+msgstr  "El remolcador aparecerá una vez que la luz del faro pase de apagada a encendida, "
+        "luego el proceso continuará con 'conectar primero el remolcador'."
+
+msgid "Tug starts near the aircraft"
+msgstr  "El remolcador comienza cerca del avión"
+
+msgid "Tug called by activating the beacon"
+msgstr  "El remolcador se activa encendiendo el faro"

data/po/fr/strings.po

@@ -421,4 +421,22 @@ msgstr "Certains plugins avec Eye tracking  (suivi occulaire) utilisent le syst
     "Si vous n'avez pas de problème, laissez ce réglage sur : Aucun."
 
 msgid  "None"
-msgstr  "Aucun"
+msgstr  "Aucun"
+
+msgid   "Push-back waiting to be called"
+msgstr  "Repoussage en attente d'être appelé"
+
+msgid "The tug appears next to the plane avoiding in certain case that he is "
+    "travelling inside the buildings."
+msgstr  "Le tracteur apparaît à côté de l'avion, évitant dans certains cas que celui passe à travers les bâtiments."
+
+msgid "The tug will appear once the beacon light is switched from off to on "
+      "then the process will proceed as 'connect the tug first'."
+msgstr  "Le tracteur apparaîtra une fois que l'anti-collision sera allumée, "
+        "puis le processus se poursuivra en suivant l'étape 'connecter d'abord le tracteur'."
+
+msgid "Tug starts near the aircraft"
+msgstr  "Le tracteur démarre près de l'avion"
+
+msgid "Tug called by activating the beacon"
+msgstr  "Le tracteur est appelé en activant l'anti-collision"

data/po/it/strings.po

@@ -271,3 +271,22 @@ msgstr "Dispositivo di uscita audio"
 
 msgid "Audio settings"
 msgstr "Impostazioni audio"
+
+msgid   "Push-back waiting to be called"
+msgstr  "Push-back in attesa di essere chiamato"
+
+msgid "The tug appears next to the plane avoiding in certain case that he is "
+    "travelling inside the buildings."
+msgstr  "Il trattore appare accanto all'aereo, evitando in alcuni casi di attraversare gli edifici."
+
+msgid "The tug will appear once the beacon light is switched from off to on "
+      "then the process will proceed as 'connect the tug first'."
+msgstr  "Il trattore apparirà una volta che la luce del faro sarà accesa, "
+        "poi il processo proseguirà con 'collegare prima il trattore'."
+       
+
+msgid "Tug starts near the aircraft"
+msgstr  "Il trattore inizia vicino all'aereo"
+
+msgid "Tug called by activating the beacon"
+msgstr  "Il trattore viene chiamato attivando il faro"

data/po/pt/strings.po

@@ -251,4 +251,22 @@ msgid "Sound output device"
 msgstr "Dispositivo de saída de som"
 
 msgid "Audio settings"
-msgstr "Configurações de áudio"
+msgstr "Configurações de áudio"
+
+msgid   "Push-back waiting to be called"
+msgstr  "Reboque aguardando para ser chamado"
+
+msgid "The tug appears next to the plane avoiding in certain case that he is "
+    "travelling inside the buildings."
+msgstr  "O reboque aparece ao lado do avião, evitando em certos casos que ele passe por dentro dos edifícios."
+
+msgid "The tug will appear once the beacon light is switched from off to on "
+      "then the process will proceed as 'connect the tug first'."
+msgstr  "O reboque aparecerá assim que a luz do farol for ligada, "
+        "então o processo continuará com 'conectar o reboque primeiro'."
+
+msgid "Tug starts near the aircraft"
+msgstr  "O reboque começa próximo à aeronave"
+
+msgid "Tug called by activating the beacon"
+msgstr  "O reboque é chamado ao ativar o beacon"

data/po/pt_BR/strings.po

@@ -566,4 +566,22 @@ msgstr "O processo de reboque e sempre interrompido quando o rebocador esta no n
         "O processo continuara apos acionar novamente o comando 'iniciar pushback'."
 
 msgid "Audio settings"
-msgstr "Configurações de áudio"
+msgstr "Configurações de áudio"
+
+msgid   "Push-back waiting to be called"
+msgstr  "Reboque aguardando para ser chamado"
+
+msgid "The tug appears next to the plane avoiding in certain case that he is "
+    "travelling inside the buildings."
+msgstr  "O reboque aparece ao lado do avião, evitando em alguns casos que ele passe por dentro dos prédios."
+
+msgid "The tug will appear once the beacon light is switched from off to on "
+      "then the process will proceed as 'connect the tug first'."
+msgstr  "O reboque aparecerá assim que a luz do beacon for ligada, "
+        "então o processo continuará com 'conectar o reboque primeiro'."
+
+msgid "Tug starts near the aircraft"
+msgstr  "O reboque começa próximo à aeronave"
+
+msgid "Tug called by activating the beacon"
+msgstr  "O reboque é acionado ao ativar o beacon"

data/po/ru/strings.po

@@ -255,3 +255,21 @@ msgstr "BetterPushback - это программное обеспечение с
 
 msgid "Hint: hover your mouse cursor over any label to show a short description of what it does."
 msgstr "Подсказка: наведите курсор мыши на любую метку, чтобы отобразить краткое описание ее функций."
+
+msgid   "Push-back waiting to be called"
+msgstr  "Транспортер ожидает вызова"
+
+msgid "The tug appears next to the plane avoiding in certain case that he is "
+    "travelling inside the buildings."
+msgstr  "Трактор появляется рядом с самолетом, избегая в некоторых случаях проезда через здания."
+
+msgid "The tug will appear once the beacon light is switched from off to on "
+      "then the process will proceed as 'connect the tug first'."
+msgstr  "Трактор появится, как только свет маяка переключится с выключенного на включенный, "
+        "затем процесс продолжится с шагом 'сначала подключите трактор'."
+
+msgid "Tug starts near the aircraft"
+msgstr  "Трактор начинает движение рядом с самолетом"
+
+msgid "Tug called by activating the beacon"
+msgstr  "Трактор вызывается активацией маяка"

data/po/strings.pot

@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: PACKAGE VERSION\n"
         "Report-Msgid-Bugs-To: \n"
-        "POT-Creation-Date: 2025-01-11 18:32+0200\n"
+        "POT-Creation-Date: 2025-01-12 08:59+0200\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -89,25 +89,25 @@ msgid   "Pushback failure: please first plan your pushback to tell me where "
 msgstr  ""
 
 #: src/bp.c:1863 src/bp.c:1864 src/bp.c:1866 src/bp.c:1867 src/bp.c:1871
-#: src/bp.c:1873 src/bp.c:1874 src/bp.c:1884 src/bp.c:1879
+#: src/bp.c:1873 src/bp.c:1874 src/bp.c:1884 src/bp.c:1879 src/bp.c:1880
 #, c-format
 msgid   "ERROR: master requested tug \"%s\", which we don't have in our in "
         "our library. Please sync your tug libraries before trying again."
 msgstr  ""
 
 #: src/bp.c:1965 src/bp.c:1966 src/bp.c:1992 src/bp.c:1994 src/bp.c:1993
-#: src/bp.c:1997 src/bp.c:1990 src/bp.c:2003 src/bp.c:1998
+#: src/bp.c:1997 src/bp.c:1990 src/bp.c:2003 src/bp.c:1998 src/bp.c:1999
 msgid   "Pushback warning: unable to remove your chocks. Remove them "
         "yourself, or else I won't be able to push your aircraft."
 msgstr  ""
 
 #: src/bp.c:2233 src/bp.c:2234 src/bp.c:2260 src/bp.c:2262 src/bp.c:2261
-#: src/bp.c:2265 src/bp.c:2258 src/bp.c:2271 src/bp.c:2266
+#: src/bp.c:2265 src/bp.c:2258 src/bp.c:2271 src/bp.c:2266 src/bp.c:2267
 msgid   "Hey! Quit blinding me with your landing lights! Turn them off!"
 msgstr  ""
 
 #: src/bp.c:2236 src/bp.c:2237 src/bp.c:2263 src/bp.c:2265 src/bp.c:2264
-#: src/bp.c:2268 src/bp.c:2261 src/bp.c:2274 src/bp.c:2269
+#: src/bp.c:2268 src/bp.c:2261 src/bp.c:2274 src/bp.c:2269 src/bp.c:2270
 msgid   "Hey! Quit blinding me with your taxi light! Turn it off!"
 msgstr  ""
 
@@ -416,15 +416,15 @@ msgid   "Slide this bar to move the magic squares up or down."
 msgstr  ""
 
 #: src/bp.c:2186 src/bp.c:2187 src/bp.c:2213 src/bp.c:2215 src/bp.c:2214
-#: src/bp.c:2218 src/bp.c:2211 src/bp.c:2224 src/bp.c:2219
+#: src/bp.c:2218 src/bp.c:2211 src/bp.c:2224 src/bp.c:2219 src/bp.c:2220
 msgid   "Waiting for the parking brakes release"
 msgstr  ""
 
 #: src/bp.c:2331 src/bp.c:3290 src/bp.c:2332 src/bp.c:3291 src/bp.c:2358
 #: src/bp.c:3317 src/bp.c:2360 src/bp.c:3319 src/bp.c:2359 src/bp.c:3318
 #: src/bp.c:2363 src/bp.c:3324 src/bp.c:3326 src/bp.c:2356 src/bp.c:3315
 #: src/bp.c:3335 src/bp.c:3336 src/bp.c:3341 src/bp.c:2369 src/bp.c:3353
-#: src/bp.c:2364 src/bp.c:3348 src/bp.c:3346 src/bp.c:3345
+#: src/bp.c:2364 src/bp.c:3348 src/bp.c:3346 src/bp.c:3345 src/bp.c:2365
 msgid   "Waiting for the parking brakes set"
 msgstr  ""
 
@@ -543,7 +543,7 @@ msgid   "Driving the tug away back to his station"
 msgstr  ""
 
 #: src/bp.c:2153 src/bp.c:2154 src/bp.c:2180 src/bp.c:2182 src/bp.c:2181
-#: src/bp.c:2185 src/bp.c:2178 src/bp.c:2191 src/bp.c:2186
+#: src/bp.c:2185 src/bp.c:2178 src/bp.c:2191 src/bp.c:2186 src/bp.c:2187
 msgid   "Connected to the aircraft, waiting for clearance"
 msgstr  ""
 
@@ -573,10 +573,20 @@ msgstr  ""
 msgid   "Open preference window."
 msgstr  ""
 
-#: src/bp.c:3302
-msgid   "Push-back will be called once the beacon will be to on"
-msgstr  ""
-
 #: src/bp.c:3302 src/bp.c:3301
 msgid   "Push-back waiting to be called"
 msgstr  ""
+
+msgid   "The tug appears next to the plane avoiding in certain case that he "
+        "is travelling inside the buildings."
+msgstr  ""
+
+msgid   "The tug will appear once the beacon light is switched from off to on "
+        "then the process will proceed as 'connect the tug first'."
+msgstr  ""
+
+msgid   "Tug starts near the aircraft"
+msgstr  ""
+
+msgid   "Tug called by activating the beacon"
+msgstr  ""

data/po/zh/strings.po

@@ -162,3 +162,21 @@ msgstr "使用鼠标左键来控制视角"
 
 msgid "Tug cab view"
 msgstr "后推车视角"
+
+msgid   "Push-back waiting to be called"
+msgstr  "推机等待被呼叫"
+
+msgid "The tug appears next to the plane avoiding in certain case that he is "
+    "travelling inside the buildings."
+msgstr  "拖车出现在飞机旁，避免在某些情况下穿过建筑物内部。"
+
+msgid "The tug will appear once the beacon light is switched from off to on "
+      "then the process will proceed as 'connect the tug first'."
+msgstr  "拖车将在信标灯从关闭切换到开启时出现，"
+        "然后按照'首先连接拖车'的步骤继续进行。"
+
+msgid "Tug starts near the aircraft"
+msgstr  "拖车从飞机附近开始"
+
+msgid "Tug called by activating the beacon"
+msgstr  "通过激活信标呼叫拖车"

src/bp.c

@@ -1612,6 +1612,7 @@ bp_stop(void) {
         bp.last_seg_is_back = seg->backward;
     bp_delete_all_segs();
     late_plan_requested = B_FALSE;
+    tug_pending_mode = B_FALSE;
 
     return (B_TRUE);
 }

src/cfg.cpp

@@ -131,10 +131,11 @@ const char *always_connect_tug_first_tooltip =
     "The process will proceed by triggering again the 'start pushback' "
     "command.";
 const char *tug_starts_next_plane_tooltip =
-    "The tug appears next to the plane avoiding in certain case the tug "
+    "The tug appears next to the plane avoiding in certain case that he is "
     "travelling inside the buildings.";
 const char *tug_auto_start_tooltip =
-    "The tug will appear once the beacon light is on.";
+    "The tug will appear once the beacon light is switched from off to on "
+    "then the process will proceed as 'connect the tug first'.";
 const char *ignore_park_brake_tooltip =
     "Never check \"set parking brake\".\n"
     "Some aircraft stuck on this check.\n"

src/xplane.c

@@ -360,7 +360,7 @@ start_pb_handler(XPLMCommandRef cmd, XPLMCommandPhase phase, void *refcon)
     bool_t always_connect_tug_first = B_FALSE;
     (void)conf_get_b(bp_conf, "always_connect_tug_first", &always_connect_tug_first);
 
-    if (always_connect_tug_first && !bp_started)
+    if ( ((tug_auto_start && tug_starts_next_plane) || always_connect_tug_first) && !bp_started)
     {
         return conn_first_handler(cmd, phase, refcon);
     }