Merge lp:~miroslavr256/widelands/official-lua-xgettext into lp:widelands

[Miroslav Remák]

An attempt to use the official xgettext tool to extract translatable strings from Lua scripts instead of lua_xgettext.py. Hasn't been extensively tested, but updating .po files from the generated templates using Poedit seems to work fine.

[Miroslav Remák (miroslavr256)]

On an unrelated note, why is the text domain for the map 'The Green Plateau' called 'map_plateau.wmf' when buildcat updates 'po/map_the_green_plateau.wmf/map_the_green_plateau.wmf.pot'?

[TiborB (tiborb95)]

is xgettext currently used as dependency or it will be new one? No big deal on linux side, but we must consider it also at windows side.

[Miroslav Remák (miroslavr256)]

> is xgettext currently used as dependency or it will be new one? No big deal on
> linux side, but we must consider it also at windows side.

Yes, xgettext is currently used to parse C++ files. However, this introduces a new dependency on msguniq for merging.

[TiborB (tiborb95)]

So no additional work for Tino (for building on windows), fine then...

[GunChleoc (gunchleoc)]

> On an unrelated note, why is the text domain for the map 'The Green Plateau'
> called 'map_plateau.wmf' when buildcat updates
> 'po/map_the_green_plateau.wmf/map_the_green_plateau.wmf.pot'?

I'd say that this is historical baggage.

My Python is a bit rusty, but I'll have a look and do some more testing to make sure that we don't lose any strings.

[GunChleoc (gunchleoc)]

I have compared the .pot files and found the following differences in the file headers that should be fixed:

Trunk:
# Widelands PATH/TO/FILE.PO
# Copyright (C) 2005-2015 Widelands Development Team
"Language-Team: LANGUAGE <email address hidden>\n"
"Content-Type: text/plain; charset=UTF-8\n"

This branch:
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Widelands Development Team
# This file is distributed under the same license as the PACKAGE package.
"Language-Team: LANGUAGE <email address hidden>\n"
"Content-Type: text/plain; charset=CHARSET\n"

In trunk, identical messages with different msgctxt appear nest to each other, in the new branch they are completely sorted by occurrence, e.g. "Tower" In tribes.pot. I think we should generally keep the sorting by occurrence, but it would be nice to have these strings still appearing together - this is not a requirement though. Just leave it if this can't be changed easily.

Finally, the line wrapping is different - we need to make sure that strings won't go fuzzy / restore them when merging this branch. I can take care of that as the time comes.

I still need to look at the code itself.

review: Needs Fixing

[Miroslav Remák (miroslavr256)]

Problem is that xgettext does not provide a way to customize the header (besides a few metadata fields). Our headers are already inconsistent - see old widelands.pot and widelands_console.pot. Moreover, xgettext sets charset to "CHARSET" when no non-ASCII characters are found in strings for some reason, despite being explicitly told about the encoding. This is also noticeable in the old widelands_console.pot.

However, I have managed to work around these issues by parsing the POTs and changing their header that way. Let me know if there are still any header issues.

Line wrapping should not be relevant at all, as the msgid stays exactly the same, therefore strings have no reason to go fuzzy. I have tested this using msgmerge as well as POEdit.

As for the sorting, I haven't looked into it yet. I already pass the option "-F", which should take care of sorting by file... Perhaps it works differently than lua_xgettext.py did?

[GunChleoc (gunchleoc)]

Thanks for looking into this again. Our custom parser does its own sorting, so I guess "-F" is what we get.

I will try to do a full review and testing this week, so we can get this branch in :)

[GunChleoc (gunchleoc)]

Code LGTM in general, but the last commit is breaking things.

The enum requires Python 3.4 at least, could you please add the following to the buildcat.py header, then remove the sys import further down?

import sys

if sys.version_info[0] < 3 or sys.version_info[1] < 4:
    print("This script requires Python version 3.4. Try executing it with python3 utils/buildcat.py
")
    sys.exit(1)

We then also need to update utils/merge_and_push_translations.sh to first run buildcat normally, and if it fails to run it again with the python3 command.

After running this with the correct python version, I get the following output:

Generating reference catalogs:
Traceback (most recent call last):
  File "utils/buildcat.py", line 465, in <module>
    do_update_potfiles()
  File "utils/buildcat.py", line 353, in do_update_potfiles
    pot = pot.lower().translate(string.maketrans(dangerous_chars, len(dangerous_chars)*"_"))
AttributeError: 'module' object has no attribute 'maketrans'

I think this also merits a developer credit, could you please add yourself to txts/developers.json, in the "heading": "Coders", section?

[GunChleoc (gunchleoc)]

Found an even easier solution: Change the script header to:

#!/usr/bin/env python3

[Miroslav Remák (miroslavr256)]

I've managed to fix the scripts to be compatible with both python2 and python3. Depending on >=3.4 really wasn't my intention. I didn't realize 'enum' was introduced in 3.4, as the script ran fine for me with python2 (due to a backport of the 'enum' module being installed on my system).

[GunChleoc (gunchleoc)]

Thanks! Everything is working now - will merge :)

review: Approve

[Miroslav Remák (miroslavr256)]

