Merge lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi into lp:widelands

[kaputtnik]

Adapted buildcat.py to get translations for resources, added textdomain to blueberry bushes.

Adapted buildcat.py to get translations for resources, added textdomain to blueberry bushes.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4393. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/478743572.
Appveyor build 4184. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1805155_frisian_bushes_and_resi-4184.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4399. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/478962324.
Appveyor build 4190. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1805155_frisian_bushes_and_resi-4190.

[hessenfarmer (stephan-lutz)]

Changes look good.

Travis error is transient.

@bunnybot merge

[hessenfarmer (stephan-lutz)]

forgot to approve the branch.

review: Approve (review)

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4399. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/478962324.

[hessenfarmer (stephan-lutz)]

@bunnybot merge force

=== modified file 'data/tribes/immovables/berry_bushes/blueberry/init.lua'
--- data/tribes/immovables/berry_bushes/blueberry/init.lua	2018-11-03 11:27:18 +0000
+++ data/tribes/immovables/berry_bushes/blueberry/init.lua	2019-01-13 08:49:18 +0000
@@ -1,3 +1,5 @@
+set_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 terrain_affinity = {
 
=== modified file 'utils/buildcat.py'
--- utils/buildcat.py	2018-12-13 07:24:01 +0000
+++ utils/buildcat.py	2019-01-13 08:49:18 +0000
@@ -84,6 +84,7 @@
         '../../data/tribes/*/*/*/helptexts.lua',
         '../../data/tribes/*/*/*/*/helptexts.lua',
         '../../data/tribes/*/*/*/*/*/helptexts.lua',
+        '../../data/tribes/*/resi/helptexts/*.lua',
     ]),
     ('widelands_editor/widelands_editor', [
         '../../data/scripting/editor/*.lua',