Hans Joachim Desserud has proposed merging lp:~hjd/widelands/ware-data into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~hjd/widelands/ware-data/+merge/63462
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.
--
https://code.launchpad.net/~hjd/widelands/ware-data/+merge/63462
Your team Widelands Developers is requested to review the proposed merge of
lp:~hjd/widelands/ware-data into lp:widelands.
=== 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());
}
}
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