Unfortunately, you might want to revert this. Msguniq apparently has a bug (or perhaps it's a feature, who knows...) during sorting by file (-F) which messes up the file references that contain spaces.

Examples:
#: ../../maps/MP Hopping.wmf/elemental:9 Scenarios/Island
#: ../../maps/The Mountains.wmf/elemental:10 Pass Through the

Also, maps.pot is not sorted anymore (that's the case when xgettext finds no translatable strings but conf_gettext does), because I removed the sorting code in conf_gettext.py. I wanted to run msguniq on it, so the sorting is consistent, but stumbled upon the above-mentioned issue.

I don't know how to solve this at the moment.

[GunChleoc (gunchleoc)]

We could resolve this by renaming the map directories with bzr mv. I am in favor of replacing the blank spaces in the file names by underscores.

[Miroslav Remák (miroslavr256)]

Wouldn't renaming the map directories break existing savegames that were played on these maps?

[Miroslav Remák (miroslavr256)]

To answer my own question, no. I have just tested it and there seem to be no issues. I will make a new merge request to fix the sorting issue using this approach then.

[Miroslav Remák (miroslavr256)]

Besides, spaces in filenames don't play well with Transifex, either:
../../maps/MP:, Scenarios/Island:, Hopping.wmf/scripting/first_island.lua:74

So using underscores instead is a good idea.

=== modified file 'tribes/buildings/militarysites/atlanteans/castle/helptexts.lua'
--- tribes/buildings/militarysites/atlanteans/castle/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/atlanteans/castle/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/atlanteans/guardhall/helptexts.lua'
--- tribes/buildings/militarysites/atlanteans/guardhall/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/atlanteans/guardhall/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/atlanteans/guardhouse/helptexts.lua'
--- tribes/buildings/militarysites/atlanteans/guardhouse/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/atlanteans/guardhouse/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/atlanteans/tower/helptexts.lua'
--- tribes/buildings/militarysites/atlanteans/tower/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/atlanteans/tower/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/atlanteans/tower_high/helptexts.lua'
--- tribes/buildings/militarysites/atlanteans/tower_high/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/atlanteans/tower_high/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/atlanteans/tower_small/helptexts.lua'
--- tribes/buildings/militarysites/atlanteans/tower_small/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/atlanteans/tower_small/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/barbarians/barrier/helptexts.lua'
--- tribes/buildings/militarysites/barbarians/barrier/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/barbarians/barrier/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/barbarians/citadel/helptexts.lua'
--- tribes/buildings/militarysites/barbarians/citadel/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/barbarians/citadel/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/barbarians/fortress/helptexts.lua'
--- tribes/buildings/militarysites/barbarians/fortress/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/barbarians/fortress/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/barbarians/sentry/helptexts.lua'
--- tribes/buildings/militarysites/barbarians/sentry/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/barbarians/sentry/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/barbarians/tower/helptexts.lua'
--- tribes/buildings/militarysites/barbarians/tower/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/barbarians/tower/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/empire/barrier/helptexts.lua'
--- tribes/buildings/militarysites/empire/barrier/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/empire/barrier/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/empire/blockhouse/helptexts.lua'
--- tribes/buildings/militarysites/empire/blockhouse/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/empire/blockhouse/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/empire/castle/helptexts.lua'
--- tribes/buildings/militarysites/empire/castle/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/empire/castle/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/empire/fortress/helptexts.lua'
--- tribes/buildings/militarysites/empire/fortress/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/empire/fortress/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/empire/outpost/helptexts.lua'
--- tribes/buildings/militarysites/empire/outpost/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/empire/outpost/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/empire/sentry/helptexts.lua'
--- tribes/buildings/militarysites/empire/sentry/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/empire/sentry/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/militarysites/empire/tower/helptexts.lua'
--- tribes/buildings/militarysites/empire/tower/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/militarysites/empire/tower/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/partially_finished/constructionsite/helptexts.lua'
--- tribes/buildings/partially_finished/constructionsite/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/partially_finished/constructionsite/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/partially_finished/dismantlesite/helptexts.lua'
--- tribes/buildings/partially_finished/dismantlesite/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/partially_finished/dismantlesite/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/armorsmithy/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/armorsmithy/helptexts.lua	2015-11-08 11:12:19 +0000
+++ tribes/buildings/productionsites/atlanteans/armorsmithy/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/bakery/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/bakery/helptexts.lua	2015-11-08 11:12:19 +0000
+++ tribes/buildings/productionsites/atlanteans/bakery/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/blackroot_farm/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/blackroot_farm/helptexts.lua	2015-11-20 16:39:38 +0000
+++ tribes/buildings/productionsites/atlanteans/blackroot_farm/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/atlanteans/charcoal_kiln/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/charcoal_kiln/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/charcoal_kiln/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/coalmine/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/coalmine/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/coalmine/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/crystalmine/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/crystalmine/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/atlanteans/crystalmine/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/farm/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/farm/helptexts.lua	2015-11-20 16:39:38 +0000
+++ tribes/buildings/productionsites/atlanteans/farm/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/atlanteans/fishbreeders_house/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/fishbreeders_house/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/fishbreeders_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/fishers_house/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/fishers_house/helptexts.lua	2015-11-06 19:10:10 +0000
+++ tribes/buildings/productionsites/atlanteans/fishers_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/foresters_house/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/foresters_house/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/foresters_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/gold_spinning_mill/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/gold_spinning_mill/helptexts.lua	2015-11-08 13:59:37 +0000
+++ tribes/buildings/productionsites/atlanteans/gold_spinning_mill/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/goldmine/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/goldmine/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/goldmine/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/horsefarm/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/horsefarm/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/atlanteans/horsefarm/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/hunters_house/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/hunters_house/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/hunters_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/ironmine/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/ironmine/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/ironmine/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/mill/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/mill/helptexts.lua	2015-11-08 11:36:52 +0000
+++ tribes/buildings/productionsites/atlanteans/mill/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/quarry/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/quarry/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/atlanteans/quarry/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/sawmill/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/sawmill/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/sawmill/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/scouts_house/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/scouts_house/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/scouts_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/shipyard/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/shipyard/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/shipyard/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/smelting_works/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/smelting_works/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/smelting_works/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/smokery/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/smokery/helptexts.lua	2015-11-08 11:12:19 +0000
+++ tribes/buildings/productionsites/atlanteans/smokery/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/spiderfarm/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/spiderfarm/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/spiderfarm/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/toolsmithy/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/toolsmithy/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/toolsmithy/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/weaponsmithy/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/weaponsmithy/helptexts.lua	2015-11-08 11:12:19 +0000
+++ tribes/buildings/productionsites/atlanteans/weaponsmithy/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/weaving_mill/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/weaving_mill/helptexts.lua	2015-11-08 11:12:19 +0000
+++ tribes/buildings/productionsites/atlanteans/weaving_mill/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/well/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/well/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/well/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/atlanteans/woodcutters_house/helptexts.lua'
--- tribes/buildings/productionsites/atlanteans/woodcutters_house/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/atlanteans/woodcutters_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/barbarians/bakery/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/bakery/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/barbarians/bakery/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/barbarians/big_inn/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/big_inn/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/barbarians/big_inn/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/barbarians/brewery/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/brewery/helptexts.lua	2015-11-08 10:48:54 +0000
+++ tribes/buildings/productionsites/barbarians/brewery/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/barbarians/cattlefarm/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/cattlefarm/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/barbarians/cattlefarm/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/barbarians/charcoal_kiln/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/charcoal_kiln/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/barbarians/charcoal_kiln/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/barbarians/coalmine/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/coalmine/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/barbarians/coalmine/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -1,16 +1,16 @@
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a building
+   -- TRANSLATORS#: Lore helptext for a building
    return pgettext("barbarians_building", [[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces. <br>
 Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]])
 end
 
 function building_helptext_lore_author()
-   -- #TRANSLATORS: Lore author helptext for a building
+   -- TRANSLATORS#: Lore author helptext for a building
    return ""
 end
 
 function building_helptext_purpose()
-   -- #TRANSLATORS: Purpose helptext for a building
+   -- TRANSLATORS#: Purpose helptext for a building
    return pgettext("building", "Digs coal out of the ground in mountain terrain.")
 end
 

=== modified file 'tribes/buildings/productionsites/barbarians/coalmine_deep/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/coalmine_deep/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/barbarians/coalmine_deep/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -1,16 +1,16 @@
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a building
+   -- TRANSLATORS#: Lore helptext for a building
    return pgettext("barbarians_building", [[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces. <br>
 Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]])
 end
 
 function building_helptext_lore_author()
-   -- #TRANSLATORS: Lore author helptext for a building
+   -- TRANSLATORS#: Lore author helptext for a building
    return ""
 end
 
 function building_helptext_purpose()
-   -- #TRANSLATORS: Purpose helptext for a building
+   -- TRANSLATORS#: Purpose helptext for a building
    return pgettext("building", "Digs coal out of the ground in mountain terrain.")
 end
 

=== modified file 'tribes/buildings/productionsites/barbarians/coalmine_deeper/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/coalmine_deeper/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/barbarians/coalmine_deeper/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -1,16 +1,16 @@
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a building
+   -- TRANSLATORS#: Lore helptext for a building
    return pgettext("barbarians_building", [[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces. <br>
 Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]])
 end
 
 function building_helptext_lore_author()
-   -- #TRANSLATORS: Lore author helptext for a building
+   -- TRANSLATORS#: Lore author helptext for a building
    return ""
 end
 
 function building_helptext_purpose()
-   -- #TRANSLATORS: Purpose helptext for a building
+   -- TRANSLATORS#: Purpose helptext for a building
    return pgettext("building", "Digs coal out of the ground in mountain terrain.")
 end
 

=== modified file 'tribes/buildings/productionsites/barbarians/farm/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/farm/helptexts.lua	2015-11-20 16:39:38 +0000
+++ tribes/buildings/productionsites/barbarians/farm/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/barbarians/fishers_hut/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/fishers_hut/helptexts.lua	2015-11-06 09:23:30 +0000
+++ tribes/buildings/productionsites/barbarians/fishers_hut/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -4,7 +4,7 @@
 end
 
 function building_helptext_lore_author()
-   -- #TRANSLATORS: Lore author helptext for a building
+   -- TRANSLATORS#: Lore author helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/barbarians/gamekeepers_hut/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/gamekeepers_hut/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/barbarians/gamekeepers_hut/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -15,7 +15,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/barbarians/helmsmithy/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/helmsmithy/helptexts.lua	2015-11-08 13:59:37 +0000
+++ tribes/buildings/productionsites/barbarians/helmsmithy/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/barbarians/inn/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/inn/helptexts.lua	2015-11-08 10:48:54 +0000
+++ tribes/buildings/productionsites/barbarians/inn/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/barbarians/micro_brewery/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/micro_brewery/helptexts.lua	2015-11-07 08:45:50 +0000
+++ tribes/buildings/productionsites/barbarians/micro_brewery/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -14,7 +14,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/barbarians/quarry/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/quarry/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/barbarians/quarry/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 

=== modified file 'tribes/buildings/productionsites/barbarians/scouts_hut/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/scouts_hut/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/barbarians/scouts_hut/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/barbarians/shipyard/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/shipyard/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/barbarians/shipyard/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/barbarians/smelting_works/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/smelting_works/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/barbarians/smelting_works/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/barbarians/tavern/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/tavern/helptexts.lua	2015-11-08 10:48:54 +0000
+++ tribes/buildings/productionsites/barbarians/tavern/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/barbarians/weaving_mill/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/weaving_mill/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/barbarians/weaving_mill/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/barbarians/well/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/well/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/barbarians/well/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -14,7 +14,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/barbarians/wood_hardener/helptexts.lua'
--- tribes/buildings/productionsites/barbarians/wood_hardener/helptexts.lua	2015-11-17 09:01:38 +0000
+++ tribes/buildings/productionsites/barbarians/wood_hardener/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/armorsmithy/helptexts.lua'
--- tribes/buildings/productionsites/empire/armorsmithy/helptexts.lua	2015-11-08 11:35:51 +0000
+++ tribes/buildings/productionsites/empire/armorsmithy/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/bakery/helptexts.lua'
--- tribes/buildings/productionsites/empire/bakery/helptexts.lua	2015-11-20 16:39:38 +0000
+++ tribes/buildings/productionsites/empire/bakery/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/empire/brewery/helptexts.lua'
--- tribes/buildings/productionsites/empire/brewery/helptexts.lua	2015-11-20 16:39:38 +0000
+++ tribes/buildings/productionsites/empire/brewery/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/empire/charcoal_kiln/helptexts.lua'
--- tribes/buildings/productionsites/empire/charcoal_kiln/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/charcoal_kiln/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/coalmine/helptexts.lua'
--- tribes/buildings/productionsites/empire/coalmine/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/coalmine/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/coalmine_deep/helptexts.lua'
--- tribes/buildings/productionsites/empire/coalmine_deep/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/coalmine_deep/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/donkeyfarm/helptexts.lua'
--- tribes/buildings/productionsites/empire/donkeyfarm/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/empire/donkeyfarm/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/farm/helptexts.lua'
--- tribes/buildings/productionsites/empire/farm/helptexts.lua	2015-11-20 16:39:38 +0000
+++ tribes/buildings/productionsites/empire/farm/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/empire/fishers_house/helptexts.lua'
--- tribes/buildings/productionsites/empire/fishers_house/helptexts.lua	2015-11-06 09:23:30 +0000
+++ tribes/buildings/productionsites/empire/fishers_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/foresters_house/helptexts.lua'
--- tribes/buildings/productionsites/empire/foresters_house/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/foresters_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/goldmine/helptexts.lua'
--- tribes/buildings/productionsites/empire/goldmine/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/goldmine/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/goldmine_deep/helptexts.lua'
--- tribes/buildings/productionsites/empire/goldmine_deep/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/goldmine_deep/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/hunters_house/helptexts.lua'
--- tribes/buildings/productionsites/empire/hunters_house/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/hunters_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/inn/helptexts.lua'
--- tribes/buildings/productionsites/empire/inn/helptexts.lua	2015-11-20 16:39:38 +0000
+++ tribes/buildings/productionsites/empire/inn/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/empire/ironmine/helptexts.lua'
--- tribes/buildings/productionsites/empire/ironmine/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/ironmine/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/ironmine_deep/helptexts.lua'
--- tribes/buildings/productionsites/empire/ironmine_deep/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/ironmine_deep/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/lumberjacks_house/helptexts.lua'
--- tribes/buildings/productionsites/empire/lumberjacks_house/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/lumberjacks_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/marblemine/helptexts.lua'
--- tribes/buildings/productionsites/empire/marblemine/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/empire/marblemine/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/marblemine_deep/helptexts.lua'
--- tribes/buildings/productionsites/empire/marblemine_deep/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/empire/marblemine_deep/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/mill/helptexts.lua'
--- tribes/buildings/productionsites/empire/mill/helptexts.lua	2015-11-27 14:42:11 +0000
+++ tribes/buildings/productionsites/empire/mill/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/empire/piggery/helptexts.lua'
--- tribes/buildings/productionsites/empire/piggery/helptexts.lua	2015-11-20 16:39:38 +0000
+++ tribes/buildings/productionsites/empire/piggery/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/empire/quarry/helptexts.lua'
--- tribes/buildings/productionsites/empire/quarry/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/empire/quarry/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/sawmill/helptexts.lua'
--- tribes/buildings/productionsites/empire/sawmill/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/sawmill/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/scouts_house/helptexts.lua'
--- tribes/buildings/productionsites/empire/scouts_house/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/scouts_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/sheepfarm/helptexts.lua'
--- tribes/buildings/productionsites/empire/sheepfarm/helptexts.lua	2015-11-08 11:35:51 +0000
+++ tribes/buildings/productionsites/empire/sheepfarm/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/shipyard/helptexts.lua'
--- tribes/buildings/productionsites/empire/shipyard/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/shipyard/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/smelting_works/helptexts.lua'
--- tribes/buildings/productionsites/empire/smelting_works/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/smelting_works/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/stonemasons_house/helptexts.lua'
--- tribes/buildings/productionsites/empire/stonemasons_house/helptexts.lua	2015-11-08 11:35:51 +0000
+++ tribes/buildings/productionsites/empire/stonemasons_house/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/tavern/helptexts.lua'
--- tribes/buildings/productionsites/empire/tavern/helptexts.lua	2015-11-20 16:39:38 +0000
+++ tribes/buildings/productionsites/empire/tavern/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,7 +17,7 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 

=== modified file 'tribes/buildings/productionsites/empire/toolsmithy/helptexts.lua'
--- tribes/buildings/productionsites/empire/toolsmithy/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/toolsmithy/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/vineyard/helptexts.lua'
--- tribes/buildings/productionsites/empire/vineyard/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/empire/vineyard/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/weaponsmithy/helptexts.lua'
--- tribes/buildings/productionsites/empire/weaponsmithy/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/weaponsmithy/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/weaving_mill/helptexts.lua'
--- tribes/buildings/productionsites/empire/weaving_mill/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/productionsites/empire/weaving_mill/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/well/helptexts.lua'
--- tribes/buildings/productionsites/empire/well/helptexts.lua	2015-11-08 11:49:22 +0000
+++ tribes/buildings/productionsites/empire/well/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/productionsites/empire/winery/helptexts.lua'
--- tribes/buildings/productionsites/empire/winery/helptexts.lua	2015-11-08 11:35:51 +0000
+++ tribes/buildings/productionsites/empire/winery/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/trainingsites/atlanteans/dungeon/helptexts.lua'
--- tribes/buildings/trainingsites/atlanteans/dungeon/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/trainingsites/atlanteans/dungeon/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -20,11 +20,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/trainingsites/atlanteans/labyrinth/helptexts.lua'
--- tribes/buildings/trainingsites/atlanteans/labyrinth/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/trainingsites/atlanteans/labyrinth/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -20,11 +20,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/trainingsites/empire/arena/helptexts.lua'
--- tribes/buildings/trainingsites/empire/arena/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/trainingsites/empire/arena/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -25,6 +25,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/trainingsites/empire/colosseum/helptexts.lua'
--- tribes/buildings/trainingsites/empire/colosseum/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/trainingsites/empire/colosseum/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -25,6 +25,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/trainingsites/empire/trainingcamp/helptexts.lua'
--- tribes/buildings/trainingsites/empire/trainingcamp/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/trainingsites/empire/trainingcamp/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -25,6 +25,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'tribes/buildings/warehouses/atlanteans/headquarters/helptexts.lua'
--- tribes/buildings/warehouses/atlanteans/headquarters/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/warehouses/atlanteans/headquarters/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -24,6 +24,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/warehouses/atlanteans/port/helptexts.lua'
--- tribes/buildings/warehouses/atlanteans/port/helptexts.lua	2015-11-07 08:45:50 +0000
+++ tribes/buildings/warehouses/atlanteans/port/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/warehouses/atlanteans/warehouse/helptexts.lua'
--- tribes/buildings/warehouses/atlanteans/warehouse/helptexts.lua	2015-11-17 09:29:16 +0000
+++ tribes/buildings/warehouses/atlanteans/warehouse/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/warehouses/barbarians/headquarters/helptexts.lua'
--- tribes/buildings/warehouses/barbarians/headquarters/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/warehouses/barbarians/headquarters/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -25,6 +25,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/warehouses/barbarians/headquarters_interim/helptexts.lua'
--- tribes/buildings/warehouses/barbarians/headquarters_interim/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/warehouses/barbarians/headquarters_interim/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -25,6 +25,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/warehouses/barbarians/port/helptexts.lua'
--- tribes/buildings/warehouses/barbarians/port/helptexts.lua	2015-11-10 08:53:12 +0000
+++ tribes/buildings/warehouses/barbarians/port/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/warehouses/barbarians/warehouse/helptexts.lua'
--- tribes/buildings/warehouses/barbarians/warehouse/helptexts.lua	2015-11-17 09:29:16 +0000
+++ tribes/buildings/warehouses/barbarians/warehouse/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/warehouses/empire/headquarters/helptexts.lua'
--- tribes/buildings/warehouses/empire/headquarters/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/warehouses/empire/headquarters/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -25,6 +25,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/warehouses/empire/headquarters_shipwreck/helptexts.lua'
--- tribes/buildings/warehouses/empire/headquarters_shipwreck/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/buildings/warehouses/empire/headquarters_shipwreck/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -25,6 +25,6 @@
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/warehouses/empire/port/helptexts.lua'
--- tribes/buildings/warehouses/empire/port/helptexts.lua	2015-11-07 08:45:50 +0000
+++ tribes/buildings/warehouses/empire/port/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/buildings/warehouses/empire/warehouse/helptexts.lua'
--- tribes/buildings/warehouses/empire/warehouse/helptexts.lua	2015-11-17 09:29:16 +0000
+++ tribes/buildings/warehouses/empire/warehouse/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,12 +2,12 @@
 include "tribes/scripting/help/global_helptexts.lua"
 
 function building_helptext_lore()
-   -- #TRANSLATORS: Lore helptext for a 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
+   -- TRANSLATORS#: Lore author helptext for a building
    return no_lore_author_text_yet()
 end
 
@@ -17,11 +17,11 @@
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return ""
 end

=== modified file 'tribes/immovables/resi_coal1/helptexts.lua'
--- tribes/immovables/resi_coal1/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/immovables/resi_coal1/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,7 +2,7 @@
 
 function immovable_helptext(tribe)
    local helptext = {
-      -- #TRANSLATORS: Helptext for a resource: Coal
+      -- TRANSLATORS#: Helptext for a resource: Coal
       default = "Coal veins contain coal that can be dug up by coal mines." .. " " .. "There is only a little bit of coal here."
    }
    local result = ""

=== modified file 'tribes/immovables/resi_coal2/helptexts.lua'
--- tribes/immovables/resi_coal2/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/immovables/resi_coal2/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,7 +2,7 @@
 
 function immovable_helptext(tribe)
    local helptext = {
-      -- #TRANSLATORS: Helptext for a resource: Coal
+      -- TRANSLATORS#: Helptext for a resource: Coal
       default = "Coal veins contain coal that can be dug up by coal mines." .. " " .. "There is a lot of coal here."
    }
    local result = ""

=== modified file 'tribes/immovables/resi_gold1/helptexts.lua'
--- tribes/immovables/resi_gold1/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/immovables/resi_gold1/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,7 +2,7 @@
 
 function immovable_helptext(tribe)
    local helptext = {
-      -- #TRANSLATORS: Helptext for a resource: Gold
+      -- TRANSLATORS#: Helptext for a resource: Gold
       default = "Gold veins contain gold ore that can be dug up by gold mines." .. " " .. "There is only a little bit of gold here."
    }
    local result = ""

=== modified file 'tribes/immovables/resi_gold2/helptexts.lua'
--- tribes/immovables/resi_gold2/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/immovables/resi_gold2/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,7 +2,7 @@
 
 function immovable_helptext(tribe)
    local helptext = {
-      -- #TRANSLATORS: Helptext for a resource: Gold
+      -- TRANSLATORS#: Helptext for a resource: Gold
       default = "Gold veins contain gold ore that can be dug up by gold mines." .. " " .. "There is a lot of gold here."
    }
    local result = ""

=== modified file 'tribes/immovables/resi_iron1/helptexts.lua'
--- tribes/immovables/resi_iron1/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/immovables/resi_iron1/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,7 +2,7 @@
 
 function immovable_helptext(tribe)
    local helptext = {
-      -- #TRANSLATORS: Helptext for a resource: Iron
+      -- TRANSLATORS#: Helptext for a resource: Iron
       default = "Iron veins contain iron ore that can be dug up by iron mines." .. " " .. "There is only a little bit of iron here."
    }
    local result = ""

=== modified file 'tribes/immovables/resi_iron2/helptexts.lua'
--- tribes/immovables/resi_iron2/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/immovables/resi_iron2/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,7 +2,7 @@
 
 function immovable_helptext(tribe)
    local helptext = {
-      -- #TRANSLATORS: Helptext for a resource: Iron
+      -- TRANSLATORS#: Helptext for a resource: Iron
       default = "Iron veins contain iron ore that can be dug up by iron mines." .. " " .. "There is a lot of iron here."
    }
    local result = ""

=== modified file 'tribes/immovables/resi_none/helptexts.lua'
--- tribes/immovables/resi_none/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/immovables/resi_none/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,7 +2,7 @@
 
 function immovable_helptext(tribe)
    local helptext = {
-      -- #TRANSLATORS: Helptext for a resource: No resources
+      -- TRANSLATORS#: Helptext for a resource: No resources
       default = "There are no resources in the ground here."
    }
    local result = ""

=== modified file 'tribes/immovables/resi_stones1/helptexts.lua'
--- tribes/immovables/resi_stones1/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/immovables/resi_stones1/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,11 +2,11 @@
 
 function immovable_helptext(tribe)
    local helptext = {
-      -- #TRANSLATORS: Helptext for a resource: Stones
+      -- TRANSLATORS#: Helptext for a resource: Stones
       atlanteans = "Precious stones are used in the construction of big buildings. They can be dug up by a crystal mine." .. " " .. "There are only a few precious stones here.",
-      -- #TRANSLATORS: Helptext for a resource: Stones
+      -- TRANSLATORS#: Helptext for a resource: Stones
       barbarians = "Granite is a basic building material and can be dug up by a granite mine." .. " " .. "There is only a little bit of granite here.",
-      -- #TRANSLATORS: Helptext for a resource: Stones
+      -- TRANSLATORS#: Helptext for a resource: Stones
       empire = "Marble is a basic building material and can be dug up by a marble mine. You will also get granite from the mine." .. " " .. "There is only a little bit of marble here."
    }
    local result = ""

=== modified file 'tribes/immovables/resi_stones2/helptexts.lua'
--- tribes/immovables/resi_stones2/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/immovables/resi_stones2/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,11 +2,11 @@
 
 function immovable_helptext(tribe)
    local helptext = {
-      -- #TRANSLATORS: Helptext for a resource: Stones
+      -- TRANSLATORS#: Helptext for a resource: Stones
       atlanteans = "Precious stones are used in the construction of big buildings. They can be dug up by a crystal mine." .. " " .. "There are many precious stones here.",
-      -- #TRANSLATORS: Helptext for a resource: Stones
+      -- TRANSLATORS#: Helptext for a resource: Stones
       barbarians = "Granite is a basic building material and can be dug up by a granite mine." .. " " .. "There is a lot of granite here.",
-      -- #TRANSLATORS: Helptext for a resource: Stones
+      -- TRANSLATORS#: Helptext for a resource: Stones
       empire = "Marble is a basic building material and can be dug up by a marble mine. You will also get granite from the mine." .. " " .. "There is a lot of marble here."
    }
    local result = ""

=== modified file 'tribes/immovables/resi_water1/helptexts.lua'
--- tribes/immovables/resi_water1/helptexts.lua	2015-10-31 12:11:44 +0000
+++ tribes/immovables/resi_water1/helptexts.lua	2015-12-12 05:38:49 +0000
@@ -2,7 +2,7 @@
 
 function immovable_helptext(tribe)
    local helptext = {
-      -- #TRANSLATORS: Helptext for a resource: Water
+      -- TRANSLATORS#: Helptext for a resource: Water
       default = "There is water in the ground here that can be pulled up by a well."
    }
    local result = ""

=== modified file 'txts/developers.json'
--- txts/developers.json	2015-09-08 15:50:38 +0000
+++ txts/developers.json	2015-12-12 05:38:49 +0000
@@ -102,7 +102,8 @@
 						"Simon Eilting",
 						"Alexander Kartzow (daAlx1)",
 						"Łukasz Majcher",
-						"Paul Mehrer (meitis)"
+						"Paul Mehrer (meitis)",
+						"Miroslav Remák (MiroslavR)"
 					]
 				}
 			]

