Merge lp:~hjd/widelands/ware-data into lp:widelands

[Hans Joachim Desserud]

The two strings
https://translations.launchpad.net/widelands/trunk/+pots/widelands/nb/418/+translate and
https://translations.launchpad.net/widelands/trunk/+pots/widelands/nb/420/+translate are basically the same, except for a space. I don't really see the use for having two different versions of what is really the same message, so I changed the one without a space to be identical.

Updated another message mentioning ware data at the same time.

[SirVer (sirver)]

those are error messages. I do not think they should be translated at all. Eg. a turkish user that would open a bug report with the translation of the error would not help me in any way to fix the problem.

[Nasenbaer (nasenbaer)]

I partly disagree with SirVer in this case - the log(.......) stuff should of course not be translated (and it is not at the moment), but the game data error should be translated, as in nearly all cases this bug is triggered through user modified data - that's why the game data error was introduced, to directly show, that widelands is running as it should, but just some game data is somehow messed up.

Anyway: the first part of the fix is wrong because it really ist "waredata data" - just take a look one line below - the package that is about to be read is waredata_data.

The second part is fine for me.

review: Needs Fixing

[Hans Joachim Desserud (hjd)]

Nasenbaer: Ok, I just thought it sounded a bit redundant. I am not sure if it is possible to merge only one of the commits, but if it isn't I can revert it some time.

[Nasenbaer (nasenbaer)]

i do not know either, but I just merged it manually and committed it, so ... :)

review: Approve

=== modified file 'src/map_io/widelands_map_loader.cc'
--- src/map_io/widelands_map_loader.cc	2010-11-01 22:05:56 +0000
+++ src/map_io/widelands_map_loader.cc	2011-06-04 15:34:36 +0000
@@ -258,7 +258,7 @@
 	log("done!\n ");
 
 	if (have_oldwares) {
-		log("Reading Waredata Data ... ");
+		log("Reading Ware Data ... ");
 		{Map_Waredata_Data_Packet    p; p.Read(m_fs, egbase, !scenario, *m_mol);}
 		log("done!\n ");
 	}
 
=== modified file 'src/map_io/widelands_map_waredata_data_packet.cc'
--- src/map_io/widelands_map_waredata_data_packet.cc	2010-11-07 15:36:29 +0000
+++ src/map_io/widelands_map_waredata_data_packet.cc	2011-06-04 15:34:36 +0000
@@ -205,7 +205,7 @@
 			throw game_data_error
 				(_("unknown/unhandled version %u"), packet_version);
 	} catch (_wexception const & e) {
-		throw game_data_error(_("waredata: %s"), e.what());
+		throw game_data_error(_("ware data: %s"), e.what());
 	}
 }