[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
:-( Sorry GunChleoc. I'm going to relink them later. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
The bugs are related to the branch because this is a permanent branch that I keep recycling. Just like the bugs that are linked to trunk, they should have remained linked. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 4450. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/491222019. Appveyor build 4238. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-4238. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve Fix is okay, but as Klaus said. The related bugs don't fit. :-) I'm going to remove them from the merge request. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Uhm, I dont find any changes for #1421942, #1487887, #1530240, #1547909 , #1530398 Bu only soem pluar in the wincondition. Can we get the relations correct? The actual fix is ok :-) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Fix pluralization error.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944
Not tested yet.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/scripting/win_conditions/win_condition_functions.lua'
--- data/scripting/win_conditions/win_condition_functions.lua 2019-02-09 15:38:59 +
+++ data/scripting/win_conditions/win_condition_functions.lua 2019-02-10 11:37:22 +
@@ -258,7 +258,9 @@
if ((h > 0) and (m > 0)) then
-- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
- time = (ngettext("%1% hour and %2% minutes", "%1% hours and %2% minutes", h, m)):bformat(h, m)
+ time = (ngettext("%i minute", "%i minutes", h, m)):bformat(m)
+ -- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
+ time = (ngettext("%1% hour and %2%", "%1% hours and %2%", h, m)):bformat(h, time)
elseif m > 0 then
-- TRANSLATORS: Context: 'The game will end in 30 minutes.'
time = (ngettext("%i minute", "%i minutes", m)):format(m)
___
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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve diff, testing Changes sound good to me and output looks as expected. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 4107. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/439517974. Appveyor build 3902. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-3902. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Improved error messages for gl initialize.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379
The error message for the shading language version is a bit misleading, so I
did some rework. Also, the dialog box was too wide for my taste.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc 2018-10-09 20:18:52 +
+++ src/graphic/gl/initialize.cc 2018-10-10 07:05:34 +
@@ -185,9 +185,7 @@
if (strcmp(shading_language_version_string, "(null)") == 0) {
log("ERROR: Unable to detect the shading language version!\n");
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",
- "Widelands won’t work because we were unable to detect the shading "
- "language version -- there is an unknown problem with reading the "
- "information from the graphics driver.",
+ "Widelands won't work because we were unable to detect the shading language version.\nThere is an unknown problem with reading the information from the graphics driver.",
NULL);
exit(1);
}
@@ -199,8 +197,7 @@
if (shading_language_version < 1.20) {
log("ERROR: Shading language version is too old!\n");
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",
- "Widelands won’t work because your graphics driver is too old -- "
- "version 1.20 or newer is required.",
+ "Widelands won’t work because your graphics driver is too old.\nThe Shading language needs to be version 1.20 or newer.",
NULL);
exit(1);
}
___
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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Description changed to: The error message for the shading language version is a bit misleading, so I did some rework. Also, the dialog box was too wide for my taste. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Problem with the new sphinx version, unrelated to this branch. @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3955. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/427787004. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 3955. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/427787004. Appveyor build 3753. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-3753. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve changes look good for me: -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
2 string fixes
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/campaigns/tutorial04_economy.wmf/scripting/texts.lua'
--- data/campaigns/tutorial04_economy.wmf/scripting/texts.lua 2018-05-01 20:35:22 +
+++ data/campaigns/tutorial04_economy.wmf/scripting/texts.lua 2018-09-12 15:59:25 +
@@ -231,7 +231,7 @@
div("width=100%", div("float=left padding_r=14 padding_t=5",p(img("images/logos/wl-ico-32.png"))) .. p(_[[The ‘General’ tab contains information about all the basic interface controls for Widelands. Furthermore, you can find tips that are relevant for your tribe there.]])) ..
div("width=100%", div("float=left padding_r=18 padding_t=15 padding_b=15 padding_l=4",p(img("images/wui/buildings/menu_tab_wares.png"))) .. p(_[[The ‘Wares’ tab shows information about the wares that your tribe needs, including a short help text, a list of buildings that produce each ware, the needed wares to produce it and where the ware is consumed.]])) ..
div("width=100%", div("float=left padding_r=16",p(img("images/wui/buildings/menu_tab_workers.png"))) .. p(_[[The ‘Workers’ tab shows information about your tribe’s workers in a similar manner to the wares in the second tab.]])) ..
- div("width=100%", div("float=left padding_r=18 padding_t=5 padding_l=4",p(img("images/wui/stats/genstats_nrbuildings.png"))) .. p(_[[The ‘Buldings’ tab contains all the necessary information about the buildings of your tribe.]])) ..
+ div("width=100%", div("float=left padding_r=18 padding_t=5 padding_l=4",p(img("images/wui/stats/genstats_nrbuildings.png"))) .. p(_[[The ‘Buildings’ tab contains all the necessary information about the buildings of your tribe.]])) ..
li_image("tribes/immovables/field_harvested/idle_00.png", _[[Finally, the ‘Immovables’ tab shows information about the specific immovables that your tribe’s workers can place on the map.]]) ..
li(_[[Now use the encyclopedia to find out how to create new soldiers.]]) ..
li_arrow(_[[A soldier needs a wooden spear and a helmet – from there on out, you can search backwards to find the wares and the buildings you need to supply your barracks where the soldier is recruited. When you are finished, just close the encyclopedia window.]])
=== modified file 'data/tribes/wares/granite/helptexts.lua'
--- data/tribes/wares/granite/helptexts.lua 2018-05-02 10:12:31 +
+++ data/tribes/wares/granite/helptexts.lua 2018-09-12 15:59:25 +
@@ -7,7 +7,7 @@
-- TRANSLATORS: Helptext for a ware: Granite
barbarians = pgettext("barbarians_ware", "The Barbarians produce granite blocks in quarries and granite mines."),
-- TRANSLATORS: Helptext for a ware: Granite
- frisians = pgettext("frisians_ware", "The Frisians produce granite blocks in quarries and rock mines. They can be refined by a brick burner."),
+ frisians = pgettext("frisians_ware", "The Frisians produce granite blocks in quarries and rock mines. They can be refined in a brick kiln."),
-- TRANSLATORS: Helptext for a ware: Granite
empire = pgettext("empire_ware", "The Empire produces granite blocks in quarries and marble mines.")
}
___
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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 3471. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/375468542. Appveyor build 3276. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-3276. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve Approved, changes sound good to me. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Resubmit Fixed accidental changes -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
2. Doesn't matter - you'll only need to remove the extra # where they are not wanted to activate the comments for translators. It should be -- TRANSLATORS: Thanks for the review! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
1. You can't see it locally. They are concatenated later in data/tribes/scripting/help. Just look at the shovel in-game, and you'll see it. 2. It needs to be there if there is no translatable string below it (no _, ngettext or pgettext). -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
1. I have answered inline
2. Agreed, but not in this merge request. I have created a new bug for it:
https://bugs.launchpad.net/widelands/+bug/1768859
Diff comments:
>
> === modified file 'data/tribes/wares/shovel/helptexts.lua'
> --- data/tribes/wares/shovel/helptexts.lua2017-07-07 16:51:39 +
> +++ data/tribes/wares/shovel/helptexts.lua2018-05-03 05:43:13 +
> @@ -9,7 +9,7 @@
>-- TRANSLATORS: Helptext for a ware: Shovel
>empire = pgettext("empire_ware", "Therefore the forester and the vine
> farmer use them. They are produced by the toolsmith."),
>-- TRANSLATORS: Helptext for a ware: Shovel
> - frisians = pgettext("frisians_ware", "They are used by berry and reed
> farmers as well as foresters. Diggers also need them to dig mud out of hard
> soil.")
> + frisians = pgettext("frisians_ware", "They are used by berry and reed
> farmers as well as foresters. Brickmakers also need them to dig mud out of
> hard soil.")
> }
The full helptext will read:
"Shovels are needed for the proper handling of plants. They are used by berry
and reed farmers as well as foresters. Brickmakers also need them to dig mud
out of hard soil."
> local result = ""
> if tribe then
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 3444. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/374263196. Appveyor build 3249. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-3249. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Needs Fixing
1. see inline comment
2. I did a spotcheck of the helptexts and found multiple issues with the # sign
in TRANSLATORS remarks not correctly implemented. Just checked a couple of
frisian buildings where the ' is used in defined performance helptexts and not
used in other buildings where undefined messages are in place. Found issues in
the barbarians helptexts as well
Diff comments:
>
> === modified file 'data/tribes/wares/shovel/helptexts.lua'
> --- data/tribes/wares/shovel/helptexts.lua2017-07-07 16:51:39 +
> +++ data/tribes/wares/shovel/helptexts.lua2018-05-03 05:43:13 +
> @@ -9,7 +9,7 @@
>-- TRANSLATORS: Helptext for a ware: Shovel
>empire = pgettext("empire_ware", "Therefore the forester and the vine
> farmer use them. They are produced by the toolsmith."),
>-- TRANSLATORS: Helptext for a ware: Shovel
> - frisians = pgettext("frisians_ware", "They are used by berry and reed
> farmers as well as foresters. Diggers also need them to dig mud out of hard
> soil.")
> + frisians = pgettext("frisians_ware", "They are used by berry and reed
> farmers as well as foresters. Brickmakers also need them to dig mud out of
> hard soil.")
> }
They should be replaced with shovel to be consistent with other helptexts
> local result = ""
> if tribe then
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Various string fixes for tribes
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua'
--- data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua 2018-04-05 05:58:29 +
+++ data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua 2018-05-03 05:43:13 +
@@ -211,8 +211,8 @@
},
},
produce_12 = {
- -- TRANSLATORS: Completed/Skipped/Did not start forging needles because ...
- descname = _"forging needles",
+ -- TRANSLATORS: Completed/Skipped/Did not start making needles because ...
+ descname = _"making needles",
actions = {
"return=skipped unless economy needs needles",
"sleep=32000",
=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/ironmine/helptexts.lua 2018-04-25 07:55:28 +
+++ data/tribes/buildings/productionsites/frisians/ironmine/helptexts.lua 2018-05-03 05:43:13 +
@@ -1,15 +1,18 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
function building_helptext_lore ()
- -- TRANSLATORS: Lore helptext for a building
- return pgettext ("frisians_building", "")
+ -- TRANSLATORS#: Lore helptext for a building
+ return no_lore_text_yet()
end
function building_helptext_lore_author ()
- -- TRANSLATORS: Lore author helptext for a building
- return pgettext ("frisians_building", "")
+ -- TRANSLATORS#: Lore author helptext for a building
+ return no_lore_author_text_yet()
end
function building_helptext_purpose()
- -- TRANSLATORS#: Purpose helptext for a building
+ -- TRANSLATORS: Purpose helptext for a building
return pgettext("building", "Digs iron ore out of the ground in mountain terrain.")
end
=== modified file 'data/tribes/buildings/productionsites/frisians/reed_farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/reed_farm/init.lua 2018-02-23 07:18:54 +
+++ data/tribes/buildings/productionsites/frisians/reed_farm/init.lua 2018-05-03 05:43:13 +
@@ -79,7 +79,7 @@
-- Translators: Short for "Out of ..." for a resource
title = _"No Fields",
heading = _"Out of Fields",
- message = pgettext("frisians_building", "The farmer working at this reed farm has no cleared soil to plant his seeds."),
+ message = pgettext("frisians_building", "The reed farmer working at this reed farm has no cleared soil to plant his seeds."),
productivity_threshold = 20
},
}
=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/rockmine/helptexts.lua 2018-04-25 07:55:28 +
+++ data/tribes/buildings/productionsites/frisians/rockmine/helptexts.lua 2018-05-03 05:43:13 +
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
function building_helptext_lore ()
- -- TRANSLATORS: Lore helptext for a building
- return pgettext ("frisians_building", "")
+ -- TRANSLATORS#: Lore helptext for a building
+ return no_lore_text_yet()
end
function building_helptext_lore_author ()
- -- TRANSLATORS: Lore author helptext for a building
- return pgettext ("frisians_building", "")
+ -- TRANSLATORS#: Lore author helptext for a building
+ return no_lore_author_text_yet()
end
function building_helptext_purpose()
=== modified file 'data/tribes/buildings/productionsites/frisians/tavern/helpt
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Thanks a lot for the review :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/342037 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Fixed issues with trailing whitespaces in translatable strings, because they
lead to translation mistakes
- Using localize_list in artifacts.lua.
- Got rid of trailing whitespace in _"Spare required: " string and added it
back into the UI.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/342037
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/scripting/richtext.lua'
--- data/scripting/richtext.lua 2018-03-15 02:38:55 +
+++ data/scripting/richtext.lua 2018-03-24 14:10:55 +
@@ -516,7 +516,7 @@
--
--:arg items: An array of strings
--:arg listtype: The type of concatenation to use.
--- Legal values are "&", "and", "or", and ";"
+-- Legal values are "&", "and", "or", and ","
--:arg former_textdomain: The textdomain to restore after running this function.
--:returns: The concatenated list string, using localized concatenation operators.
--
=== modified file 'data/scripting/win_conditions/artifacts.lua'
--- data/scripting/win_conditions/artifacts.lua 2017-05-12 11:30:43 +
+++ data/scripting/win_conditions/artifacts.lua 2018-03-24 14:10:55 +
@@ -134,16 +134,11 @@
local max_artifacts = _max(artifacts_per_team)
local function _get_member_names(t)
- local s = ""
+ local membernames = {}
for idx, plr in ipairs(t) do
-if s == "" then
- s = plr.name
-else
- -- TRANSLATORS: This is used to seperate players’ names in a list, e.g. "Steve, Robert, David"
- s = s .. _", " .. plr.name
-end
+table.insert(membernames, plr.name)
end
- return s
+ return localize_list(membernames, ",", "win_conditions")
end
local teams = {}
=== modified file 'data/tribes/scripting/help/building_help.lua'
--- data/tribes/scripting/help/building_help.lua 2018-01-10 16:21:50 +
+++ data/tribes/scripting/help/building_help.lua 2018-03-24 14:10:55 +
@@ -15,24 +15,6 @@
-- ===
-- RST
--- .. function:: building_section_line(header, text, image)
---
---Creates a line of h3 formatted text followed by normal text and an image.
---
---:arg t1: header text.
---:arg t2: in-line paragraphs text.
---:arg image: image to be aligned right.
---:returns: header followed by normal text and image.
---
-function building_section_line(header, text, image)
- return
- div("width=100%",
- div("width=50%", p_font("size=13 color=D1D1D1", vspace(6) .. text .. space(6))) ..
- div("width=*", p("align=right", vspace(6) .. img(image) .. vspace(12)))
- )
-end
-
--- RST
-- .. function:: dependencies_basic(images[, text = nil])
--
--Creates a dependencies line of any length.
@@ -460,16 +442,16 @@
-- Space required
if (building_description.is_mine) then
- result = result .. building_section_line(_"Space required:",_"Mine plot","images/wui/overlays/mine.png")
+ result = result .. plot_size_line(_"Space required:",_"Mine plot","images/wui/overlays/mine.png")
elseif (building_description.is_port) then
- result = result .. building_section_line(_"Space required:",_"Port plot","images/wui/overlays/port.png")
+ result = result .. plot_size_line(_"Space required:",_"Port plot","images/wui/overlays/port.png")
else
if (building_description.size == "small") then
- result = result .. building_section_line(_"Space required:",_"Small plot",&q
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Thanks for the review :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 3228. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/345141547. Appveyor build 3037. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-3037. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve LGTM Thanks for doing the empire 4 string. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 3183. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/342511097. Appveyor build 2992. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-2992. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Various string fixes for issues reported on Transifex
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/campaigns/emp02.wmf/scripting/texts.lua'
--- data/campaigns/emp02.wmf/scripting/texts.lua 2018-01-30 14:32:39 +
+++ data/campaigns/emp02.wmf/scripting/texts.lua 2018-02-16 08:14:40 +
@@ -252,7 +252,7 @@
posy=1,
body= lutius(_"Diary of Lutius",
-- TRANSLATORS: Lutius - Diary
- _([[That’s good. The first large military building is complete and the mining infrastructure is getting better and better. Now we should think about preparing ourselves for battle.]]))
+ _([[That’s good. The first big military building is complete and the mining infrastructure is getting better and better. Now we should think about preparing ourselves for battle.]]))
.. new_objectives(obj_remove_the_barbarians)
}
=== modified file 'data/campaigns/emp04.wmf/scripting/texts.lua'
--- data/campaigns/emp04.wmf/scripting/texts.lua 2018-01-17 06:10:39 +
+++ data/campaigns/emp04.wmf/scripting/texts.lua 2018-02-16 08:14:40 +
@@ -109,7 +109,7 @@
title=_"Deal with Julia to get the technology",
number = 1,
body = objective_text(_"Diplomacy: Trade or War",
- li(_[[Decide: Either collect 35 sheaves of wheat and 15 bottles of wine for the goddess in your headquarters or conquer the monastery.]])
+ li(_[[Decide: Either collect 35 sheaves of wheat and 15 amphoras of wine for the goddess in your headquarters or conquer the monastery.]])
),
}
@@ -697,7 +697,7 @@
title=_"Worship to be Gifted",
body= julia(_"Julia is demanding a sacrifice for Vesta…",
-- TRANSLATORS: Julia - priestess of the goddess Vesta
- _([[Ave, Lutius! If you want us to help you, you first have to worship our goddess Vesta. Therefore deliver 35 sheaves of wheat and 15 bottles of wine to prepare a worthy sacrifice for her.]])),
+ _([[Ave, Lutius! If you want us to help you, you first have to worship our goddess Vesta. Therefore deliver 35 sheaves of wheat and 15 amphoras of wine to prepare a worthy sacrifice for her.]])),
posy=1,
}
=== modified file 'data/txts/LICENSE.lua'
--- data/txts/LICENSE.lua 2017-12-19 08:28:46 +
+++ data/txts/LICENSE.lua 2018-02-16 08:14:40 +
@@ -6,7 +6,7 @@
title = _"License",
text = rt(
p_font("align=center", "size=28 color=2F9131", _"Licensing information for Widelands") ..
- p_font("align=center", "size=14 italic=1 color=D1D1D1", _"Copyright 2002 - 2016 by the Widelands Development Team.") ..
+ p_font("align=center", "size=14 italic=1 color=D1D1D1", _"Copyright 2002 - 2018 by the Widelands Development Team.") ..
p(vspace(12) .. b(_"This game is Free and Open Source (FOSS), licensed under the GNU General Public License (GPL) V2.0.")) ..
=== modified file 'data/txts/tips/editor.lua'
--- data/txts/tips/editor.lua 2017-03-04 13:44:18 +
+++ data/txts/tips/editor.lua 2018-02-16 08:14:40 +
@@ -1,7 +1,10 @@
+include "scripting/richtext.lua"
+
set_textdomain("texts")
tips = {
{
- text = _"You can find general help for the editor as well as a short tutorial on our wiki at www.widelands.org",
+ -- TRANSLATORS: %s = URL to the Widelands website
+ text = (_"You can find general help for the editor as well as a short tutorial on our wiki at %s."):bformat(u("widelands.org")),
seconds = 6
},
{
@@ -41,7 +44,7 @@
seconds = 7
},
{
- text = _"You can place a large building on any node where you could place a medium building if there is no obstacle or non-arable terrain towards the west, northwest and northeast.",
+ text = _"You can pla
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/326266 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/326266 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 2365. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/246730986. Appveyor build 2193. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-2193. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/326266 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Various string fixes for Empire scenario 3. Removed all instances of the term
"upgrade" from the UI.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/326266
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/campaigns/bar02.wmf/scripting/texts.lua'
--- data/campaigns/bar02.wmf/scripting/texts.lua 2017-01-05 21:04:20 +
+++ data/campaigns/bar02.wmf/scripting/texts.lua 2017-06-25 06:59:05 +
@@ -205,7 +205,7 @@
title = _"The Story Continues",
body = thron(_"Thron says:",
-- TRANSLATORS: Thron
- _([[I have sent men to meet with Kalitath in his fortress. He has barricaded the former main entrance to the capital and is trying to set up a siege ring around Al’thunran. He will not let anyone enter or leave the city while the ring is intact. Until now, he has not answered any of my messages. But the time I spend waiting won’t be lost. I will further upgrade my soldiers and prepare for battle.]]))
+ _([[I have sent men to meet with Kalitath in his fortress. He has barricaded the former main entrance to the capital and is trying to set up a siege ring around Al’thunran. He will not let anyone enter or leave the city while the ring is intact. Until now, he has not answered any of my messages. But the time I spend waiting won’t be lost. I will train my soldiers further and prepare for battle.]]))
}
order_msg_7_destroy_kalitaths_army = {
=== modified file 'data/campaigns/emp03.wmf/scripting/texts.lua'
--- data/campaigns/emp03.wmf/scripting/texts.lua 2017-05-16 18:50:05 +
+++ data/campaigns/emp03.wmf/scripting/texts.lua 2017-06-25 06:59:05 +
@@ -114,7 +114,7 @@
-- TRANSLATORS: Objective - create 2 expeditions and found new colonies with them
body = objective_text(_"Build 2 Expedition Ports",
listitem_bullet(_[[We should explore the island in the south. Use an expedition to build a port there. Afterwards, let’s try to find some mining resources.]]) ..
- listitem_bullet(_[[We should send a ship nothwards to gather some intelligence about the Barbarians. Try to build a port on the island and found an outpost.]])
+ listitem_bullet(_[[We should send a ship northwards to gather some intelligence about the Barbarians. Try to build a port on the island and found an outpost.]])
),
}
@@ -201,7 +201,7 @@
_([[Finally, the wrath of the gods and the ocean seems to be over.]])
.. paragraphdivider() ..
-- TRANSLATORS: Lutius - Diary
- _([[We landed on an unknown coast and found some rest under the palm trees growing at the shore. But that is about as good as it gets. The truth is: when I woke up this morning, I saw nothing but sand and stone around us.]])
+ _([[Again, we stranded on an unknown coast and slept in the shade under some palm trees until the sun was risen high up in the sky. I’ afraid that when we awoke at noon, nobody was really surprised that all we could see was sand… although the amount of rocks near our camp was astonishing.]])
.. paragraphdivider() ..
-- TRANSLATORS: Lutius - Diary
_([[It really seems as if we have landed on a very small island with little space.]])
@@ -526,7 +526,7 @@
}
amalea_13 = {
- title=_"Amalea’s Councel",
+ title=_"Amalea’s Counsel",
body= amalea1(_"Amalea is clapping her hands…",
-- TRANSLATORS: Amalea
_([[Salve Lutius. We just completed our weaving mill. Now we are very close to taking to the sea again. However, I thought it would be helpful to remind you that ship production is not the only industry that needs cloth.]])
@@ -555,7 +555,7 @@
-- TRANSLATORS: Saledus
_([[Sire, we are making good progress towards getting home eventually. But there is one thing I need to talk about:]])
.. paragraphdivider() ..
- _([[As we have seen on our last journey, it is of great importance to put the gods and especial
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 2038. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/207741512. Appveyor build 1873. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-1873. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Since we don't have a consensus, I reverted it to the way it was. I don't have strong feelings about this string. Ans even as master of strings I appreciate any feedback and improvement from others ;) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
For me "Jundlina Writes a Letter" is the heading of this chapter. The header gives a hint on whats going on in the following text, but isn't a concrete part of the text. Since i am not registered on transifex and you are the master of translation, feel free to change it as you like. I am not good in explaining such things :D -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Regarding your comment, I changed it due to the following feedback on Transifex: Wait, so Jundlina writes a letter in which she writes that she will write a letter to Sidolus? Perhaps we should just go with one of the older titles? It would fit perfectly well if she received a letter instead of writing one, for example. Change it to "Jundlina Received a Message"? -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve
One nit, otherwise looks good to me.
Diff comments:
> === modified file 'data/campaigns/atl01.wmf/scripting/texts.lua'
> --- data/campaigns/atl01.wmf/scripting/texts.lua 2017-02-15 19:32:31
> +
> +++ data/campaigns/atl01.wmf/scripting/texts.lua 2017-03-04 13:46:04
> +
> @@ -314,7 +314,7 @@
>
> barracks_story = {
> {
> - title = _"Jundlina Writes a Letter",
> + title = _"Jundlina Received a Letter",
As i understand the text Jundlina writes a letter to Sidolus and she received
word.
>body = jundlina(_"Jundlina",
> -- TRANSLATORS: Jundlina
> _([[I have received word that our mining industry started working.
> Now that we are forging weapons, I will send a letter to Sidolus informing
> him that it’s time to build a barracks and start recruiting soldiers.]]))
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Small string fixes for issues reported on Transifex.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/campaigns/atl01.wmf/scripting/texts.lua'
--- data/campaigns/atl01.wmf/scripting/texts.lua 2017-02-15 19:32:31 +
+++ data/campaigns/atl01.wmf/scripting/texts.lua 2017-03-04 13:46:04 +
@@ -314,7 +314,7 @@
barracks_story = {
{
- title = _"Jundlina Writes a Letter",
+ title = _"Jundlina Received a Letter",
body = jundlina(_"Jundlina",
-- TRANSLATORS: Jundlina
_([[I have received word that our mining industry started working. Now that we are forging weapons, I will send a letter to Sidolus informing him that it’s time to build a barracks and start recruiting soldiers.]]))
=== modified file 'data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
--- data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2016-12-06 18:41:32 +
+++ data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2017-03-04 13:46:04 +
@@ -166,7 +166,7 @@
}
lumberjack_message_07 = {
- title = _"Lumberjack is Done",
+ title = _"The Lumberjack’s Hut is Done",
position = "topright",
body = rt(
p(_[[Excellent. The lumberjack’s hut is done. A lumberjack will now move in and start chopping down trees, so our log income is secured for now. Now on to the granite.]])
=== modified file 'data/txts/tips/barbarians.lua'
--- data/txts/tips/barbarians.lua 2017-03-02 11:09:27 +
+++ data/txts/tips/barbarians.lua 2017-03-04 13:46:04 +
@@ -9,7 +9,7 @@
seconds = 5
},
{
- text = _"Most upgraded buildings also need an upgraded worker. Do not upgrade a building unless you have the upgraded workers available.",
+ text = _"Most enhanced buildings need experienced workers. Do not enhance a building unless you have the necessary workers available.",
seconds = 7
},
}
=== modified file 'data/txts/tips/editor.lua'
--- data/txts/tips/editor.lua 2017-03-02 11:09:27 +
+++ data/txts/tips/editor.lua 2017-03-04 13:46:04 +
@@ -41,7 +41,7 @@
seconds = 7
},
{
- text = _"You can place a large building on any node where you could place a medium building if there is no obstacle or unbuildable terrain towards the west, northwest and northeast.",
+ text = _"You can place a large building on any node where you could place a medium building if there is no obstacle or non-arable terrain towards the west, northwest and northeast.",
seconds = 7
},
}
=== modified file 'data/txts/tips/empire.lua'
--- data/txts/tips/empire.lua 2017-03-02 11:09:27 +
+++ data/txts/tips/empire.lua 2017-03-04 13:46:04 +
@@ -9,7 +9,7 @@
seconds = 5
},
{
- text = _"Most upgraded buildings also need an upgraded worker. Do not upgrade a building unless you have the upgraded workers available.",
+ text = _"Most enhanced buildings need experienced workers. Do not enhance a building unless you have the necessary workers available.",
seconds = 7
},
{
___
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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Thanks for reviewing again :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve Thanks for the campaign fixes, the diff looks good to me now. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Commit Message changed to: Various string fixes for helptexts and the Atlantean campaign. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
1. I don't have a better idea either. In Firefox, it's "Ctrl++" and "Ctrl+-", so it's the same solution without the blank spaces. 2. Good idea, I have split this. I don't think that we need to mention the zoom though, the user will notice that anyway. The important information here is which hotkeys to use to jump around. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
Most of the diff looks good to me. Two nits: - "Ctrl + +" and "Ctrl + -" just look strange. But I haven't any better idea. - I would split up the "Ctrl + 1-9" help text into a "Ctrl + 1-9"-line for storing and a "1-9"-line for restoring the positions. Maybe also add a comment that the zoom level is stored, too? -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 1922. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/200287716. Appveyor build 1757. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-1757. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Various string fixes for helptexts.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/ax_workshop/helptexts.lua 2015-10-31 12:11:44 +
+++ data/tribes/buildings/productionsites/barbarians/ax_workshop/helptexts.lua 2017-02-10 09:24:20 +
@@ -15,7 +15,7 @@
function building_helptext_note()
-- TRANSLATORS: Note helptext for a building
- return pgettext("barbarians_building", "The Barbarian ax workshop is the intermediate production site in a series of three buildings. It is an upgrade from the metal workshop but doesn’t require additional qualification for the worker.")
+ return pgettext("barbarians_building", "The Barbarian ax workshop is the intermediate production site in a series of three buildings. It is enhanced from the metal workshop but doesn’t require additional qualification for the worker.")
end
function building_helptext_performance()
=== modified file 'data/tribes/scripting/help/controls.lua'
--- data/tribes/scripting/help/controls.lua 2017-01-03 20:41:24 +
+++ data/tribes/scripting/help/controls.lua 2017-02-10 09:24:20 +
@@ -56,13 +56,13 @@
-- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
dl(help_format_hotkey(pgettext("hotkey", "Home")), _"Center main mapview on starting location") ..
-- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
- dl(help_format_hotkey(pgettext("hotkey", "(Ctrl +) 1-9")), _"Remember and go to previously remembered locations") ..
- -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
- dl(help_format_hotkey(pgettext("hotkey", "(Ctrl +) +")), _"Increase zoom") ..
- -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
- dl(help_format_hotkey(pgettext("hotkey", "(Ctrl +) -")), _"Decrease zoom") ..
- -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
- dl(help_format_hotkey(pgettext("hotkey", "(Ctrl +) 0")), _"Reset zoom") ..
+ dl(help_format_hotkey(pgettext("hotkey", "Ctrl + 1-9")), _"Remember and go to previously remembered locations") ..
+ -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+ dl(help_format_hotkey(pgettext("hotkey", "Ctrl + +")), _"Increase zoom") ..
+ -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+ dl(help_format_hotkey(pgettext("hotkey", "Ctrl + -")), _"Decrease zoom") ..
+ -- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
+ dl(help_format_hotkey(pgettext("hotkey", "Ctrl + 0")), _"Reset zoom") ..
-- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
dl(help_format_hotkey(pgettext("hotkey", "Ctrl + F11")), _"Take a screenshot") ..
toggle_fullscreen_hotkey ..
=== modified file 'data/tribes/workers/atlanteans/recruit/helptexts.lua'
--- data/tribes/workers/atlanteans/recruit/helptexts.lua 2016-11-12 06:50:18 +
+++ data/tribes/workers/atlanteans/recruit/helptexts.lua 2017-02-10 09:24:20 +
@@ -1,4 +1,4 @@
function worker_helptext()
-- TRANSLATORS: Helptex
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/312126 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/312126 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 1135. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/130899893. Appveyor build 972. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-972. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/312126 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Commit message: Fixed various string issues reported on Transifex and added some translators' comments. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland"" https://bugs.launchpad.net/widelands/+bug/1421942 Bug #1487887 in widelands: "Translation missing in editor and in replay tooltip" https://bugs.launchpad.net/widelands/+bug/1487887 Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the battle ax" https://bugs.launchpad.net/widelands/+bug/1530240 Bug #1530398 in widelands: "Wrong text above marble mine" https://bugs.launchpad.net/widelands/+bug/1530398 Bug #1547909 in widelands: "Some strings in the editor cannot be translated" https://bugs.launchpad.net/widelands/+bug/1547909 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/312126 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-fixes into lp:widelands. === modified file 'data/campaigns/atl01.wmf/scripting/texts.lua' --- data/campaigns/atl01.wmf/scripting/texts.lua 2016-03-03 17:07:13 + +++ data/campaigns/atl01.wmf/scripting/texts.lua 2016-11-30 08:11:15 + @@ -228,7 +228,7 @@ _([[Ahh, but I think this is impossible to change. The preparing and eating of food is something deeply ingrained in us Atlanteans – it is a ceremony that we just need for our well-being. So I guess we cannot take this away from the individuals completely.]]) .. paragraphdivider() .. -- TRANSLATORS: Colionder - _([[But we might find a compromise in between: for me, making bread is a troublesome task. Grinding the blackroot and corn to flour and then baking the bread is tedious and boring; I feel a more industrial approach would be helpful here. I for one would love to just have fresh bread delivered to my house every day.]]) + _([[But we might find a compromise in between: for me, making bread is a troublesome task. Grinding the blackroots and corn to flour and then baking the bread is tedious and boring; I feel a more industrial approach would be helpful here. I for one would love to just have fresh bread delivered to my house every day.]]) .. paragraphdivider() .. -- TRANSLATORS: Colionder _([[Oooh and even more important: the smoking of fish and meat to cleanse them and improve their taste is terrible. My house is full of smoke and stinks for weeks afterwards. Don’t you think that this could be done in a special building where the side effects do not matter? I think those two things would be accepted by the people and would reduce the cooking time without taking away the ritual.]])) === modified file 'data/campaigns/bar01.wmf/scripting/texts.lua' --- data/campaigns/bar01.wmf/scripting/texts.lua 2016-01-28 05:24:34 + +++ data/campaigns/bar01.wmf/scripting/texts.lua 2016-11-30 08:11:15 + @@ -63,7 +63,7 @@ name = "basic food began", title = _"Provide your miners with food", number = 3, - body = objective_text(_"Build a hunter, a gamekeeper and a tavern", + body = objective_text(_"Build a hunter’s hut, a gamekeeper’s hut and a tavern", listitem_bullet(_"In order to work, your miners need food.") .. listitem_arrow(_"A hunter can hunt down animals, while a gamekeeper prevents them from becoming extinct. The meat is then processed in a tavern into lunches for your miners.") .. " " .. _([[This is only the first example of a ware which has to be refined before being used in a secondary building – others will follow.]])) === modified file 'data/campaigns/bar02.wmf/scripting/texts.lua' --- data/campaigns/bar02.wmf/scripting/texts.lua 2016-05-02 15:33:14 + +++ data/campaigns/bar02.wmf/scripting/texts.lua 2016-11-30 08:11:15 + @@ -261,7 +261,7 @@ title = _"Tracks", body = boldreth(_"Boldreth says:", -- TRANSLATORS: Boldreth - _([[Thron told me that he discovered tracks in the snow to the northeast of our settlement. He has instructed us to build a tower, to have a greater visual range over the area around our hall to protect our people from sudden attacks.]])) + _([[Thron told me that he discovered tracks in the snow to the northeast of our settlement. He has instructed us to build a tower, to have a greater visual range over the area around our hall to protect our people from sudden attacks.]])) .. new_objectives(obj_build_a_tower) } === modified file 'data/campaigns/emp02.wmf/scripting/texts.lua' --- data/campaigns/emp02.wmf/scripting/texts.lua 2016-01-28 05:24:34 + +++ data/campaigns/emp02.wmf/scripting/tex
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 987. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/121636353. Appveyor build 820. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-820. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Small fixes for various string issues reported on Transifex.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/campaigns/emp01.wmf/scripting/texts.lua'
--- data/campaigns/emp01.wmf/scripting/texts.lua 2016-02-12 09:15:09 +
+++ data/campaigns/emp01.wmf/scripting/texts.lua 2016-05-17 17:19:42 +
@@ -183,7 +183,7 @@
_([[I’ve got two important things to talk about… First the good news:]])
.. paragraphdivider() ..
-- TRANSLATORS: Amalea
- _([[I noticed that the construction of the sawmill is complete, so we can begin to refine the logs that the lumberjacks are harvesting into lumber.]])
+ _([[I noticed that the construction of the sawmill is complete, so we can begin to refine the logs that the lumberjacks are harvesting into planks.]])
.. paragraphdivider() ..
-- TRANSLATORS: Amalea
_([[But the bad news is that our lumberjacks harvest at an incredible speed. There are almost no trees left on this island.]])
=== modified file 'data/scripting/win_conditions/territorial_time.lua'
--- data/scripting/win_conditions/territorial_time.lua 2016-05-08 20:51:42 +
+++ data/scripting/win_conditions/territorial_time.lua 2016-05-17 17:19:42 +
@@ -226,6 +226,7 @@
else
msg = msg .. msg1 .. "\n\n"
end
+ -- TRANSLATORS: Refers to "You own more than half of the map’s area. Keep it for x more minute(s) to win the game."
msg = msg .. p((ngettext("Otherwise the game will end in %i minute.",
"Otherwise the game will end in %i minutes.",
remaining_max_time // 60))
=== modified file 'data/scripting/win_conditions/wood_gnome.lua'
--- data/scripting/win_conditions/wood_gnome.lua 2016-03-15 08:42:41 +
+++ data/scripting/win_conditions/wood_gnome.lua 2016-05-17 17:19:42 +
@@ -91,6 +91,7 @@
msg = msg .. "\n"
local trees = (ngettext ("%i tree", "%i trees", playerpoints[plr.number]))
:format(playerpoints[plr.number])
+ -- TRANSLATORS: %1$s = player name, %2$s = x tree(s)
msg = msg .. (_"%1$s has %2$s at the moment."):bformat(plr.name,trees)
end
@@ -141,11 +142,13 @@
for idx,plr in ipairs(plrs) do
msg = msg .. "\n"
local trees = (ngettext ("%i tree", "%i trees", playerpoints[plr.number])):format(playerpoints[plr.number])
+ -- TRANSLATORS: %1$s = player name, %2$s = x tree(s)
msg = msg .. (_"%1$s had %2$s."):bformat(plr.name,trees)
end
msg = msg .. "\n\n"
local trees = (ngettext ("%i tree", "%i trees", playerpoints[points[#points][1].number]))
:format(playerpoints[points[#points][1].number])
+ -- TRANSLATORS: %1$s = player name, %2$s = x tree(s)
msg = msg .. (_"The winner is %1$s with %2$s."):bformat(points[#points][1].name, trees)
local privmsg = ""
=== modified file 'data/tribes/scripting/help/controls.lua'
--- data/tribes/scripting/help/controls.lua 2016-05-01 09:57:58 +
+++ data/tribes/scripting/help/controls.lua 2016-05-17 17:19:42 +
@@ -72,19 +72,19 @@
h3(_"In the message window, the following additional shortcuts are available:") ..
p(
- -- TRANSLATORS: This is an access key combination.
+ -- TRANSLATORS: This is the helptext for an access key combination.
dl(help_format_hotkey("0"), _"Show all messages") ..
- -- TRANSLATORS: This is an access key combination.
+ -- TRANSLATORS: This is the helptext for an access key combination.
dl(help_format_hotkey("1"), _"Show geolo
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291335 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 974. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/121219787. Appveyor build 807. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-807. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291335 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Fixed editor tooltips and renamed "Noise height" to "Random height".
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291335
The tooltips were creating issues with Slavic languages.
I also renamed "Noise height" to "Random height" - I think the name was too
technical.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'src/editor/ui_menus/tool_change_height_options_menu.cc'
--- src/editor/ui_menus/tool_change_height_options_menu.cc 2016-04-06 17:27:10 +
+++ src/editor/ui_menus/tool_change_height_options_menu.cc 2016-04-08 07:36:16 +
@@ -22,8 +22,6 @@
#include
#include
-#include
-
#include "base/i18n.h"
#include "editor/editorinteractive.h"
#include "editor/tools/increase_height_tool.h"
@@ -52,16 +50,10 @@
{
change_by_.set_tooltip(
/** TRANSLATORS: Editor change height access keys. **/
-(boost::format(_("Use %s to increase, %s to decrease"))
- /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
- % _("Click")
- /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
- % _("Shift + Click")).str());
+_("Click on the map to increase, Shift + Click on the map to decrease terrain height"));
set_to_.set_tooltip(
/** TRANSLATORS: Editor set height access key. **/
-(boost::format(_("Use %s to set to this value"))
- /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
- % _("Ctrl + Click")).str());
+_("Ctrl + Click on the map to set terrain height"));
change_by_.changed.connect
(boost::bind
=== modified file 'src/editor/ui_menus/tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/tool_change_resources_options_menu.cc 2016-04-06 17:27:10 +
+++ src/editor/ui_menus/tool_change_resources_options_menu.cc 2016-04-08 07:36:16 +
@@ -68,17 +68,12 @@
{
// Configure spin boxes
change_by_.set_tooltip(
-/** TRANSLATORS: Editor change resources access keys. **/
-(boost::format(_("Use %s to increase, %s to decrease"))
- /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
- % _("Click")
- /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
- % _("Shift + Click")).str());
+/** TRANSLATORS: Editor change rseources access keys. **/
+_("Click on the map to increase, "
+ "Shift + Click on the map to decrease the amount of the selected resource"));
set_to_.set_tooltip(
-/** TRANSLATORS: Editor set resources access key. **/
-(boost::format(_("Use %s to set to this value"))
- /** TRANSLATORS: This is an access key combination. Localize, but do not change the key. **/
- % _("Ctrl + Click")).str());
+/** TRANSLATORS: Editor set rseources access key. **/
+_("Ctrl + Click on the map to set the amount of the selected resource"));
change_by_.changed.connect
(boost::bind
=== modified file 'src/editor/ui_menus/tool_menu.cc'
--- src/editor/ui_menus/tool_menu.cc 2016-04-06 09:23:04 +
+++ src/editor/ui_menus/tool_menu.cc 2016-04-08 07:36:16 +
@@ -64,7 +64,7 @@
pos.x += width + spacing; \
ADD_BUTTON("change_height",_("Change height"));
- ADD_BUTTON("noise_height", _("Noise height"));
+ ADD_BUTTON("noise_height", _("Random height"));
ADD_BUTTON("set_terrain", _("Terrain"));
ADD_BUTTON("place_immovable", _("Immovables"));
ADD_BUTTON("place_bob",_("Animals"));
=== modified file 'src/editor/ui_menus/tool_noise_hei
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291154 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291154 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291154 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 974. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/121219787. Appveyor build 807. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-807. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291154 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 939. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/120306796. Appveyor build 772. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-772. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291154 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
T have retested this myself now, and since I don't expect any new bugs (famous last words...), I'm gonna merge. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 912. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/119460376. Appveyor build 744. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-744. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Bunnybot encountered an error while working on this merge proposal: 'ascii' codec can't decode byte 0xe2 in position 27: ordinal not in range(128) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve Code looks good to me, not tested -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 826. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/115065311. Appveyor build 660. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-660. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/288491 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve LGTM, I have not tested it but if travis says it is OK, you can merge this I think -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/288491 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Various string fixes for issues reported on Transifex.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/288491
Various string fixes for issues reported on Transifex.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/campaigns/atl01.wmf/scripting/texts.lua'
--- data/campaigns/atl01.wmf/scripting/texts.lua 2016-02-18 16:23:31 +
+++ data/campaigns/atl01.wmf/scripting/texts.lua 2016-03-09 09:08:54 +
@@ -197,7 +197,7 @@
title = _"Sidolus Speaks",
body = sidolus(
-- TRANSLATORS: Sidolus
- _([[May Satul warm you, Jundlina! I agree with what Loftomor proposes. We need a good supply of building materials for we have to expand our territory swiftly. I will not feel safe on this island as long as we have not seen all its shores it. I brought plenty of good men from Atlantis. The military might is available. We only need some housing to live in.]]))
+ _([[May Satul warm you, Jundlina! I agree with what Loftomor proposes. We need a good supply of building materials for we have to expand our territory swiftly. I will not feel safe on this island as long as we have not seen all its shores. I brought plenty of good men from Atlantis. The military might is available. We only need some housing to live in.]]))
.. new_objectives(obj_expand)
}
}
@@ -297,7 +297,7 @@
title = _"Jundlina Replies",
body = jundlina(_"Jundlina Nods",
-- TRANSLATORS: Jundlina
- _([[I have considered this, Sidolus. I think it is about time. We will make this a priority for now. You shall get your industry soon!]]))
+ _([[I have considered this, Sidolus. I think it is about time. We will make this a priority for now. You shall get your industry soon!]]))
.. new_objectives(obj_make_heavy_industry_and_mining)
},
}
=== modified file 'data/scripting/widelands/multiplayer_help.lua'
--- data/scripting/widelands/multiplayer_help.lua 2016-01-28 06:12:20 +
+++ data/scripting/widelands/multiplayer_help.lua 2016-03-09 09:08:54 +
@@ -23,7 +23,7 @@
result = result .. picture_li("images/ui_fsmenu/shared_in.png", _"Set as shared in starting position for another player.")
result = result .. picture_li("images/ui_basic/stop.png", _"Closed.")
result = result .. rt(p(_"The latter three can only be set by the hosting client by left-clicking the ‘type’ button of a player. Hosting players can also set the initialization of each player (the set of buildings, wares and workers the player starts with) and the tribe and team for computer players"))
- result = result .. rt(p(_"Every client connected to a player (the set ‘role’ player) can set the tribe and the team for that player"))
+ result = result .. rt(p(_"Every client connected to a player (who isn’t a spectator) can set the tribe and the team for that player"))
result = result .. rt(h2(_"Map details"))
result = result .. rt(p(_"You can see information about the selected map or savegame on the right-hand side. A button next to the map name allows the host to change to a different map. Furthermore, the host is able to set a specific win condition, and finally can start the game as soon as all players are set up."))
=== modified file 'src/wlapplication_messages.cc'
--- src/wlapplication_messages.cc 2016-02-14 21:18:03 +
+++ src/wlapplication_messages.cc 2016-03-09 09:08:54 +
@@ -62,9 +62,11 @@
<< _(" --language=[de_DE|sv_SE|...]\n"
" The locale to use.") << endl
/** TRANSLATORS: You may translate true/false, also as on/off or yes/no, but */
- /** TRANSLATORS: it HAS TO BE CONSISTENT with the translation in the widelands textdomain */
+ /** TRANSLATORS: it HAS TO BE CONSISTENT with the translati
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 733. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110196319. Appveyor build 580. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-580. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 733. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110196319. Appveyor build 580. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-580. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 599. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/107486138. Appveyor build 461. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-461. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/285088 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Review: Approve
You should probably use another branch name in the future. This one has all
those fixed bugs attached.
One tiny nit, otherwise lgtm.
Diff comments:
>
> === modified file 'src/ui_basic/progresswindow.cc'
> --- src/ui_basic/progresswindow.cc2016-01-31 21:03:15 +
> +++ src/ui_basic/progresswindow.cc2016-02-04 16:17:22 +
> @@ -92,6 +92,7 @@
> }
>
> void ProgressWindow::step(const std::string & description) {
> +
remove empty line?
> RenderTarget & rt = *g_gr->get_render_target();
>
> const uint32_t xres = g_gr->get_xres();
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/285088
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
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/string-fixes into lp:widelands
This is sort of my catch-all branch for string issues - I just fix whatever gets reported on Transifex here. It would be hard to come up with a good branch name each time. Is reusing the branch a problem for the commit history? -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/285088 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 566. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/107030369. Appveyor build 272. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-272. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/285088 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Some consistency fixes:
- Consistent naming of loader_ui variables.
- More consistent Progresswindow strings.
- Consistent use of colons with spinboxes in the Options menu.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/285088
Some consistency fixes:
- Consistent naming of loader_ui variables.
- More consistent Progresswindow strings.
- Consistent use of colons with spinboxes in the Options menu.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc 2016-02-01 07:44:47 +
+++ src/editor/editorinteractive.cc 2016-02-04 16:17:22 +
@@ -609,7 +609,7 @@
Widelands::Map & map = *new Widelands::Map;
egbase.set_map();
if (filename.empty()) {
-loader_ui.step("Creating empty map...");
+loader_ui.step(_("Creating empty map..."));
map.create_empty_map(
egbase.world(),
64,
@@ -624,7 +624,7 @@
egbase.load_graphics(loader_ui);
loader_ui.step(std::string());
} else {
-loader_ui.stepf("Loading map \"%s\"...", filename.c_str());
+loader_ui.stepf(_("Loading map \"%s\"..."), filename.c_str());
eia.load(filename);
}
}
=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.cc'
--- src/editor/ui_menus/editor_main_menu_new_map.cc 2016-01-29 08:37:22 +
+++ src/editor/ui_menus/editor_main_menu_new_map.cc 2016-02-04 16:17:22 +
@@ -109,7 +109,9 @@
EditorInteractive& parent = eia();
Widelands::EditorGameBase & egbase = parent.egbase();
Widelands::Map & map= egbase.map();
- UI::ProgressWindow loader;
+ UI::ProgressWindow loader_ui;
+
+ loader_ui.step(_("Creating empty map..."));
egbase.cleanup_for_load();
@@ -122,7 +124,7 @@
g_options.pull_section("global").get_string("realname", pgettext("map_name", "Unknown")));
egbase.postload ();
- egbase.load_graphics(loader);
+ egbase.load_graphics(loader_ui);
map.recalc_whole_map(egbase.world());
parent.map_changed(EditorInteractive::MapWas::kReplaced);
=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
--- src/editor/ui_menus/editor_main_menu_random_map.cc 2016-01-31 10:57:58 +
+++ src/editor/ui_menus/editor_main_menu_random_map.cc 2016-02-04 16:17:22 +
@@ -419,7 +419,7 @@
dynamic_cast<EditorInteractive&>(*get_parent());
Widelands::EditorGameBase & egbase = eia.egbase();
Widelands::Map & map= egbase.map();
- UI::ProgressWindow loader;
+ UI::ProgressWindow loader_ui;
egbase.cleanup_for_load();
@@ -444,11 +444,11 @@
_("No Name"),
g_options.pull_section("global").get_string("realname", pgettext("map_name", "Unknown")),
sstrm.str().c_str());
- loader.step(_("Generating random map..."));
+ loader_ui.step(_("Generating random map..."));
gen.create_random_map();
egbase.postload ();
- egbase.load_graphics(loader);
+ egbase.load_graphics(loader_ui);
map.recalc_whole_map(egbase.world());
eia.map_changed(EditorInteractive::MapWas::kReplaced);
=== modified file 'src/logic/game.cc'
--- src/logic/game.cc 2016-01-29 13:43:56 +
+++ src/logic/game.cc 2016-02-04 16:17:22 +
@@ -223,23 +223,23 @@
std::unique_ptr maploader(map().get_correct_loader(mapname));
if (!maploader)
throw wexception("could not load \"%s\"", mapname);
- UI::ProgressWindow loaderUI;
+ UI::ProgressWindow loader_ui;
- loaderUI.step (_("Preloading map"));
+ loader_ui.step (_("Preloading map"));
maploader->preload_map(true);
std::string const background = map().get_background();
if (!background.empty()) {
- loaderUI.set_background(background);
+ loader_ui.set_background(background);
}
- loaderUI.step(_("Loading world"));
+ loader_ui.step(_("Loading world"));
world();
- loaderUI.step(_("Loading tribes"));
+ loader_
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 365. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/104405094. Appveyor build 272. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-272. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/285088 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-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/string-fixes into lp:widelands
Review: Approve lgtm. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/283712 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/283712 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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