=== modified file 'utils/buildcat.py'
--- utils/buildcat.py	2015-11-28 10:03:15 +0000
+++ utils/buildcat.py	2015-12-12 05:38:49 +0000
@@ -13,12 +13,17 @@
 from glob import glob
 from itertools import takewhile
 import os
-import string
 import subprocess
 import sys
-
-from lua_xgettext import Lua_GetText
-import confgettext
+from time import strftime,gmtime
+
+try:
+    maketrans = "".maketrans
+except AttributeError:
+    # fallback for python2
+    from string import maketrans
+
+from confgettext import Conf_GetText
 
 # Holds the names of non-iterative catalogs to build and the
 # corresponding source paths list. Note that paths MUST be relative to po/pot,
@@ -115,6 +120,36 @@
 XGETTEXTOPTS+=" --copyright-holder=\"Widelands Development Team\""
 XGETTEXTOPTS+=" --msgid-bugs-address=\"https://bugs.launchpad.net/widelands\""
 
+# Options for xgettext when parsing Lua scripts
+# Official Lua backend of xgettext does not support pgettext and npgettext right
+# off the bat and also expects keywords (besides _) to be prefixed with 'gettext.',
+# so we need to specify the keywords we need ourselves.
+LUAXGETTEXTOPTS ="-k" # Remove known keywords
+LUAXGETTEXTOPTS+=" --keyword=_ --flag=_:1:pass-lua-format"
+LUAXGETTEXTOPTS+=" --keyword=ngettext:1,2 --flag=ngettext:1:pass-lua-format --flag=ngettext:2:pass-lua-format"
+LUAXGETTEXTOPTS+=" --keyword=pgettext:1c,2 --flag=pgettext:2:pass-lua-format"
+LUAXGETTEXTOPTS+=" --keyword=npgettext:1c,2,3 --flag=npgettext:2:pass-lua-format --flag=npgettext:3:pass-lua-format"
+LUAXGETTEXTOPTS+=" --language=Lua --from-code=UTF-8 -F -c\" TRANSLATORS:\""
+
+time_now = gmtime()
+# This is the header used for Lua+conf potfiles.
+# Set it to something sensible, as much as is possible here.
+HEAD =  "# Widelands PATH/TO/FILE.PO\n"
+HEAD += "# Copyright (C) 2005-" + strftime("%Y", time_now) + " Widelands Development Team\n"
+HEAD += "# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n"
+HEAD += "#\n"
+HEAD += "msgid \"\"\n"
+HEAD += "msgstr \"\"\n"
+HEAD += "\"Project-Id-Version: Widelands svnVERSION\\n\"\n"
+HEAD += "\"Report-Msgid-Bugs-To: https://bugs.launchpad.net/widelands\\n\"\n"
+HEAD += "\"POT-Creation-Date: " + strftime("%Y-%m-%d %H:%M+0000", time_now) + "\\n\"\n"
+HEAD += "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n"
+HEAD += "\"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"\n"
+HEAD += "\"Language-Team: LANGUAGE <[e-mail]>\\n\"\n"
+HEAD += "\"MIME-Version: 1.0\\n\"\n"
+HEAD += "\"Content-Type: text/plain; charset=UTF-8\\n\"\n"
+HEAD += "\"Content-Transfer-Encoding: 8bit\\n\"\n"
+HEAD += "\n"
 
 def are_we_in_root_directory():
     """Make sure we are called in the root directory"""
