Merge branch '1.14' of https://github.com/wesnoth/wesnoth into 1.14

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "The Battle for Wesnoth"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.14.0+dev
+PROJECT_NUMBER         = 1.14.1+dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

changelog.md

@@ -1,11 +1,13 @@
-## Version 1.14.0+dev
+## Version 1.14.1+dev
+
+## Version 1.14.1
  ### Campaigns
    * Eastern Invasion:
      * In 'Captured', fixed units incorrectly costing upkeep after leveling up.
    * Secrets of the Ancients
      * Fixed minor unit naming inconsistencies (issues #2844 and #2846).
    * Under the Burning Suns
-     * Added a custom terrain for the broken tree in S1.
+     * Added custom graphics for the broken tree in S1.
      * Various sprite and image updates.
      * Fixed a bug in the formation ability causing defense bonuses not being
        received in some cases.
@@ -45,6 +47,10 @@
    * Document --log-none in the wesnoth(6) manpage.
    * Avoid trying to load invalid base64-encoded data URIs.
    * wesnoth_addon_manager and the addons.wesnoth.org web index can now use data URIs.
+   * Fixed a crash when using certain invalid color= values.
+   * Implemented a workaround for an unhandled std::bad_cast from string comparison
+     functions that caused a crash-to-desktop when opening Preferences among others
+     (issue #3050).
 
 ## Version 1.14.0
  ### Campaigns

data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg

@@ -322,13 +322,13 @@ _"Nym is Kaleh’s childhood friend, a young, rebellious lady with quick wits an
     {DEFENSE_ANIM_FILTERED "units/quenoth/kaleh-bow-defend-2.png" "units/quenoth/kaleh-bow-defend-1.png" {SOUND_LIST:ELF_FEMALE_HIT} (
         [filter_second_attack]
             name=bow
-        [/filter_second_attack] 
-	)}
+        [/filter_second_attack]
+    )}
     {DEFENSE_ANIM_FILTERED "units/quenoth/kaleh-defend-2.png" "units/quenoth/kaleh-defend-1.png" {SOUND_LIST:ELF_FEMALE_HIT} (
         [filter_second_attack]
             name=bolas
-        [/filter_second_attack] 
-	)}
+        [/filter_second_attack]
+    )}
     [attack_anim]
         [filter_attack]
             name=bow

data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg

@@ -207,15 +207,15 @@
                 speaker=narrator
                 caption= _ "Movement"
                 image=wesnoth-icon.png
-                message= _ "When you select a unit, in this case Konrad, the places he can move to are highlighted. All units have a certain number of <i>movement points</i>, which dictate how many hexes that unit can move per turn. Normally, moving one hex on flat terrain uses one movement point. To move, simply click on your destination. (You can press <b>u</b> to undo a move if you move to the wrong place.)" +
+                message= _ "When you hover over or select a unit, in this case Konrad, the places he can move to are highlighted. All units have a certain number of <i>movement points</i>, which dictate how many hexes that unit can move per turn. Normally, moving one hex on flat terrain uses one movement point. To move, simply click on Konrad and then your destination. (You can press <b>u</b> to undo a move if you move to the wrong place.)" +
                     {CONTINUE_MSG}
             [/message]
         ) (
             [message]
                 speaker=narrator
                 caption= _ "Movement"
                 image=wesnoth-icon.png
-                message= _ "When you select a unit, in this case Li’sar, the places she can move to are highlighted. All units have a certain number of <i>movement points</i>, which dictate how many hexes that unit can move per turn. Normally, moving one hex on flat terrain uses one movement point. To move, simply click on your destination. (You can press <b>u</b> to undo a move if you move to the wrong place.)" +
+                message= _ "When you hover over or select a unit, in this case Li’sar, the places she can move to are highlighted. All units have a certain number of <i>movement points</i>, which dictate how many hexes that unit can move per turn. Normally, moving one hex on flat terrain uses one movement point. To move, simply click on Li’sar and then your destination. (You can press <b>u</b> to undo a move if you move to the wrong place.)" +
                     {CONTINUE_MSG}
             [/message]
         )}

data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg

@@ -417,7 +417,7 @@ A full list of abilities and weapons specials, along with traits, may be found i
 
         [message]
             speaker=Galdrad
