[Scummvm-cvs-logs] scummvm master -> 1b8b10e9df507be441cc663a0394ce534950eced

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1b8b10e9df DEVTOOLS: Fix accidental string concatenation (CID 1192645, 1192646)


Commit: 1b8b10e9df507be441cc663a0394ce534950eced
    https://github.com/scummvm/scummvm/commit/1b8b10e9df507be441cc663a0394ce534950eced
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2014-03-16T19:41:57+01:00

Commit Message:
DEVTOOLS: Fix accidental string concatenation (CID 1192645, 1192646)

The other string concatenation looks deliberate to avoid compiler
warnings, but these were almost certainly accidental. Also fixed
some German inventory-related strings. Dreammaster has promised to
generate a new lure.dat, since I'm not comfortable doing it myself.

Changed paths:
    devtools/create_lure/create_lure_dat.cpp



diff --git a/devtools/create_lure/create_lure_dat.cpp b/devtools/create_lure/create_lure_dat.cpp
index eca18b3..0ac07c4 100644
--- a/devtools/create_lure/create_lure_dat.cpp
+++ b/devtools/create_lure/create_lure_dat.cpp
@@ -1348,7 +1348,7 @@ const char *germanTextStrings[NUM_TEXT_ENTRIES] = {
 	"Abbrechen", "Schneller Text\x8b",
 	"Langsamer Text\x8b", "Sound an", "Sound aus", "(nichts)", " nach ", " an ", " f\x8cr ",
 	"und dann", "Schlu\x92", "Sicher (j/n)?",
-	"Du tr\x8dgst", "niets", "und du hast ", "silberm\x8cnzen", "silberm\x8cnzen"
+	"Du tr\x8dgst ", "nichts.", "und du hast ", "silberm\x8cnzen", "silberm\x8cnzen",
 	"keinen ", "keine ", "kein ", "der ", "die ", "das ", "den ", "einen ", "eine ",  "ein "
 };
 
@@ -1359,7 +1359,7 @@ const char *spanishTextStrings[NUM_TEXT_ENTRIES] = {
 	"Cr\x7f" "ditos", "Reiniciar", "Salvar juego", "Recuperar jue", "Abandonar", "Texto r\x98pido\x8b",
 	"Texto lento \x8b", "Sonido activado   ", "Sonido desactivado ", "(nada)", " con ", " a ", " con ",
 	"y luego", "eso es todo", "\x94" "Est\x98s seguro? (S/N)",
-	"Llevas ", "nada", "y tienes ", "moneda", "monedas"
+	"Llevas ", "nada", "y tienes ", "moneda", "monedas",
 	"el ", "la ", "los ", "las ", "este ", "esta ", "estos ", "estas ", NULL, NULL
 };