@@ -133,6 +168,55 @@
     except:
         pass
 
+def pot_modify_header( potfile_in, potfile_out, header ):
+    """
+    Modify the header of a translation catalog read from potfile_in to
+    the given header and write out the modified catalog to potfile_out.
+    
+    Returns whether or not the header was successfully modified.
+    
+    Note: potfile_in and potfile_out must not point to the same file!
+    """
+    class State:
+        (start,
+         possibly_empty_msgid,
+         search_for_empty_line,
+         header_traversed) = range(4)
+        
+    st = State.start
+    with open(potfile_in, "rt") as potin:
+        for line in potin:
+            line = line.strip()
+            
+            if st == State.start:
+                if line.startswith("msgid \"\""):
+                    st = State.possibly_empty_msgid
+                elif line.startswith("msgid"):
+                    # The first entry is not a header entry,
+                    # since msgid is not empty.
+                    return False
+            elif st == State.possibly_empty_msgid:
+                if line.startswith("msgstr"):
+                    # msgstr right after msgid "", which means msgid must
+                    # be empty, therefore we have reached the header entry
+                    st = State.search_for_empty_line
+                else:
+                    # Header check failed.
+                    return False
+            elif st == State.search_for_empty_line:
+                if not line:
+                    st = State.header_traversed
+                    break;
+        
+        if st != State.header_traversed:
+            return False
+        
+        with open(potfile_out, "wt") as potout:
+            potout.write(header)
+            potout.writelines(potin)
+
+        return True
+
 
 def do_compile( potfile, srcfiles ):
     """
@@ -147,20 +231,59 @@
     lua_files = set([ f for f in files if
         os.path.splitext(f)[-1].lower() == '.lua' ])
     conf_files = files - lua_files
-
-    l = Lua_GetText()
-    for fname in lua_files:
-        l.parse(open(fname, "r").read(), fname)
-
-    l.merge(confgettext.parse_conf(conf_files))
-
-    if not l.found_something_to_translate:
-        return False
-
-    with open(potfile, "w") as potfileobject:
-        potfileobject.write(str(l))
-        potfileobject.close()
+    
+    temp_potfile = potfile + ".tmp"
+    
+    if (os.path.exists(temp_potfile)): os.remove(temp_potfile)
+    
+    # Find translatable strings in Lua files using xgettext
+    xgettext = subprocess.Popen("xgettext %s --files-from=- --output=\"%s\"" % \
+        (LUAXGETTEXTOPTS, temp_potfile), shell=True, stdin=subprocess.PIPE, universal_newlines=True)
+    try:
+        for fname in lua_files:
+            xgettext.stdin.write(os.path.normpath(fname) + "\n")
+        xgettext.stdin.close()
+    except IOError as err_msg:
+        sys.stderr.write("Failed to call xgettext: %s\n" % err_msg)
+        return False
+    
+    xgettext_status = xgettext.wait()
+    if (xgettext_status != 0):
+        sys.stderr.write("xgettext exited with errorcode %i\n" % xgettext_status)
+        return False
+        
+    xgettext_found_something_to_translate = os.path.exists(temp_potfile)
+    
+    # Find translatable strings in configuration files
+    conf = Conf_GetText()
+    conf.parse(conf_files)
+    
+    if not (xgettext_found_something_to_translate or conf.found_something_to_translate):
+        # Found no translatable strings
+        return False
+    
+    if (xgettext_found_something_to_translate):
+        header_fixed = pot_modify_header(temp_potfile, potfile, HEAD)
+        os.remove(temp_potfile)
+        
+        if not header_fixed:
+            return False
+        
+        if (conf.found_something_to_translate):
+            # Merge the conf POT with Lua POT
+            with open(potfile, "at") as p:
+                p.write("\n" + conf.toString())
+                
+            msguniq_rv = os.system("msguniq \"%s\" -F --output-file=\"%s\"" % (potfile, potfile))
+            if (msguniq_rv):
+                sys.stderr.write("msguniq exited with errorcode %i\n" % msguniq_rv)
+                return False
+    elif (conf.found_something_to_translate):
+        with open(potfile, "wt") as p:
+            p.write(HEAD + conf.toString())
+
     return True
+    
 
 
 def do_compile_src( potfile, srcfiles ):
@@ -170,7 +293,7 @@
     """
     # call xgettext and supply source filenames via stdin
     gettext_input = subprocess.Popen("xgettext %s --files-from=- --output=%s" % \
-            (XGETTEXTOPTS, potfile), shell=True, stdin=subprocess.PIPE).stdin
+            (XGETTEXTOPTS, potfile), shell=True, stdin=subprocess.PIPE, universal_newlines=True).stdin
     try:
         for one_pattern in srcfiles:
             # 'normpath' is necessary for windows ('/' vs. '\')