-            message= _ "You could. However, elves (and orcs) have bad <i>defense</i> in water. You’ll be more vulnerable as you try to wade slowly across the ford; the enemy will have an 80% chance to hit you. Since elves have good defense in the forest, I would advise you keep to the trees and attack the orcs from there; you’ll only have a 40% chance of being hit in return."
+            message= _ "You could. However, elves (and orcs) have bad <i>defense</i> in water. You’ll be more vulnerable as you try to wade slowly across the ford; the enemy will have an 80% chance to hit you. Since elves have good defense in the forest, I would advise you keep to the trees and attack the orcs from there; your Fighters will only suffer a 40% chance of being hit in return, while Shamans and Archers will only incur a 30% chance."
         [/message]
 
         [message]
@@ -667,7 +667,7 @@ A full list of abilities and weapons specials, along with traits, may be found i
             speaker=narrator
             caption= _ "Time of Day"
             image=wesnoth-icon.png
-            message= _ "During a scenario, the time of day will shift as turns pass. There are four <i>alignments</i> a unit may be: Lawful, Neutral, Chaotic, or Liminal. Each alignment gets a different bonus or handicap depending on the time of day. You can mouse over the landscape image below the minimap on the right to see the current time of day and who has the advantage."
+            message= _ "During a scenario, the time of day will shift as turns pass. There are four <i>alignments</i> a unit may be: Lawful, Neutral, Chaotic, or Liminal. Each alignment gets a different bonus or handicap depending on the time of day. You can hover over the sky image below the minimap on the right to see the current time of day and who has the advantage."
         [/message]
     [/event]
 
@@ -1016,8 +1016,8 @@ A full list of abilities and weapons specials, along with traits, may be found i
 
         [message]
             speaker=unit
-            message= _ "Advancing a level has fully healed me! I always have a 60% chance of hitting with my <i>Marksman</i> ability, and I deal 9 damage each for 4 attacks. Use me to dislodge hard-to-hit units."
-            female_message= _ "female^Advancing a level has fully healed me! I always have a 60% chance of hitting with my <i>Marksman</i> ability, and I deal 9 damage each for 4 attacks. Use me to dislodge hard-to-hit units."
+            message= _ "Advancing a level has fully healed me! When attacking, I always have at least a 60% chance of hitting with my longbow thanks to my <i>Marksman</i> ability, and I deal 9 damage each for 4 attacks. Use me to dislodge hard-to-hit units."
+            female_message= _ "female^Advancing a level has fully healed me! When attacking, I always have at least a 60% chance of hitting with my longbow thanks to my <i>Marksman</i> ability, and I deal 9 damage each for 4 attacks. Use me to dislodge hard-to-hit units."
         [/message]
     [/event]
 

data/core/help.cfg

@@ -489,9 +489,9 @@ In <italic>text='Multiplayer'</italic> mode, you can choose an era when creating
 
 You can see what eras you have loaded in the <ref>text='eras' dst='..eras_section'</ref> of the help." + _ "
 
-<header>text='Multiplayer Modifications'</header>" + _ "
+<header>text='Modifications'</header>" + _ "
 
-Modifications are optional scenario- and era-independent scripts for <italic>text='Multiplayer'</italic> games that can alter the default ruleset in various ways. You can choose and configure modifications when creating a new game." + _ "
+Modifications are optional scenario- and era-independent scripts that can alter the default ruleset in various ways. You can choose and configure modifications when creating a new game." + _ "
 
 <header>text='Creator Resources'</header>" + _ "
 

doc/man/de/wesnoth.6

@@ -318,10 +318,9 @@ werden soll. Die Ära wird anhand ihrer ID bestimmt. Eine genaue Beschreibung
 der Rassen und Epochen ist in der Datei \fBdata/multiplayer.cfg\fP zu finden.
 .TP 
 \fB\-\-exit\-at\-end\fP
-Beendet das Spiel am Ende eines Szenarios, ohne die
-Sieg/Niederlage\-Übersicht anzuzeigen, da der Benutzer hier »Ok« auswählen
-müsste, damit das Spiel fortgesetzt wird. Dies wird ebenfalls bei
-automatisierten Leistungsvergleichen verwendet.
+exits once the scenario is over, without displaying victory/defeat dialog
+which normally requires the user to click End Scenario.  This is also used
+for scriptable benchmarking.
 .TP 
 \fB\-\-ignore\-map\-settings\fP
 Ignoriert die kartenspezifischen Einstellungen, stattdessen werden

