[Widelands-dev] [Merge] lp:~gunchleoc/widelands/i18n-20140406 into lp:widelands
The proposal to merge lp:~gunchleoc/widelands/i18n-20140406 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~gunchleoc/widelands/i18n-20140406/+merge/209788 -- https://code.launchpad.net/~gunchleoc/widelands/i18n-20140406/+merge/209788 Your team Widelands Developers is requested to review the proposed merge of lp:~gunchleoc/widelands/i18n-20140406 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:~qcumber-some/widelands/bug1167242 into lp:widelands
Jens Beyer (Qcumber-some) has proposed merging
lp:~qcumber-some/widelands/bug1167242 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1167242 in widelands: "Ctrl+destroying a flag with a building does not
destroy the whole road"
https://bugs.launchpad.net/widelands/+bug/1167242
For more details, see:
https://code.launchpad.net/~qcumber-some/widelands/bug1167242/+merge/21
Was this really this easy?
I did not find a problem although I tried to test every possible combination.
--
https://code.launchpad.net/~qcumber-some/widelands/bug1167242/+merge/21
Your team Widelands Developers is requested to review the proposed merge of
lp:~qcumber-some/widelands/bug1167242 into lp:widelands.
=== modified file 'src/wui/fieldaction.cc'
--- src/wui/fieldaction.cc 2014-03-03 20:50:30 +
+++ src/wui/fieldaction.cc 2014-03-07 19:16:40 +
@@ -750,7 +750,7 @@
if (building->get_playercaps() & Building::PCap_Bulldoze) {
if (get_key_state(SDLK_LCTRL) or get_key_state(SDLK_RCTRL)) {
ref_cast(egbase).send_player_bulldoze
- (*flag);
+ (*flag, get_key_state(SDLK_LCTRL) or get_key_state(SDLK_RCTRL));
}
else {
show_bulldoze_confirm
___
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] [recipe build #667563] of ~widelands-dev widelands-daily in quantal: Failed to build
* State: Failed to build * Recipe: widelands-dev/widelands-daily * Archive: widelands-dev/widelands-daily * Distroseries: quantal * Duration: 4 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/widelands-daily/+recipebuild/667563/+files/buildlog.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/menkib -- https://launchpad.net/~widelands-dev/+archive/widelands-daily/+recipebuild/667563 Your team Widelands Developers is the requester of the build. ___ 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] [recipe build #667564] of ~widelands-dev widelands-daily in saucy: Failed to build
* State: Failed to build * Recipe: widelands-dev/widelands-daily * Archive: widelands-dev/widelands-daily * Distroseries: saucy * Duration: 4 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/widelands-daily/+recipebuild/667564/+files/buildlog.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/chindi06 -- https://launchpad.net/~widelands-dev/+archive/widelands-daily/+recipebuild/667564 Your team Widelands Developers is the requester of the build. ___ 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] [recipe build #667565] of ~widelands-dev widelands-daily in trusty: Failed to build
* State: Failed to build * Recipe: widelands-dev/widelands-daily * Archive: widelands-dev/widelands-daily * Distroseries: trusty * Duration: 4 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/widelands-daily/+recipebuild/667565/+files/buildlog.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/alphard -- https://launchpad.net/~widelands-dev/+archive/widelands-daily/+recipebuild/667565 Your team Widelands Developers is the requester of the build. ___ 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] [recipe build #667562] of ~widelands-dev widelands-daily-precise in precise: Failed to build
* State: Failed to build * Recipe: widelands-dev/widelands-daily-precise * Archive: widelands-dev/widelands-daily-precise * Distroseries: precise * Duration: 8 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/widelands-daily-precise/+recipebuild/667562/+files/buildlog.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/seaborgium -- https://launchpad.net/~widelands-dev/+archive/widelands-daily-precise/+recipebuild/667562 Your team Widelands Developers is the requester of the build. ___ 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/debian-disable-patch into lp:~widelands-dev/widelands/debian
Hans Joachim Desserud has proposed merging
lp:~hjd/widelands/debian-disable-patch into lp:~widelands-dev/widelands/debian.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~hjd/widelands/debian-disable-patch/+merge/210030
A fix for bug 1279679 recently got merged to trunk. A patch for this issue is
also included as part of the Debian packaging and the PPA will attempt to apply
this patch on top of current trunk. Understandably, it fails to apply the patch
[1] leading FTBFS. After removing the kfreebsd patch from patches/series (which
specifies which patches should be applied and in which order) it built fine
again. See latest builds from [2] for details/proof.
[1] https://launchpadlibrarian.net/168638281/buildlog.txt.gz
[2] https://code.launchpad.net/~hjd/+recipe/widelands-test
--
https://code.launchpad.net/~hjd/widelands/debian-disable-patch/+merge/210030
Your team Widelands Developers is requested to review the proposed merge of
lp:~hjd/widelands/debian-disable-patch into lp:~widelands-dev/widelands/debian.
=== removed file 'debian/patches/kfreebsd-FTBFS'
--- debian/patches/kfreebsd-FTBFS 2014-02-15 13:00:44 +
+++ debian/patches/kfreebsd-FTBFS 1970-01-01 00:00:00 +
@@ -1,38 +0,0 @@
-Description: Fix a FTBFS on kfreebsd
- The kfreebsd architecture is using the GNU libc on a FreeBSD kernel.
- .
- So we don't need to search for execinfo and intl libs on this
- perticular architecture, as they are included in the libc.
-Author: Teppo Maenpaa
-Forwarded-Upstream: not yet, should be.
-
- src/CMakeLists.txt |6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -326,7 +326,9 @@
-
- # on BSD this must be explicitly linked
- if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-- find_library(EXECINFO_LIBRARY NAMES execinfo)
-+ if (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
-+find_library(EXECINFO_LIBRARY NAMES execinfo)
-+ endif (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
- endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-
-
-@@ -436,8 +438,10 @@
- endif (MINIZIP_FOUND)
-
- if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-- find_package(intl REQUIRED)
-- include_directories(${INTL_INCLUDE_DIR})
-+ if (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
-+find_package(intl REQUIRED)
-+include_directories(${INTL_INCLUDE_DIR})
-+endif (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
- endif (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-
- # Gettext is required, but it does not provide GETTEXT_INCLUDE_DIR or
=== modified file 'debian/patches/series'
--- debian/patches/series 2014-02-15 13:00:44 +
+++ debian/patches/series 2014-03-07 22:44:03 +
@@ -1,4 +1,3 @@
-kfreebsd-FTBFS
s390
dbg_symbols
PATH_MAX
___
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:~gunchleoc/widelands/i18n-20140307 into lp:widelands
GunChleoc has proposed merging lp:~gunchleoc/widelands/i18n-20140307 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~gunchleoc/widelands/i18n-20140307/+merge/210046
Some more i18n fixes.
Catalogs and translations will need rebuilding.
--
https://code.launchpad.net/~gunchleoc/widelands/i18n-20140307/+merge/210046
Your team Widelands Developers is requested to review the proposed merge of
lp:~gunchleoc/widelands/i18n-20140307 into lp:widelands.
=== modified file 'maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua'
--- maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua 2014-03-05 18:47:03 +
+++ maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua 2014-03-08 06:20:00 +
@@ -129,6 +129,7 @@
elseif resource == "goldore" then
return ngettext("%s Gold Ore","%s Gold Ore",count):bformat(count)
else
+ -- TRANSLATORS: number + resource name, e.g. '1 stone'
return (_"%1$i %2$s"):bformat(count, resource)
end
end
=== modified file 'maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua'
--- maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua 2014-03-03 20:50:30 +
+++ maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua 2014-03-08 06:20:00 +
@@ -11,7 +11,7 @@
[[To establish a smuggling route, you need to build a warehouse on a sending/receiving spot ]] ..
[[while your team mate has to build one on the corresponding receiving/sending spot. ]] ..
[[A ware is then transported every 10 seconds. ]]) ..
--- TRANSLATORS: %s = " points"
+-- TRANSLATORS: %s = ' points'
_([[For harder to defend smuggling routes, you get 2 or 3 points per ware smuggled. The first team to collect %s wins.]]
)) ..
rt("image=map:send_spot.png", p(_"A sending spot")) ..
@@ -25,30 +25,30 @@
[[You can see the number of wares traded at any time in the general statistics menu. Good luck!]]
)))
--- TRANSLATORS: the first 2 parameters are player names, the last parameter is " points"
+-- TRANSLATORS: the first 2 parameters are player names, the last parameter is ' points'
smuggling_route_established_other_team = rt(p(_(
[[A new smuggling route from %1$s to %2$s has been established! ]] ..
[[Every ware they smuggle there is worth %3$s.]]
)))
--- TRANSLATORS: %s = " points"
+-- TRANSLATORS: %s = ' points'
smuggling_route_established_sender = rt(p(_(
[[Your team has established a new smuggling route. You have the sending warehouse. ]] ..
[[Every ware smuggled here is worth %s.]]
)))
--- TRANSLATORS: %s = " points"
+-- TRANSLATORS: %s = ' points'
smuggling_route_established_receiver = rt(p(_(
[[Your team has established a new smuggling route. You have the receiving warehouse. ]] ..
[[Every ware smuggled here is worth %s.]]
)))
--- TRANSLATORS: the first parameter is " points", the last 2 parameters are player names
+-- TRANSLATORS: the first parameter is ' points', the last 2 parameters are player names
smuggling_route_broken = rt(p(_
[[The smuggling route worth %1$s from %2$s to %3$s has been broken!]]
))
game_over = rt(
h1("Game over!") ..
--- TRANSLATORS: the first 4 parameters are player names, the last parameter is " points"
+-- TRANSLATORS: the first 4 parameters are player names, the last parameter is ' points'
p(_
[[Game over! %1$s and %2$s have won the game! %3$s and %4$s only managed to collect %5$s.]]
)
=== modified file 'maps/Plateau.wmf/scripting/texts.lua'
--- maps/Plateau.wmf/scripting/texts.lua 2014-02-26 16:52:26 +
+++ maps/Plateau.wmf/scripting/texts.lua 2014-03-08 06:20:00 +
@@ -53,7 +53,7 @@
"" .. reflow(text)
objs = {...}
if #objs > 0 then
- s = s .. "" .. rt(h2(_"New Objectives")) .. ""
+ s = s .. "" .. rt(h2(_"New Objective")) .. ""
local i = 1
while i < #objs do
s = s .. reflow(objs[i].body) .. ""
=== modified file 'scripting/win_conditions/04_wood_gnome.lua'
--- scripting/win_conditions/04_wood_gnome.lua 2014-03-03 20:50:30 +
+++ scripting/win_conditions/04_wood_gnome.lua 2014-03-08 06:20:00 +
@@ -12,10 +12,10 @@
local wc_name = _ "Wood Gnome"
local wc_version = 2
-local wc_desc = _
-[[As wood gnome you like big forests, so your task is to have more trees on
-your territory than any other player. The game will end after 4 hours of
-playing. The one with the most trees at that point will win the game.]]
+local wc_desc = _(
+[[As wood gnome you like big forests, so your task is to have more trees on ]] ..
+[[your territory than any other player. The game will end after 4 hours of ]] ..
+[[playing. The one with the most