@@ -223,7 +346,7 @@
         # Generate .pot catalogs
         dangerous_chars = "'\" " # Those chars are replaced via '_'
         for pot, srcfiles in potfiles:
-            pot = pot.lower().translate(string.maketrans(dangerous_chars, len(dangerous_chars)*"_"))
+            pot = pot.lower().translate(maketrans(dangerous_chars, len(dangerous_chars)*"_"))
             path = os.path.normpath("po/" + os.path.dirname(pot))
             do_makedirs(path)
             oldcwd = os.getcwd()

=== modified file 'utils/confgettext.py'
--- utils/confgettext.py	2014-09-29 18:52:21 +0000
+++ utils/confgettext.py	2015-12-12 05:38:49 +0000
@@ -5,29 +5,9 @@
 
 import sys
 import os
-from time import strftime,gmtime
 
 from collections import defaultdict
 
-time_now = gmtime()
-### Set the header to something sensible, a much as is possible here.
-head =  "# Widelands PATH/TO/FILE.PO\n"
-head += "# Copyright (C) 2005-" + strftime("%Y", time_now) + " Widelands Development Team\n"
-head += "# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n"
-head += "#\n"
-head += "msgid \"\"\n"
-head += "msgstr \"\"\n"
-head += "\"Project-Id-Version: Widelands svnVERSION\\n\"\n"
-head += "\"Report-Msgid-Bugs-To: https://bugs.launchpad.net/widelands\\n\"\n"
-head += "\"POT-Creation-Date: " + strftime("%Y-%m-%d %H:%M+0000", time_now) + "\\n\"\n"
-head += "\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n"
-head += "\"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"\n"
-head += "\"Language-Team: LANGUAGE <[e-mail]>\\n\"\n"
-head += "\"MIME-Version: 1.0\\n\"\n"
-head += "\"Content-Type: text/plain; charset=UTF-8\\n\"\n"
-head += "\"Content-Transfer-Encoding: 8bit\\n\"\n"
-head += "\n"
-
 class occurences:
     def __init__( self, file, line ):
         self.line = line