doc/man/en_GB/wesnoth.6

@@ -112,7 +112,7 @@ ang_GB@latin\fP
 \fB\-\-log\-\fP\fIlevel\fP\fB=\fP\fIdomain1\fP\fB,\fP\fIdomain2\fP\fB,\fP\fI...\fP
 sets the severity level of the log domains.  \fBall\fP can be used to match any
 log domain. Available levels: \fBerror\fP,\ \fBwarning\fP,\ \fBinfo\fP,\ \fBdebug\fP,\ \fBnone\fP.  By default the \fBwarning\fP level is used for most domains, but
-\fBdeprecation\fP defaults to none.
+\fBdeprecation\fP is none by default.
 .TP 
 \fB\-\-log\-precise\fP
 shows the timestamps in the logfile with more precision.
@@ -295,8 +295,8 @@ era. The era is chosen by an id. Eras are described in the
 .TP 
 \fB\-\-exit\-at\-end\fP
 exits once the scenario is over, without displaying victory/defeat dialog
-which requires the user to click OK.  This is also used for script\-based
-benchmarking.
+which normally requires the user to click End Scenario.  This is also used
+for scriptable benchmarking.
 .TP 
 \fB\-\-ignore\-map\-settings\fP
 do not use map settings, use default values instead.

doc/man/es/wesnoth.6

@@ -114,9 +114,11 @@ editor mostrará un diálogo de selección de archivos apuntando a éste.
 usa el idioma \fIlang\fP en esta sesión.  Ejemplo: \fB\-\-language ang_GB@latin\fP
 .TP 
 \fB\-\-log\-\fP\fInivel\fP\fB=\fP\fIdominio1\fP\fB,\fP\fIdominio2\fP\fB,\fP\fI...\fP
-sets the severity level of the log domains.  \fBall\fP can be used to match any
-log domain. Available levels: \fBerror\fP,\ \fBwarning\fP,\ \fBinfo\fP,\ \fBdebug\fP,\ \fBnone\fP.  By default the \fBwarning\fP level is used for most domains, but
-\fBdeprecation\fP defaults to none.
+establece el nivel de gravedad del registro en los dominios. \fBall\fP puede
+utilizarse para coincidir con cualquier registro en un dominio. Los niveles
+disponibles son: \fBerror\fP,\ \fBwarning\fP,\ \fBinfo\fP,\ \fBdebug\fP,\ \fBnone\fP. Por
+omisión se utiliza el nivel \fBwarning\fP para la mayoría de los dominios, pero
+\fBdeprecation\fP no determina ninguno.
 .TP 
 \fB\-\-log\-precise\fP
 muestra los marcadores de tiempo del archivo de registro con mayor precisión
@@ -314,9 +316,9 @@ omisión (\fBDefault\fP). La era se selecciona usando un identificador (id). Las
 eras incluidas están descritas en el archivo \fBdata/multiplayer/eras.cfg\fP.
 .TP 
 \fB\-\-exit\-at\-end\fP
-finaliza una vez se ha completado el escenario, sin mostrar un diálogo de
-victoria o derrota que requiera que el usuario pulse en Aceptar. Esto se usa
-también para pruebas de rendimiento automatizadas.
+exits once the scenario is over, without displaying victory/defeat dialog
+which normally requires the user to click End Scenario.  This is also used
+for scriptable benchmarking.
 .TP 
 \fB\-\-ignore\-map\-settings\fP
 no se utilizan las configuraciones del mapa sino los valores

doc/man/gl/wesnoth.6

@@ -114,9 +114,12 @@ Usa o idioma \fIidioma\fP (código) durante esta sesión. Por exemplo:
 \fB\-\-language gl\fP.
 .TP 
 \fB\-\-log\-\fP\fInivel\fP\fB=\fP\fIdominio_1\fP\fB,\fP\fIdominio_2\fP\fB,\fP\fI…\fP
