[Widelands-dev] [Merge] lp:~widelands-dev/widelands/world-stringfix into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/world-stringfix into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/world-stringfix/+merge/226426
Removed a blank space from tree name + added some translator comments
--
https://code.launchpad.net/~widelands-dev/widelands/world-stringfix/+merge/226426
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/world-stringfix into lp:widelands.
=== modified file 'world/immovables/trees/cirrus/init.lua'
--- world/immovables/trees/cirrus/init.lua 2014-07-05 14:09:47 +
+++ world/immovables/trees/cirrus/init.lua 2014-07-11 09:52:56 +
@@ -9,7 +9,8 @@
world:new_immovable_type{
name = "cirrus_wasteland_sapling",
- descname = _ " Cirrus Tree (Sapling)",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
+ descname = _ "Cirrus Tree (Sapling)",
editor_category = "trees_wasteland",
size = "small",
attributes = { "tree_sapling" },
@@ -32,6 +33,7 @@
world:new_immovable_type{
name = "cirrus_wasteland_pole",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Cirrus Tree (Pole)",
editor_category = "trees_wasteland",
size = "small",
@@ -55,6 +57,7 @@
world:new_immovable_type{
name = "cirrus_wasteland_mature",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Cirrus Tree (Mature)",
editor_category = "trees_wasteland",
size = "small",
@@ -78,6 +81,7 @@
world:new_immovable_type{
name = "cirrus_wasteland_old",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Cirrus Tree (Old)",
editor_category = "trees_wasteland",
size = "small",
=== modified file 'world/immovables/trees/liana/init.lua'
--- world/immovables/trees/liana/init.lua 2014-07-05 14:09:47 +
+++ world/immovables/trees/liana/init.lua 2014-07-11 09:52:56 +
@@ -9,6 +9,7 @@
world:new_immovable_type{
name = "liana_wasteland_sapling",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Liana Tree (Sapling)",
editor_category = "trees_wasteland",
size = "small",
@@ -32,6 +33,7 @@
world:new_immovable_type{
name = "liana_wasteland_pole",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Liana Tree (Pole)",
editor_category = "trees_wasteland",
size = "small",
@@ -55,6 +57,7 @@
world:new_immovable_type{
name = "liana_wasteland_mature",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Liana Tree (Mature)",
editor_category = "trees_wasteland",
size = "small",
@@ -81,6 +84,7 @@
world:new_immovable_type{
name = "liana_wasteland_old",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Liana Tree (Old)",
editor_category = "trees_wasteland",
size = "small",
=== modified file 'world/immovables/trees/mushroom_dark/init.lua'
--- world/immovables/trees/mushroom_dark/init.lua 2014-07-05 14:09:47 +
+++ world/immovables/trees/mushroom_dark/init.lua 2014-07-11 09:52:56 +
@@ -9,6 +9,7 @@
world:new_immovable_type{
name = "mushroom_dark_wasteland_sapling",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Dark Mushroom Tree (Sapling)",
editor_category = "trees_wasteland",
size = "small",
@@ -32,6 +33,7 @@
world:new_immovable_type{
name = "mushroom_dark_wasteland_pole",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Dark Mushroom Tree (Pole)",
editor_category = "trees_wasteland",
size = "small",
@@ -55,6 +57,7 @@
world:new_immovable_type{
name = "mushroom_dark_wasteland_mature",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Dark Mushroom Tree (Mature)",
editor_category = "trees_wasteland",
size = "small",
@@ -78,6 +81,7 @@
world:new_immovable_type{
name = "mushroom_dark_wasteland_old",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Dark Mushroom Tree (Old)",
editor_category = "trees_wasteland",
size = "small",
=== modified file 'world/immovables/trees/mushroom_green/init.lua'
--- world/immovables/trees/mushroom_green/init.lua 2014-07-05 14:09:47 +
+++ world/immovables/trees/mushroom_green/init.lua 2014-07-11 09:52:56 +
@@ -9,6 +9,7 @@
world:new_immovable_type{
name = "mushroom_green_wasteland_sapling",
+ -- TRANSLATORS: This is a fictitious tree. Be creative if you want.
descname = _ "Green Mushroom Tree (Sapling)",
editor_category = "trees_wasteland",
size = "small",
@@ -32,6 +33,7 @@
world:new_immovable_type{
name = "mushroom_green_wasteland_pole",
+ -- TRANSLATORS: This is a fictiti
[Widelands-dev] [Merge] lp:~hjd/widelands/space-and-tiny-fixes into lp:widelands
The proposal to merge lp:~hjd/widelands/space-and-tiny-fixes into lp:widelands has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~hjd/widelands/space-and-tiny-fixes/+merge/226347 -- https://code.launchpad.net/~hjd/widelands/space-and-tiny-fixes/+merge/226347 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/space-and-tiny-fixes into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/world-stringfix into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/world-stringfix into lp:widelands has been updated. Description changed to: Removed a blank space from tree name + added some translator comments ETA: Already fixed by other merge request, but please merge anyway for the added comments. https://code.launchpad.net/~hjd/widelands/space-and-tiny-fixes/+merge/226347 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/world-stringfix/+merge/226426 -- https://code.launchpad.net/~widelands-dev/widelands/world-stringfix/+merge/226426 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/world-stringfix into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~hjd/widelands/space-and-tiny-fixes into lp:widelands
The proposal to merge lp:~hjd/widelands/space-and-tiny-fixes into lp:widelands has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~hjd/widelands/space-and-tiny-fixes/+merge/226347 -- https://code.launchpad.net/~hjd/widelands/space-and-tiny-fixes/+merge/226347 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/space-and-tiny-fixes into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1293158 into lp:widelands
> Still shows a box character under Map:->Players: > Tested with "Crossing the horizon" I know, but I haven't the foggiest why. Somebody else will have to fix this. If nobody wants to take on this branch, can we merge and open a new bug? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1293158/+merge/221434 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1293158. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1324137 into lp:widelands
I have found a better example for the plural forms (en "cat" = gd "cat"). I think this is ready for merging now. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1324137/+merge/221353 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1324137. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1074353 into lp:widelands
I have started on the NOCOMs.I have added the 3 persist/unpersist objects to the test suite (lua_persistence.wmf), but when I run it, it complains about a missing init.lua: bratzbert@museum:~/sources/widelands/bug-1074353$ ./widelands --scenario=test/maps/lua_persistence.wmf Set home directory: /home/bratzbert/.widelands Adding directory:./. Adding directory:/usr/share/games/widelands Adding directory:. Widelands executable directory: /home/bratzbert/sources/widelands/bug-1074353/ localedir: /home/bratzbert/sources/widelands/bug-1074353/locale selected language: en using locale en_US.utf-8 SDL_VIDEODRIVER=& Graphics: Trying Video driver: 0 x11 SDL_VIDEODRIVER=x11 Graphics: Trying opengl Graphics: Try to set Videomode 800x600 32 Bit Graphics: Setting video mode was successful Graphics: OpenGL: OpenGL enabled Graphics: OpenGL: Double buffering enabled Graphics: OpenGL: Max texture size: 8192 Graphics: OpenGL: Number of aux buffers: 0 Graphics: OpenGL: Number of stencil buffer bits: 8 Graphics: OpenGL: Maximum number of textures for multitextures: 8 Graphics: OpenGL: Version 2.1 "2.1 Mesa 10.1.3" Graphics: OpenGL: Textures may have any size Graphics: OpenGL: Multitexture capabilities sufficient GRAPHICS REPORT VIDEO DRIVER x11 hw surface possible 0 window manager available 1 blitz_hw 0 blitz_hw_CC 0 blitz_hw_A 0 blitz_sw 0 blitz_sw_CC 0 blitz_sw_A 0 blitz_fill 0 video_mem 0 vfmt 0x2b4be30 size 800 600 END GRAPHICS REPORT Graphics: flags: 2 [] Section [global], key 'EXENAME' not used (did you spell the name correctly?) ERROR: Unused key "1" in LuaTable. Please report as a bug. Loading the world took 992ms Reading Elemental Data ... took 0ms Reading Player Names And Tribe Data ... took 1ms Reading Heights Data ... took 2ms Reading Terrain Data ... took 1ms Reading Map Objects ... took 0ms Reading Player Start Position Data ... took 0ms Reading Resources Data ... took 0ms Reading Map Extra Data ... took 1ms Reading Map Version Data ... took 0ms Reading Allowed Worker Types Data ... took 0ms Reading Allowed Building Types Data ... took 1ms Reading Node Ownership Data ... took 0ms Reading Exploration Data ... took 0ms Reading Flag Data ... took 1ms Reading Road Data ... took 0ms Reading Building Data ... took 0ms Reading Flagdata Data ... took 1ms Reading Roaddata Data ... took 0ms Reading Buildingdata Data ... took 0ms Second and third phase loading Map Objects ... took 1ms Reading Players View Data ... Map_Players_View_Data_Packet::Read: WARNING: Could not open "player/1/view/unseen_times_1" for reading. Assuming that the game is from an old version without player point of view. Will give player 1 knowledge of unseen nodes, edges and triangles (but not resources).took 0ms Reading Player Message Data ... took 0ms Reading Objective Data ... took 1ms Reading Scripting Data ... took 0ms WL_Map_Loader::load_map_complete() took 23ms Starting replay writer Game: Writing Preload Data ... took 0ms Game: Writing Game Class Data ... took 1ms Game: Writing Player Info ... took 0ms Game: Writing Map Data! Writing Elemental Data ... took 0ms Writing Player Names And Tribe Data ... took 1ms Writing Port Spaces Data ... took 0ms Writing Heights Data ... took 0ms Writing Terrain Data ... took 1ms Writing Player Start Position Data ... took 0ms Writing Player Message Data ... took 1ms Writing Resources Data ... took 0ms Writing Map Extra Data ... took 0ms Writing Map Version ... took 1ms Writing Allowed Worker Types Data ... took 0ms Writing Flag Data ... took 0ms Writing Road Data ... took 1ms Writing Building Data ... took 0ms Writing Map Objects ... took 0ms Writing Node Ownership Data ... took 0ms Writing Exploration Data ... took 1ms Writing Players Unseen Data ... took 1ms Writing Scripting Data ... took 7ms Writing Objective Data ... took 0ms Map_Saver::save() took 14ms Game: Writing Map Data took 15ms Game: Writing Player Economies Info ... took 1ms Game: Writing Command Queue Data ... took 0ms Game: Writing Interactive Player Data ... took 0ms Game_Saver::save() took 17ms SaveHandler::save_game() took 18ms Reloading the game from replay Game: Reading Preload Data ... took 0ms Game: Reading Game Class Data ... took 1ms Game: Reading Map Data ... Game: Reading Map Data took 4ms Game: Reading Player Info ... Game: Reading Player Info took 208ms Game: Calling Read_Complete() Reading Elemental Data ... took 1ms Reading Player Names And Tribe Data ... took 1ms Reading Port Spaces Data ... took 0ms Reading Heights Data ... took 1ms Reading Terrain Data ... took 0ms Reading Map Objects ... took 1ms Reading Player Start Position Data ... took 0ms Reading Resources Data ... took 1ms Reading Map Extra Data ... took 1ms Reading Map Version Data ... took 1ms Reading Allowed Worker Types Data ... took 0ms Reading Allowed Building Types Data ... took 1ms Reading Node Ownership Data ... took 1ms Reading Exploration Data ... took 1ms Reading