@@ -37,7 +17,7 @@
     def __init__( self ):
         self.occurences = []
         self.str = ""
-
+        
 def is_multiline( str ):
     l = str.find('""')
     if( l == -1 ):
@@ -59,86 +39,109 @@
     return -1
 
 def append_string( known_strings, array, string ):
-    if known_strings.has_key( string.str ):
+    if string.str in known_strings:
         i = known_strings[string.str]
         array[i].occurences += string.occurences
     else:
         array.append( string )
-        known_strings[string.str] = len( array ) - 1
-
-def parse_conf( files ):
-    translatable_strings = []
-    known_strings = {}
-    curstr = 0
-    multiline = 0
-    for file in files:
-        lines = open( file, 'r' ).readlines();
-        for i in range(0,len(lines)):
-            line = lines[i].rstrip('\n')
-            linenr = i+1
-            curstr = 0
-
-            if multiline and  len(line) and line[0]=='_':
-                line = line[1:]
-                rindex = line.rfind('""')
-                if rindex == -1 or line[:2] == '""':
-                    line = line.strip()
-                    line = line.strip('"')
-                    curstr = trans_string()
-                    curstr.str = line
-                    curstr.occurences.append( occurences( file, linenr ))
-                    append_string( known_strings, translatable_strings, curstr )
-                    continue
-                else:
-                    line = line[:(rindex+1)]
-                    line = line.strip()
-                    line = line.strip('"')
-                    curstr = trans_string()
-                    curstr.str = line
-                    curstr.occurences.append( occurences( file, linenr ))
-                    append_string( known_strings, translatable_strings, curstr )
-                    multiline = False
-                    continue
-
-            index = line.find( "=_" )
-            if( index > 0 ):
-                curstr = trans_string()
-                curstr.occurences.append( occurences( file, linenr ))
-                restline = line[index+2:]
-                multiline = is_multiline( restline );
-                if multiline: # means exactly one "
-                    index = firstl( restline, '"\'')
-                    restline = restline[index+1:]
-                    restline = restline.strip()
-                    restline = restline.strip('"')
-                    curstr.str += '"' + restline + '"\n'
-                    continue
-                # Is not multiline
-                # If there are ' or " its easy
-                l = firstl( restline, '\"')
-                r = firstr( restline[l+1:], '\"')
-                if( l != -1 and r != -1 ):
-                    restline = restline[l+1:]
-                    restline = restline[:r]
-                else:
-                    # Remove comments
-                    rindex = max( restline.rfind('#'), restline.rfind('//'))
-                    if rindex != -1:
-                        restline = restline[:rindex]
-                    # And strip
-                    restline = restline.strip()
-                curstr.str = restline
-                append_string( known_strings, translatable_strings, curstr )
-
-    translatable_strings.sort( lambda str1,str2:
-                cmp(str1.occurences[0].file,str2.occurences[0].file) )
-
-    # Sort this into the way that is returned by lua xgettext so that we can 
-    # join efforts here. 
-    rv = defaultdict()
-    for i in translatable_strings:
-        rv[i.str] = [ (o.file, o.line) for o in i.occurences ]
-
-    return rv
-
-
+        known_strings[string.str] = len( array ) - 1   
+        
+def _escape_pot_string(string):
+    return string.replace('\\', '\\\\').replace('"', '\\"')
+
+def _format_msgid(tag, string, output):
+    # there was a bug in this code that would never output single line
+    # msg_ids. I decided not to fix it, since that wuold change a ton
+    # of pot files and maybe msg_ids.
+    # if not string.count('\n'): <== this was s.count
+        # s += 'msgid "%s"\n' % string
+    # else:
+    string = _escape_pot_string(string)
+    output.append('%s ""' % tag)
+    lines = string.split('\n')
+    for line in lines[:-1]:
+        output.append('"%s\\n"' % line)
+    output.append('"%s"' % lines[-1])
+    return output                
+
+class Conf_GetText(object):
+    def __init__(self):
+        self.translatable_strings = []
+        
+        
+    @property
+    def found_something_to_translate(self):
+        return len(self.translatable_strings) > 0
+    
+    def parse(self, files):
+        known_strings = {}
+        curstr = 0
+        multiline = 0
+        for file in files:
+            lines = open( file, 'r' ).readlines();
+            for i in range(0,len(lines)):
+                line = lines[i].rstrip('\n')
+                linenr = i+1
+                curstr = 0
+
+                if multiline and  len(line) and line[0]=='_':
+                    line = line[1:]
+                    rindex = line.rfind('""')
+                    if rindex == -1 or line[:2] == '""':
+                        line = line.strip()
+                        line = line.strip('"')
+                        curstr = trans_string()
+                        curstr.str = line
+                        curstr.occurences.append( occurences( file, linenr ))
+                        append_string( known_strings, self.translatable_strings, curstr )
+                        continue
+                    else:
+                        line = line[:(rindex+1)]
+                        line = line.strip()
+                        line = line.strip('"')
+                        curstr = trans_string()
+                        curstr.str = line
+                        curstr.occurences.append( occurences( file, linenr ))
+                        append_string( known_strings, self.translatable_strings, curstr )
+                        multiline = False
+                        continue
+
+                index = line.find( "=_" )
+                if( index > 0 ):
+                    curstr = trans_string()
+                    curstr.occurences.append( occurences( file, linenr ))
+                    restline = line[index+2:]
+                    multiline = is_multiline( restline );
+                    if multiline: # means exactly one "
+                        index = firstl( restline, '"\'')
+                        restline = restline[index+1:]
+                        restline = restline.strip()
+                        restline = restline.strip('"')
+                        curstr.str += '"' + restline + '"\n'
+                        continue
+                    # Is not multiline
+                    # If there are ' or " its easy
+                    l = firstl( restline, '\"')
+                    r = firstr( restline[l+1:], '\"')
+                    if( l != -1 and r != -1 ):
+                        restline = restline[l+1:]
+                        restline = restline[:r]
+                    else:
+                        # Remove comments
+                        rindex = max( restline.rfind('#'), restline.rfind('//'))
+                        if rindex != -1:
+                            restline = restline[:rindex]
+                        # And strip
+                        restline = restline.strip()
+                    curstr.str = restline
+                    append_string( known_strings, self.translatable_strings, curstr )
+    
+    def toString(self):
+        lines = []
+        for i in self.translatable_strings:
+            for occ in i.occurences:
+                lines.append('#: %s:%i' % (os.path.normpath(occ.file), occ.line))
+                
+            _format_msgid('msgid', i.str, lines)
+            lines.extend(['msgstr ""', ''])
+        return ("\n".join(lines))