-sets the severity level of the log domains.  \fBall\fP can be used to match any
-log domain. Available levels: \fBerror\fP,\ \fBwarning\fP,\ \fBinfo\fP,\ \fBdebug\fP,\ \fBnone\fP.  By default the \fBwarning\fP level is used for most domains, but
-\fBdeprecation\fP defaults to none.
+Establece o nivel de severidade dos dominios do rexistro.  Pódese usar
+\fBall\fP para referirse a calquera dominio do rexistro. Os niveis dispoñíbeis
+son os seguintes: \fBerror\fP (erro),\ \fBwarning\fP (aviso),\ \fBinfo\fP
+(información), \ \fBdebug\fP (depuración) e \ \fBnone\fP (ningún). \fBwarning\fP é o
+nivel predeterminado da meirande parte dos dominios, pero o nivel
+predeterminado de \fBdeprecation\fP é \fBningún\fP.
 .TP 
 \fB\-\-log\-precise\fP
 Mostra as marcas de tempo no ficheiro do historial con máis precisión.
@@ -309,9 +312,9 @@ predeterminada (\fBDefault\fP). A era elíxese mediante un identificador. As
 eras descríbense no ficheiro \fBdata/multiplayer/eras.cfg\fP.
 .TP 
 \fB\-\-exit\-at\-end\fP
-Sae do xogo unha vez se remate o escenario, sen mostrar un diálogo de
-vitoria ou derrota que requira que o usuario prema «Aceptar». Isto tamén se
-emprega para probas de rendemento automatizadas mediante scripts.
+exits once the scenario is over, without displaying victory/defeat dialog
+which normally requires the user to click End Scenario.  This is also used
+for scriptable benchmarking.
 .TP 
 \fB\-\-ignore\-map\-settings\fP
 Non usar a configuración do mapa, senón os valores predeterminados.

doc/man/it/wesnoth.6

@@ -115,9 +115,11 @@ usa il linguaggio \fIlang\fP (simbolo) per questa sessione.  Example:
 \fB\-\-language ang_GB@latin\fP
 .TP 
 \fB\-\-log\-\fP\fIlivello\fP\fB=\fP\fIdominio1\fP\fB,\fP\fIdominio2\fP\fB,\fP\fI...\fP
-sets the severity level of the log domains.  \fBall\fP can be used to match any
-log domain. Available levels: \fBerror\fP,\ \fBwarning\fP,\ \fBinfo\fP,\ \fBdebug\fP,\ \fBnone\fP.  By default the \fBwarning\fP level is used for most domains, but
-\fBdeprecation\fP defaults to none.
+imposta il livello di dettaglio dei log dei domini di debug. Puoi usare
+\fBall\fP per selezionare tutti i domini di debug. Livelli disponibili:
+\fBerror\fP,\ \fBwarning\fP,\ \fBinfo\fP,\ \fBdebug\fP,\ \fBnone\fP. Normalmente è usato il
+livello \fBwarning\fP per la maggior parte dei domini, ma il livello
+\fBdeprecation\fP corrisponde al livello none.
 .TP 
 \fB\-\-log\-precise\fP
 registra i tempi nel logfile in maniera più accurata.
@@ -130,7 +132,7 @@ l’opzione \fB\-u\fP.
 .TP 
 \fB\-\-logdomains[\fP\fI=filtro\fP\fB]\fP
 fornisce un elenco dei log domains definiti ( soltanto quelli contenenti
-\fIfilter\fP, se usata) e termina.
+\fIfilter\fP, se usata) e termina
 .TP 
 \fB\-\-max\-fps\fP\fI\ fps\fP
 il numero di immagini al secondo che il gioco può mostrare, il valore
@@ -232,7 +234,7 @@ server delle preferenze. Esempio: \fB\-\-server server.wesnoth.org\fP
 .TP 
 \fB\-\-showgui\fP
 esegue il gioco con l’interfaccia grafica, sovrascrivendo ogni implicito
-\fB\-\-nogui.\fP
+\fB\-\-nogui\fP.
 .TP 
 \fB\-\-strict\-validation\fP
 errori di validazione sono trattati come errori fatali.
@@ -241,11 +243,11 @@ errori di validazione sono trattati come errori fatali.
 esegue il gioco in un piccolo scenario di test. Lo scenario dovrebbe essere
 uno di quelli definiti con un tag WML \fB[test]\fP. Una dimostrazione delle
 caratteristiche delle \fB[micro_ai]\fP può essere avviata con