=== removed file 'utils/lua_xgettext.py'
--- utils/lua_xgettext.py	2015-09-04 11:03:41 +0000
+++ utils/lua_xgettext.py	1970-01-01 00:00:00 +0000
@@ -1,384 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-
-from collections import defaultdict, namedtuple
-import itertools
-import os
-import re
-
-from confgettext import head
-
-Token = namedtuple('Token', ['type', 'data'])
-
-def _escape_pot_string(string):
-    return string.replace('\\', '\\\\').replace('"', '\\"')
-
-def _format_msgid(tag, string, output):
-    # there was a bug in this code that would never output single line
-    # msg_ids. I decided not to fix it, since that wuold change a ton
-    # of pot files and maybe msg_ids.
-    # if not string.count('\n'): <== this was s.count
-        # s += 'msgid "%s"\n' % string
-    # else:
-    string = _escape_pot_string(string)
-    output.append('%s ""' % tag)
-    lines = string.split('\n')
-    for line in lines[:-1]:
-        output.append('"%s\\n"' % line)
-    output.append('"%s"' % lines[-1])
-    return output
-
-class ParsingNode(list):
-
-    def __init__(self, parent=None):
-        self.parent = parent
-        self.type = 'NODE'
-
-    def __str__(self):
-        return 'N%s' % list.__str__(self)
-
-
-class LuaParser(object):
-
-    def __init__(self):
-        self.scanner = re.Scanner([
-            (r"\-\-( TRANSLATORS)?", self._Tcomment),
-            (r"\(", self._Tleft),
-            (r"\)", self._Tright),
-            (r"\.\.", self._Tconcat),
-            (r"(?<!\\)[\"']", self._Ttoggle_string),
-            (r"\[\[", self._Topen_multiline_string),
-            (r"\]\]", self._Tclose_multiline_string),
-            (r"\b_\b", self._Ttranslate_next_string),
-            (r"[^\d\W]\w*", self._Tidentifier),
-            (r"\n", self._Tnewline),
-            (r"[ \t]+", self._Twhitespace),
-            (r".", self._Tidentifier),
-        ], re.MULTILINE | re.DOTALL)
-        self.in_string = False
-        self.current_line = 1
-        self.current_string = ''
-        self.result = ParsingNode()
-        self.in_comment = False
-        self.translator_comment = ''
-        self.current = self.result
-
-    def parse(self, content):
-        self.scanner.scan(content)
-
-        def _recurse_lists(original_list, func):
-            def _internal(l):
-                new_l = ParsingNode()
-                for entry in l:
-                    if isinstance(entry, list):
-                        entry = _recurse_lists(entry, func)
-                    new_l.append(entry)
-                return func(new_l)
-            return _internal(original_list)
-
-        def _combine_concatenated_strings(l):
-            for i in range(len(l)):
-                if i > 0 and l[i].type == '..':
-                    if l[i - 1].type != 'STRING' or l[i + 1].type != 'STRING':
-                        continue
-                    # Do not concatenate translated and untranslated string.
-                    if i - 2 >= 0 and l[i - 2].type == '_':
-                        continue
-                    first_string, line = l[i - 1].data
-                    second_string, unused = l[i + 1].data
-                    l[i - 1:i +
-                        2] = [Token('STRING', (first_string + second_string, line))]
-                    return _combine_concatenated_strings(l)
-            return l
-
-        translatable_items = []
-        translator_comment_lines = []
-
-        def _find_translatable_strings(l):
-            for i in range(len(l)):
-                if isinstance(l[i], list):
-                    _find_translatable_strings(l[i])
-                    continue
-
-                append_data = None
-                if l[i].type == 'TRANSLATOR_COMMENT':
-                    translator_comment_lines.append(l[i].data[0])
-
-                if l[i].type == '_':
-                    if l[i + 1].type == 'NODE':
-                        msgid, line = l[i + 1][0].data
-                    else:
-                        msgid, line = l[i + 1].data
-                    append_data = {
-                        'type': 'gettext',
-                        'msgid': msgid,
-                        'line': line,
-                    }
-
-                if l[i].type == 'pgettext':
-                    assert l[i + 1].type == 'NODE'
-                    assert len(l[i + 1]) == 3
-                    line = l[i + 1][0].data[1]
-                    msgctxt = l[i + 1][0].data[0]
-                    msgid = l[i + 1][2].data[0]
-                    append_data = {
-                        'type': 'pgettext',
-                        'msgid': msgid,
-                        'msgctxt': msgctxt,
-                        'line': line,
-                    }
-
-                if l[i].type == 'ngettext':
-                    assert l[i + 1].type == 'NODE'
-                    assert len(l[i + 1]) >= 4
-                    msgid, line = l[i + 1][0].data
-                    msgid_plural = l[i + 1][2].data[0]
-                    append_data = {
-                        'type': 'ngettext',
-                        'msgid': msgid,
-                        'msgid_plural': msgid_plural,
-                        'line': line,
-                    }
-
-                if append_data:
-                    comment = '\n'.join(translator_comment_lines).strip()
-                    # Empty the list, but keep the reference the same, so that
-                    # all recursed methods still use the same object.
-                    while translator_comment_lines:
-                        translator_comment_lines.pop()
-                    if comment:
-                        append_data['translator_comment'] = comment
-                    translatable_items.append(append_data)
-            return l
-
-        def _remove_empties(l):
-            rv = ParsingNode()
-            for a in l:
-                if isinstance(a, list) and not a:
-                    continue
-                rv.append(a)
-            return rv
-
-        self.result = _recurse_lists(self.result, _remove_empties)
-        self.result = _recurse_lists(
-            self.result, _combine_concatenated_strings)
-
-        _find_translatable_strings(self.result)
-        return translatable_items
-
-    def _skip_token(self, scanner, token):
-        if self.in_string:
-            self.current_string += token
-        elif self.translator_comment:
-            self.translator_comment += token
-
-    def _string_done(self):
-        text = eval('str(""" %s """)' % self.current_string)[1:-1]
-        self.current.append(Token('STRING', (text, self.string_started)))
-        self.current_string = ''
-        del self.string_started
-        self.in_string = None
-
-    def _Tleft(self, scanner, token):
-        if self.in_comment:
-            self._skip_token(scanner, token)
-        elif self.in_string:
-            self._skip_token(scanner, token)
-        else:
-            new = ParsingNode(self.current)
-            self.current.append(new)
-            self.current = new
-
-    def _Tright(self, scanner, token):
-        if self.in_comment:
-            self._skip_token(scanner, token)
-        elif self.in_string:
-            self._skip_token(scanner, token)
-        else:
-            self.current = self.current.parent
-
-    def _Ttranslate_next_string(self, scanner, token):
-        if self.in_comment:
-            self._skip_token(scanner, token)
-        elif self.in_string:
-            self._skip_token(scanner, token)
-        else:
-            self.current.append(Token('_', None))
-
-    def _Topen_multiline_string(self, scanner, token):
-        if self.in_comment:
-            self._skip_token(scanner, token)
-        elif self.in_string:
-            self._skip_token(scanner, token)
-        else:
-            self.string_started = self.current_line
-            self.in_string = '[['
-
-    def _Tclose_multiline_string(self, scanner, token):
-        if self.in_comment:
-            self._skip_token(scanner, token)
-        elif self.in_string and self.in_string != '[[':
-            self._skip_token(scanner, token)
-        else:
-            assert(self.in_string == '[[')
-            self._string_done()
-
-    def _Ttoggle_string(self, scanner, token):
-        if self.in_comment:
-            self._skip_token(scanner, token)
-        elif not self.in_string:
-            self.in_string = token
-            self.string_started = self.current_line
-        elif self.in_string != token:
-            self._skip_token(scanner, token)
-        else:
-            self._string_done()
-
-    def _Tconcat(self, scanner, token):
-        if self.in_comment:
-            self._skip_token(scanner, token)
-        elif self.in_string:
-            self._skip_token(scanner, token)
-        else:
-            self.current.append(Token('..', None))
-
-    def _Tidentifier(self, scanner, token):
-        if self.in_comment:
-            self._skip_token(scanner, token)
-        elif self.in_string:
-            self._skip_token(scanner, token)
-        else:
-            self.current.append(Token(token, None))
-
-    def _Tnewline(self, scanner, token):
-        self.current_line += 1
-        self._skip_token(scanner, token)
-        self.in_comment = False
-        if self.translator_comment:
-            self.current.append(
-                Token('TRANSLATOR_COMMENT', (self.translator_comment.strip(),)))
-            self.translator_comment = ''
-
-    def _Twhitespace(self, scanner, token):
-        self._skip_token(scanner, token)
-
-    def _Tcomment(self, scanner, token):
-        if self.in_comment:
-            self._skip_token(scanner, token)
-        elif self.in_string:
-            self._skip_token(scanner, token)
-        else:
-            if token.startswith('-- TRANSLATORS'):
-                self.translator_comment = 'TRANSLATORS'
-            self.in_comment = True
-
-
-def emit_comments_and_line_numbers(occurences, lines):
-    comments = sorted(
-        set(f['translator_comment'] for f in occurences if 'translator_comment' in f))
-    for comment in comments:
-        lines.append('#. %s' % (comment))
-    for occurence in occurences:
-        lines.append('#: %s:%i' % (os.path.normpath(occurence['filename']),
-                             occurence['line']))
-
-def emit_gettext(occurences, lines):
-    emit_comments_and_line_numbers(occurences, lines)
-    occurence = occurences[0]
-    _format_msgid('msgid', occurence['msgid'], lines)
-    lines.extend(['msgstr ""', ''])
-
-def emit_ngettext(occurences, lines):
-    emit_comments_and_line_numbers(occurences, lines)
-    occurence = occurences[0]
-    _format_msgid('msgid', occurence['msgid'], lines)
-    _format_msgid('msgid_plural', occurence['msgid_plural'], lines)
-    lines.append('msgstr[0] ""')
-    lines.extend(['msgstr[1] ""', ''])
-
-def emit_pgettext(occurences, lines):
-    for context, ctx_occurences in itertools.groupby(occurences, key=lambda a: a['msgctxt']):
-        ctx_occurences = list(ctx_occurences)
-        emit_comments_and_line_numbers(ctx_occurences, lines)
-        occurence = ctx_occurences[0]
-        lines.append('msgctxt "%s"' % _escape_pot_string(occurence['msgctxt']))
-        _format_msgid('msgid', occurence['msgid'], lines)
-        lines.extend(['msgstr ""', ''])
-
-EMIT_FUNCTIONS = {
-    'gettext': emit_gettext,
-    'ngettext': emit_ngettext,
-    'pgettext': emit_pgettext,
-}
-
-class Lua_GetText(object):
-
-    def __init__(self):
-        self.translatable_items = defaultdict(list)
-
-    def parse(self, contents, filename):
-        items = LuaParser().parse(contents)
-        for item in items:
-            item['filename'] = filename
-            self.translatable_items[item['msgid']].append(item)
-
-    @property
-    def found_something_to_translate(self):
-        return len(self.translatable_items.keys()) > 0
-
-    def merge(self, other_translatable_items):
-        for key in other_translatable_items:
-            our_translatable_items = self.translatable_items[key]
-            for finding in other_translatable_items[key]:
-                if isinstance(finding, dict):
-                    our_translatable_items.append(finding)
-                else:
-                    our_translatable_items.append({
-                        'type': 'gettext',
-                        'msgid': key,
-                        'filename': finding[0],
-                        'line': finding[1]
-                    })
-
-    def __str__(self):
-        lines = []
-
-        sort_func = lambda i: [i.get(v, None) for v in (
-            'filename', 'line', 'msgid', 'msgid_plural', 'translator_comment')]
-
-        # Now output translatable_items sorted by filename, line number, type. But
-        # each msg_id must only be outputted exactly once.
-        all_translatable_items = []
-        for msgid in self.translatable_items:
-            all_translatable_items.extend(self.translatable_items[msgid])
-        all_translatable_items.sort(key=sort_func)
-
-        considered_msgids = set()
-        for translatable_item in all_translatable_items:
-            if translatable_item['msgid'] in considered_msgids:
-                continue
-            considered_msgids.add(translatable_item['msgid'])
-
-            occurences = self.translatable_items[translatable_item['msgid']]
-            occurences.sort(key=sort_func)
-            for type, type_occurences in itertools.groupby(occurences, key=lambda a: a['type']):
-                emit_function = EMIT_FUNCTIONS[type]
-                emit_function(list(type_occurences), lines)
-        return head + "\n".join(lines)
-
-
-def gettext(text, filename):
-    t = Lua_GetText()
-    t.parse(text, filename)
-
-    return str(t)
-
-
-if __name__ == '__main__':
-    import sys
-    t = Lua_GetText()
-
-    for fn in sys.argv[1:]:
-        t.parse(open(fn).read(), fn)
-
-    print t