-\fBmicro_ai_test\fP. Implica \fB\-\-nogui.\fP
+\fBmicro_ai_test\fP. Implica \fB\-\-nogui\fP.
 .TP 
 \fB\-u,\ \-\-unit\fP\fI\ id_scenario\fP
 esegue lo scenario di test specificato come un test unità. Implica
-\fB\-\-nogui.\fP
+\fB\-\-nogui\fP.
 .TP 
 \fB\-\-userconfig\-dir\fP\fI\ nome\fP
 imposta la directory di configurazione dell’utente a \fInome\fP sotto $HOME o
@@ -288,7 +290,7 @@ esegue il gioco in una finestra.
 \fB\-\-with\-replay\fP
 esegue il replay della partita caricata con l’opzione \fB\-\-load\fP.
 .
-.SH "opzioni per \-\-multiplayer"
+.SH "Opzioni per \-\-multiplayer"
 .
 Le opzioni multigiocatore specifiche delle fazioni sono indicate da
 \fInumero\fP. \fInumero\fP deve essere sostituito dal numero della
@@ -316,9 +318,9 @@ usa questa opzione per giocare nell’era selezionata invece che in quella
 data/multiplayer.cfg.
 .TP 
 \fB\-\-exit\-at\-end\fP
-esce quando lo scenario è finito, senza mostrare la finestra delle
-vittorie/sconfitte, che richiede che l’utente prema il pulsante OK. Anche
-questa opzione è usata per eseguire dei benchmark con script.
+exits once the scenario is over, without displaying victory/defeat dialog
+which normally requires the user to click End Scenario.  This is also used
+for scriptable benchmarking.
 .TP 
 \fB\-\-ignore\-map\-settings\fP
 ignora le impostazioni della mappa, utilizza invece  i valori di default.

doc/man/it/wesnothd.6

@@ -191,10 +191,10 @@ versioni di client.
 .RS
 .TP 
 \fBhost\fP
-Indirizzo del server a cui reindirizzare i collegamenti
+Indirizzo del server a cui reindirizzare i collegamenti.
 .TP 
 \fBport\fP
-Porta su cui connettersi
+Porta su cui connettersi.
 .TP 
 \fBversion\fP
 Una lista separata da virgole delle versioni da redirigere. Si comporta come

doc/man/ja/wesnoth.6

@@ -92,9 +92,9 @@ gzip フォーマットのファイルを展開して .gz という拡張子を
 このセッションで使用する言語 \fIlang\fP 例: \fB\-\-language ang_GB@latin\fP
 .TP 
 \fB\-\-log\-\fP\fIlevel\fP\fB=\fP\fIdomain1\fP\fB,\fP\fIdomain2\fP\fB,\fP\fI...\fP
-sets the severity level of the log domains.  \fBall\fP can be used to match any
-log domain. Available levels: \fBerror\fP,\ \fBwarning\fP,\ \fBinfo\fP,\ \fBdebug\fP,\ \fBnone\fP.  By default the \fBwarning\fP level is used for most domains, but
-\fBdeprecation\fP defaults to none.
+ログ領域(domain)の厳密さのレベルを設定する。 \fBall\fP は、どのログ領域にも対応させるために利用される。有効なレベルは以下の通り。
+\fBerror\fP、\ \fBwarning\fP、\ \fBinfo\fP、\ \fBdebug\fP。既定値では \fBwarning\fP
+レベルがほとんどのログ領域に使用されるが、\fBdeprecation\fPは無効である。
 .TP 
 \fB\-\-log\-precise\fP
 より正確なログファイルの時刻を表示する。
@@ -254,8 +254,9 @@ Games」の外に絶対パスで指定することもできる。Windows では
 \fBdata/multiplayer/eras.cfg\fP の中に記述されている。
 .TP 
 \fB\-\-exit\-at\-end\fP
-シナリオが終わると、ユーザーが OK
-をクリックする必要のある勝利／敗北のダイアログを表示せずに終了する。これはスクリプト化可能なベンチマークにも利用される。
+exits once the scenario is over, without displaying victory/defeat dialog
+which normally requires the user to click End Scenario.  This is also used
+for scriptable benchmarking.
 .TP 
 \fB\-\-ignore\-map\-settings\fP
 マップの設定を使わず、代わりにデフォルト値を使用する。