games/Dragon-and-the-Tower Changeset - d859c661a294

Changeset - d859c661a294

Parent rev.

Child rev.

[Not reviewed]

default

1 11 10

silverwing - 2 months ago 2025-01-05 19:18:04

Return English buttons if localised ones are unavailable; Use Split translations to separate files; Add unlabeled crystals to the repo;Reorganise some translations to reduce duplications

17 files changed:

TRANSLATION

computer_parts.lua

ending.lua

forest.lua

366

362

images/title/about.png

bin+new file

images/title/back.png

bin+new file

images/title/load.png

bin+new file

images/title/quit.png

bin+new file

images/title/save.png

bin+new file

images/title/settings.png

bin+new file

images/title/start.png

bin+new file

images/title/tutorial.png

bin+new file

lib/link.lua

lib/locale.lua

main3.lua

solarscale.lua

186

terminal.lua

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general) First comment

TRANSLATION

➞

Show inline comments

 En. Instructions for Translators
 Copy the language file from which you are going to translate, name it with the target language code.
 Add the language code and it's name into "locale.lua" to "lang_list" variable.
 . Curly braces ({}) are used to denote clickable text. There are two variants of usage {text} and {tag|text}, in the first case, just translate the text within the braces; in the second case, please keep the part before "|" character as is. I recommend putting articles inside the braces if they are not separated from the noun by other words. Important: If important links are removed or tags are misspelled, the game will break, so please check after translating.
 . Variables are marked by "%" character on both sides. Put them to the place accordingly to the language rules, but pay attention to the comments. Sometimes they pass text in specific case, so you may need to mind word ordering.
 . Names of objects and locations should be written as titles (follow your language rules, ex. Title Case in English) (these keys are usually named *_disp).
 . "^" character denotes line break. Usually should be kept at the same place in the translation. You may want to split lines in terminal_locale to be no longer than 63 characters.
 . Keys, ending in "disp2" are always in nominative case and are lower-case, "disp3" -- accusative case, lower-case. If an article is needed, keep it as part of the translation.
 After the translation is complete, send it to us in any reasonable way (for example, use inbox@silverwing.one email). Take note that we may not be able to properly check the translation, but we will check that the game works with it before releasing it.
 Ru. Инструкции для переводчиков
 Скопируйте файл языка, с которого вы планируете переводить игру, назовите его кодом целевого языка.
 Добавьте код и название языка в "locale.lua" в переменную "lang_list".
 . Фигурные скобки ({}) используются для обозначения активного текста. Есть два варианта их использования: {текст} и {tag|текст}, в первом случае просто переведите фрагмент текста внутри скобок; во-втором, часть до символа "|" следует оставить как есть. Артикли рекомендуется оставлять внутри скобок, если они не отделены об существительного другими словами. Важно! При отсутствии необходимых ссылок или неправильных тегах, игра может стать неработоспособной, поэтому проверяйте игру после перевода.
 . Знаками "%" выделены переменные. Вставляйте их на подходящее место с учетом правил языка, однако учтите дополнительные комментарии -- возможно вам придется построить предложение определенным образом.
 . Названия объектов и локаций следует записывать как заголовки (следуйте правилам языка, например Title Case на английском) (обычно эти ключи названы *_disp).
 . Символ ^ используется для указания переноса строки. Как правило, вам следует оставлять его на том же месте в переводе. Вам потребуется разделять строки в terminal_locale чтобы они были не длиннее 63 символов.
 . Ключи, оканчивающиеся на "disp2" всегда именительный падеж, нижний регистр, "disp3" -- винительный падеж, нижний регистр. Если со словом должен использовать артикль -- добавьте его в перевод.
 . Ключи, оканчивающиеся на "disp2" всегда именительный падеж, нижний регистр, "disp3" -- винительный падеж, нижний регистр. Если со словом должен использоваться артикль -- добавьте его в перевод.
 После завершения перевода отправьте его нам любым удобным способом (например используйте почту inbox@silverwing.one). Обратите внимание, что мы можем не иметь возможности подтвердить качество перевода, но перед выпуском, мы убедимся что игра работает с ним.

computer_parts.lua

➞

Show inline comments

@@ @@ -10,12 +10,12 @@ function motherboard(cpu, ram, slots, st @@
 		slots = slots;
 		ptype = 'motherboard';
 		part = true;
 		disp = translate(parts_locale, 'motherboard_title', {model=name});
+		disp = translate("parts_locale", 'motherboard_title', {model=name});
 		dsc = function(s)
       return '{' .. translate_now(parts_locale, 'motherboard_title', {model=name}) .. '}^'
+      return '{' .. translate_now("parts_locale", 'motherboard_title', {model=name}) .. '}^'
     end;
 		inv = translate(parts_locale, 'motherboard_inv_from_' .. src, {model=name});
 		tak = translate(parts_locale, 'motherboard_tak', {model=name});
 		inv = translate("parts_locale", 'motherboard_inv_from_' .. src, {model=name});
 		tak = translate("parts_locale", 'motherboard_tak', {model=name});
 	};
 end;
@@ @@ -40,16 +40,16 @@ function cpu(slot, speed, status, src, n @@
 		status = status;
 		name = name;
 		slot = slot;
 		disp = translate(parts_locale, 'cpu_title', {model=name});
+		disp = translate("parts_locale", 'cpu_title', {model=name});
 		speed = speed;
 		status = status;
 		ptype = 'cpu';
 		part = true;
 		dsc = function(s)
       return '{' .. translate_now(parts_locale, 'cpu_title', {model=name}) .. '}^'
+      return '{' .. translate_now("parts_locale", 'cpu_title', {model=name}) .. '}^'
     end;
 		inv = translate(parts_locale, 'cpu_inv_from_' .. src, {model=name});
 		tak = translate(parts_locale, 'cpu_tak', {model=name});
 		inv = translate("parts_locale", 'cpu_inv_from_' .. src, {model=name});
 		tak = translate("parts_locale", 'cpu_tak', {model=name});
 	};
 end;
@@ @@ -71,15 +71,15 @@ function ram(slot, size, status, dsc, na @@
 		name = name;
 		slot = slot;
 		ptype = 'ram';
 		disp = translate(parts_locale, 'ram_title', {model=name});
+		disp = translate("parts_locale", 'ram_title', {model=name});
 		status = status;
 		size = size;
 		part = true;
 		dsc = function(s)
       return '{' .. translate_now(parts_locale, 'ram_title', {model=name}) .. '}^'
+      return '{' .. translate_now("parts_locale", 'ram_title', {model=name}) .. '}^'
     end;
 		inv = translate(parts_locale, 'ram_inv_from_' .. dsc, {model=name});
 		tak = translate(parts_locale, 'ram_tak', {model=name});
 		inv = translate("parts_locale", 'ram_inv_from_' .. dsc, {model=name});
 		tak = translate("parts_locale", 'ram_tak', {model=name});
 	};
 end;
@@ @@ -123,12 +123,12 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 1;
 	disp = translate(parts_locale, 'videocard_title', {model='TVA-RX1'});
+	disp = translate("parts_locale", 'videocard_title', {model='TVA-RX1'});
   dsc = function(s)
     return '{' .. translate_now(parts_locale, 'videocard_title', {model='TVA-RX1'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'videocard_title', {model='TVA-RX1'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'videocard_inv_from_computer', {model='TVA-RX1'});
   tak = translate(parts_locale, 'videocard_tak', {model='TVA-RX1'});
 	inv = translate("parts_locale", 'videocard_inv_from_computer', {model='TVA-RX1'});
   tak = translate("parts_locale", 'videocard_tak', {model='TVA-RX1'});
+}
 obj {
@@ @@ -139,12 +139,12 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 1;
 	disp = translate(parts_locale, 'videocard_title', {model='TVA-RX2'});
+	disp = translate("parts_locale", 'videocard_title', {model='TVA-RX2'});
 	dsc = function(s)
     return '{' .. translate_now(parts_locale, 'videocard_title', {model='TVA-RX2'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'videocard_title', {model='TVA-RX2'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'videocard_inv_from_box', {model='TVA-RX2'});
 	tak = translate(parts_locale, 'videocard_tak', {model='TVA-RX2'});
 	inv = translate("parts_locale", 'videocard_inv_from_box', {model='TVA-RX2'});
 	tak = translate("parts_locale", 'videocard_tak', {model='TVA-RX2'});
+}
 obj {
@@ @@ -155,12 +155,12 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 2;
 	disp = translate(parts_locale, 'videocard_title', {model='GVA-RX2'});
+	disp = translate("parts_locale", 'videocard_title', {model='GVA-RX2'});
 	dsc = function(s)
     return '{' .. translate_now(parts_locale, 'videocard_title', {model='GVA-RX2'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'videocard_title', {model='GVA-RX2'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'videocard_inv_from_box', {model='GVA-RX2'});
 	tak = translate(parts_locale, 'videocard_tak', {model='GVA-RX2'});
 	inv = translate("parts_locale", 'videocard_inv_from_box', {model='GVA-RX2'});
 	tak = translate("parts_locale", 'videocard_tak', {model='GVA-RX2'});
+}
 obj {
@@ @@ -171,12 +171,12 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 2;
 	disp = translate(parts_locale, 'videocard_title', {model='GVA-RX4'});
+	disp = translate("parts_locale", 'videocard_title', {model='GVA-RX4'});
 	dsc = function(s)
     return '{' .. translate_now(parts_locale, 'videocard_title', {model='GVA-RX4'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'videocard_title', {model='GVA-RX4'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'videocard_inv_from_box', {model='GVA-RX4'});
 	tak = translate(parts_locale, 'videocard_tak', {model='GVA-RX4'});
 	inv = translate("parts_locale", 'videocard_inv_from_box', {model='GVA-RX4'});
 	tak = translate("parts_locale", 'videocard_tak', {model='GVA-RX4'});
+}
 obj {
@@ @@ -187,12 +187,12 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 3;
 	disp = translate(parts_locale, 'network_adapter_title', {model='FNA-100-10Mb/s'});
+	disp = translate("parts_locale", 'network_adapter_title', {model='FNA-100-10Mb/s'});
 	dsc = function(s)
     return '{' .. translate_now(parts_locale, 'network_adapter_title', {model='FNA-100-10Mb/s'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'network_adapter_title', {model='FNA-100-10Mb/s'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'network_adapter_inv_from_computer', {model='FNA-100-10Mb/s'});
   tak = translate(parts_locale, 'network_adapter_tak', {model='FNA-100-10Mb/s'});
 	inv = translate("parts_locale", 'network_adapter_inv_from_computer', {model='FNA-100-10Mb/s'});
   tak = translate("parts_locale", 'network_adapter_tak', {model='FNA-100-10Mb/s'});
+}
 obj {
@@ @@ -203,12 +203,12 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 3;
 	disp = translate(parts_locale, 'network_adapter_title', {model='FNA-200-20Mb/s'});
+	disp = translate("parts_locale", 'network_adapter_title', {model='FNA-200-20Mb/s'});
 	dsc = function(s)
     return '{' .. translate_now(parts_locale, 'network_adapter_title', {model='FNA-200-20Mb/s'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'network_adapter_title', {model='FNA-200-20Mb/s'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'network_adapter_inv_from_box', {model='FNA-200-20Mb/s'});
   tak = translate(parts_locale, 'network_adapter_tak', {model='FNA-200-20Mb/s'});
 	inv = translate("parts_locale", 'network_adapter_inv_from_box', {model='FNA-200-20Mb/s'});
   tak = translate("parts_locale", 'network_adapter_tak', {model='FNA-200-20Mb/s'});
+}
 obj {
@@ @@ -219,12 +219,12 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 3;
 	disp = translate(parts_locale, 'network_adapter_title', {model='FNA-100-10Mb/s'});
+	disp = translate("parts_locale", 'network_adapter_title', {model='FNA-100-10Mb/s'});
 	dsc = function(s)
     return '{' .. translate_now(parts_locale, 'network_adapter_title', {model='FNA-100-10Mb/s'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'network_adapter_title', {model='FNA-100-10Mb/s'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'network_adapter_inv_from_box', {model='FNA-100-10Mb/s'});
   tak = translate(parts_locale, 'network_adapter_tak', {model='FNA-100-10Mb/s'});
 	inv = translate("parts_locale", 'network_adapter_inv_from_box', {model='FNA-100-10Mb/s'});
   tak = translate("parts_locale", 'network_adapter_tak', {model='FNA-100-10Mb/s'});
+}
 obj {
@@ @@ -235,12 +235,12 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 3;
 	disp = translate(parts_locale, 'network_adapter_title', {model='FNA-50-5Mb/s'});
+	disp = translate("parts_locale", 'network_adapter_title', {model='FNA-50-5Mb/s'});
 	dsc = function(s)
     return '{' .. translate_now(parts_locale, 'network_adapter_title', {model='FNA-50-5Mb/s'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'network_adapter_title', {model='FNA-50-5Mb/s'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'network_adapter_inv_from_box', {model='FNA-50-5Mb/s'});
   tak = translate(parts_locale, 'network_adapter_tak', {model='FNA-50-5Mb/s'});
 	inv = translate("parts_locale", 'network_adapter_inv_from_box', {model='FNA-50-5Mb/s'});
   tak = translate("parts_locale", 'network_adapter_tak', {model='FNA-50-5Mb/s'});
+}
 obj {
@@ @@ -251,12 +251,12 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 4;
   disp = translate(parts_locale, 'keyboard_controller_title', {model='KBC-S'});
+  disp = translate("parts_locale", 'keyboard_controller_title', {model='KBC-S'});
   dsc = function(s)
     return '{' .. translate_now(parts_locale, 'keyboard_controller_title', {model='KBC-S'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'keyboard_controller_title', {model='KBC-S'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'keyboard_controller_inv_from_computer', {model='KBC-S'});
   tak = translate(parts_locale, 'keyboard_controller_tak', {model='KBC-S'});
 	inv = translate("parts_locale", 'keyboard_controller_inv_from_computer', {model='KBC-S'});
   tak = translate("parts_locale", 'keyboard_controller_tak', {model='KBC-S'});
+}
 obj {
@@ @@ -267,12 +267,12 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 4;
   disp = translate(parts_locale, 'keyboard_controller_title', {model='KBC-S'});
+  disp = translate("parts_locale", 'keyboard_controller_title', {model='KBC-S'});
 	dsc = function(s)
     return '{' .. translate_now(parts_locale, 'keyboard_controller_title', {model='KBC-S'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'keyboard_controller_title', {model='KBC-S'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'keyboard_controller_inv_from_box', {model='KBC-S'});
   tak = translate(parts_locale, 'keyboard_controller_tak', {model='KBC-S'});
 	inv = translate("parts_locale", 'keyboard_controller_inv_from_box', {model='KBC-S'});
   tak = translate("parts_locale", 'keyboard_controller_tak', {model='KBC-S'});
+}
 obj {
@@ @@ -283,12 +283,12 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 4;
   disp = translate(parts_locale, 'keyboard_controller_title', {model='KBC-R'});
+  disp = translate("parts_locale", 'keyboard_controller_title', {model='KBC-R'});
 	dsc = function(s)
     return '{' .. translate_now(parts_locale, 'keyboard_controller_title', {model='KBC-R'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'keyboard_controller_title', {model='KBC-R'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'keyboard_controller_inv_from_box', {model='KBC-R'});
   tak = translate(parts_locale, 'keyboard_controller_tak', {model='KBC-R'});
 	inv = translate("parts_locale", 'keyboard_controller_inv_from_box', {model='KBC-R'});
   tak = translate("parts_locale", 'keyboard_controller_tak', {model='KBC-R'});
+}
 obj {
@@ @@ -299,10 +299,10 @@ obj { @@
 	slot = 'ISB';
 	part = true;
   visual = 4;
   disp = translate(parts_locale, 'keyboard_controller_title', {model='KBC-P'});
+  disp = translate("parts_locale", 'keyboard_controller_title', {model='KBC-P'});
 	dsc = function(s)
     return '{' .. translate_now(parts_locale, 'keyboard_controller_title', {model='KBC-P'}) .. '}^';
+    return '{' .. translate_now("parts_locale", 'keyboard_controller_title', {model='KBC-P'}) .. '}^';
   end;
 	inv = translate(parts_locale, 'keyboard_controller_inv_from_box', {model='KBC-P'});
   tak = translate(parts_locale, 'keyboard_controller_tak', {model='KBC-P'});
 	inv = translate("parts_locale", 'keyboard_controller_inv_from_box', {model='KBC-P'});
   tak = translate("parts_locale", 'keyboard_controller_tak', {model='KBC-P'});
+}

ending.lua

➞

Show inline comments

@@ @@ -121,7 +121,7 @@ function ending_room(s) @@
   s.noautosave = true;
   s.notitle = true;
   if not s.disp then
     s.disp = translate(ending_locale, 'game_end');
+    s.disp = translate("ending_locale", 'game_end');
   end;
   return room(s);
@@ @@ -135,7 +135,7 @@ room { @@
 	nam = 'ending_left';
 	nofollow = true;
 	theme = 'ending_outside';
 	disp = translate(ending_locale, 'game_end');
+	disp = translate("ending_locale", 'game_end');
 	noinv = true;
 	notitle = true;
   nosave = true;
@@ @@ -183,13 +183,13 @@ room { @@
 	onenter = function(s)
 		s.state = s.state + 1;
 		if s.state == 1 then
 			p(translate_now(ending_locale, 'left_state_1'));
+			p(translate_now("ending_locale", 'left_state_1'));
 			return false;
 		elseif s.state == 2 then
 			p(translate_now(ending_locale, 'left_state_2'));
+			p(translate_now("ending_locale", 'left_state_2'));
 			return false;
 		elseif s.state == 3 then
 			p(translate_now(ending_locale, 'left_state_3'));
+			p(translate_now("ending_locale", 'left_state_3'));
 			return false;
 		end;
@@ @@ -205,13 +205,13 @@ room { @@
     fading.enabled = false;
   end;
 	dsc = function(s)
 		p(translate_now(ending_locale, 'left_part_1'));
+		p(translate_now("ending_locale", 'left_part_1'));
 		if solarscale_with_me then
 			p(translate_now(ending_locale, 'left_part_1_solarscale'));
+			p(translate_now("ending_locale", 'left_part_1_solarscale'));
 		end;
 	end;
   way = {
 		path {translate(common_locale, 'continue'), 'ending_left_2'};
+		path {translate("common_locale", 'continue'), 'ending_left_2'};
 	};
+}
@@ @@ -227,7 +227,7 @@ room { @@
       return 'ending_outside';
     end;
   end;
 	disp = translate(ending_locale, 'game_end');
+	disp = translate("ending_locale", 'game_end');
 	noinv = true;
 	notitle = true;
   themeInit = function(s)
@@ @@ -240,16 +240,16 @@ room { @@
     animation_set(false);
 	end;
 	dsc = function(s)
 		pn(translate_now(ending_locale, 'left_part_2'));
+		pn(translate_now("ending_locale", 'left_part_2'));
 		if solarscale_with_me then
 			pn(translate_now(ending_locale, 'solarscale_lost'));
+			pn(translate_now("ending_locale", 'solarscale_lost'));
 		end;
     if irradiated then
       p(translate_now(ending_locale, 'irradiated'));
+      p(translate_now("ending_locale", 'irradiated'));
     end;
 	end;
   way = {
     path {translate(common_locale, 'continue'), function(s)
+    path {translate("common_locale", 'continue'), function(s)
         if irradiated then
           _'ending_credits'.etype = 'leftbw';
         else
@@ @@ -266,7 +266,7 @@ 2. Destroying the tower @@
 room {
 	nam = 'ending_formatted';
 	disp = translate(ending_locale, 'game_end');
+	disp = translate("ending_locale", 'game_end');
 	theme = 'ending_outside';
 	nofollow = true;
 	noinv = true;
@@ @@ -290,13 +290,13 @@ room { @@
   end;
 	dsc = function(s)
 		if solarscale_with_me then
 			p(translate_now(ending_locale, 'formatted_solarscale'));
+			p(translate_now("ending_locale", 'formatted_solarscale'));
 		else
 			p(translate_now(ending_locale, 'formatted_alone'));
+			p(translate_now("ending_locale", 'formatted_alone'));
 		end;
 	end;
   way = {
 		path {translate(common_locale, 'continue'), 'ending_formatted_2'};
+		path {translate("common_locale", 'continue'), 'ending_formatted_2'};
 	};
+}
@@ @@ -312,7 +312,7 @@ room { @@
   end;
   nosave = true;
   noautosave = true;
 	disp = translate(ending_locale, 'game_end');
+	disp = translate("ending_locale", 'game_end');
 	noinv = true;
 	notitle = true;
   themeInit = function(s)
@@ @@ -323,16 +323,16 @@ room { @@
     end;
 	end;
 	dsc = function(s)
 		pn(translate_now(ending_locale, 'formatted_2'));
+		pn(translate_now("ending_locale", 'formatted_2'));
 		if solarscale_with_me then
 			pn(translate_now(ending_locale, 'solarscale_lost'));
+			pn(translate_now("ending_locale", 'solarscale_lost'));
 		end;
     if irradiated then
       p(translate_now(ending_locale, 'irradiated'));
+      p(translate_now("ending_locale", 'irradiated'));
     end;
 	end;
   way = {
     path {translate(common_locale, 'continue'), function(s)
+    path {translate("common_locale", 'continue'), function(s)
         if irradiated then
           _'ending_credits'.etype = 'formatbw';
         else
@@ @@ -352,7 +352,7 @@ 3. True ending stage 1 @@
 ending_room {
   nam = 'ending_dissolving_tower_solarscale';
   theme = 'ending_outside';
   dsc = translate(ending_locale, 'ending_dissolving_tower_solarscale');
+  dsc = translate("ending_locale", 'ending_dissolving_tower_solarscale');
   onenter = function(s)
     enableSmoke('images/endings/crater_edge/tower_solarscale.png', 1);
   end;
@@ @@ -390,22 +390,22 @@ ending_room { @@
     fading.enabled = false;
   end;
   way = {
 		path {translate(common_locale, 'continue'), 'ending_solarscale_flies_away'};
+		path {translate("common_locale", 'continue'), 'ending_solarscale_flies_away'};
 	};
+}
 room {
 	nam = 'ending_solarscale_pre';
 	theme = 'tower';
 	disp = translate(tower_locale, 'tower_level_4_room_2_disp');
+	disp = translate("tower_locale", 'tower_level_4_room_2_disp');
   nofollow = true;
 	noinv = true;
   nosave = true;
   noautosave = true;
   pic = 'images/tower_level_4_room_2_light.png';
   dsc = translate(ending_locale, 'ending_solarscale_pre');
+  dsc = translate("ending_locale", 'ending_solarscale_pre');
 	way = {
 		path {translate(common_locale, 'continue'), 'ending_solarscale_dlg'};
+		path {translate("common_locale", 'continue'), 'ending_solarscale_dlg'};
 	};
+}
@@ @@ -414,11 +414,11 @@ local solarscale_convince = function(s) @@
   if _'ending_solarscale_dlg'.weight >= 5 then
     walk('ending_solarscale_stays');
   elseif _'ending_solarscale_dlg'.weight >= 3 then
     return translate_now(ending_locale, "true_solarscale_convince_level_3");
+    return translate_now("ending_locale", "true_solarscale_convince_level_3");
   elseif _'ending_solarscale_dlg'.weight >= 2 then
     return translate_now(ending_locale, "true_solarscale_convince_level_2");
+    return translate_now("ending_locale", "true_solarscale_convince_level_2");
   elseif _'ending_solarscale_dlg'.weight == 1 then
     return translate_now(ending_locale, "true_solarscale_convince_level_1");
+    return translate_now("ending_locale", "true_solarscale_convince_level_1");
   end;
 end;
@@ @@ -428,32 +428,32 @@ dlg { @@
 	nofollow = true;
 	theme = 'tower';
 	noinv = true;
 	disp = translate(solarscale_locale, 'disp');
+	disp = translate("solarscale_locale", 'disp');
   nosave = true;
   noautosave = true;
   pic = 'images/tower_level_4_room_2_light.png;images/characters/solarscale_tower_dusk.png';
 	enter = translate(ending_locale, 'true_solarscale_dlg_enter');
+	enter = translate("ending_locale", 'true_solarscale_dlg_enter');
 	phr = {
 		{translate(ending_locale, "true_solarscale_dlg_1"), function(s)
+		{translate("ending_locale", "true_solarscale_dlg_1"), function(s)
 			walk('ending_solarscale_leaving_hold');
 		end};
 		{translate(ending_locale, "true_solarscale_dlg_2"), translate(ending_locale, "true_solarscale_dlg_2_response"), next='#convince'};
 		{translate(ending_locale, "true_solarscale_dlg_end"), function(s)
 		{translate("ending_locale", "true_solarscale_dlg_2"), translate("ending_locale", "true_solarscale_dlg_2_response"), next='#convince'};
 		{translate("ending_locale", "true_solarscale_dlg_end"), function(s)
 			walk('ending_solarscale_leaving_farewell');
 		end};
     {false, '#convince',
       {translate(ending_locale, "true_solarscale_dlg_1"), function(s)
+      {translate("ending_locale", "true_solarscale_dlg_1"), function(s)
         walk('ending_solarscale_leaving_hold');
       end};
       {cond=function(s) return _'ending_solarscale_dlg'.weight > 0 end; translate(ending_locale, "true_solarscale_dlg_end"), function(s)
+      {cond=function(s) return _'ending_solarscale_dlg'.weight > 0 end; translate("ending_locale", "true_solarscale_dlg_end"), function(s)
         walk('ending_solarscale_leaving_farewell')
       end};
       {translate(ending_locale, "true_solarscale_dlg_3"), solarscale_convince},
       {cond=function(s) return _'solarscale_ally'.after_discussed end; translate(ending_locale, "true_solarscale_dlg_4"), solarscale_convince},
       {cond=function(s) return had_tea and tea_answer_1 == 1 and tea_answer_2 == 1 and tea_answer_3 == 1 end; translate(ending_locale, "true_solarscale_dlg_5"), solarscale_convince},
       {cond=function(s) return solarscale_tower end; translate(ending_locale, "true_solarscale_dlg_6"), solarscale_convince},
       {cond=function(s) return solarscale_helps < 2 end; translate(ending_locale, "true_solarscale_dlg_7"), solarscale_convince};
       {cond=function(s) return solarscale_glade_visited end; translate(ending_locale, "true_solarscale_dlg_8"), solarscale_convince};
       {translate("ending_locale", "true_solarscale_dlg_3"), solarscale_convince},
       {cond=function(s) return _'solarscale_ally'.after_discussed end; translate("ending_locale", "true_solarscale_dlg_4"), solarscale_convince},
       {cond=function(s) return had_tea and tea_answer_1 == 1 and tea_answer_2 == 1 and tea_answer_3 == 1 end; translate("ending_locale", "true_solarscale_dlg_5"), solarscale_convince},
       {cond=function(s) return solarscale_tower end; translate("ending_locale", "true_solarscale_dlg_6"), solarscale_convince},
       {cond=function(s) return solarscale_helps < 2 end; translate("ending_locale", "true_solarscale_dlg_7"), solarscale_convince};
       {cond=function(s) return solarscale_glade_visited end; translate("ending_locale", "true_solarscale_dlg_8"), solarscale_convince};
     };
 	};
+}
@@ @@ -465,11 +465,11 @@ room { @@
   nosave = true;
   noautosave = true;
   noinv = true;
   disp = translate(solarscale_locale, 'disp');
+  disp = translate("solarscale_locale", 'disp');
   pic = 'images/tower_level_4_room_2_light.png;images/characters/solarscale_tower_dusk.png';
   decor = translate(ending_locale, "true_solarscale_convince_level_4");
+  decor = translate("ending_locale", "true_solarscale_convince_level_4");
   way = {
 		path {translate(common_locale, 'continue'), 'ending_solarscale_stays_part_2'};
+		path {translate("common_locale", 'continue'), 'ending_solarscale_stays_part_2'};
 	};
 };
@@ @@ -479,10 +479,10 @@ room { @@
 	nofollow = true;
 	theme = 'ending_outside';
 	noinv = true;
 	disp = translate(ending_locale, 'game_end');
+	disp = translate("ending_locale", 'game_end');
   nosave = true;
   noautosave = true;
 	dsc = translate(ending_locale, 'true_solarscale_stays');
+	dsc = translate("ending_locale", 'true_solarscale_stays');
   onenter = function(s)
     solarscale_stays = true;
     enableSmoke('images/endings/crater_edge/crater_edge.png', 1);
@@ @@ -522,7 +522,7 @@ room { @@
     fading.enabled = false;
   end;
 	way = {
 		path {translate(common_locale, 'continue'), 'ending_welcome'};
+		path {translate("common_locale", 'continue'), 'ending_welcome'};
 	};
 };
@@ @@ -533,11 +533,11 @@ room { @@
   nosave = true;
   noautosave = true;
   noinv = true;
   disp = translate(tower_locale, 'tower_level_4_room_2_disp');
+  disp = translate("tower_locale", 'tower_level_4_room_2_disp');
   pic = 'images/tower_level_4_room_2_light.png';
   decor =  translate(ending_locale, "true_solarscale_dlg_end_response");
+  decor =  translate("ending_locale", "true_solarscale_dlg_end_response");
   way = {
 		path {translate(common_locale, 'continue'), 'ending_solarscale_leaving_part_2'};
+		path {translate("common_locale", 'continue'), 'ending_solarscale_leaving_part_2'};
 	};
 };
@@ @@ -549,10 +549,10 @@ room { @@
   noautosave = true;
   noinv = true;
   pic = 'images/tower_level_4_room_2_light.png';
   disp = translate(tower_locale, 'tower_level_4_room_2_disp');
   decor =  translate(ending_locale, "true_solarscale_dlg_1_response");
   disp = translate("tower_locale", 'tower_level_4_room_2_disp');
   decor =  translate("ending_locale", "true_solarscale_dlg_1_response");
   way = {
 		path {translate(common_locale, 'continue'), 'ending_solarscale_leaving_part_2'};
+		path {translate("common_locale", 'continue'), 'ending_solarscale_leaving_part_2'};
 	};
 };
@@ @@ -561,7 +561,7 @@ room { @@
 	notitle = true;
 	nofollow = true;
 	noinv = true;
 	disp = translate(ending_locale, 'game_end');
+	disp = translate("ending_locale", 'game_end');
   theme = 'ending_outside';
   nosave = true;
   noautosave = true;
@@ @@ -640,9 +640,9 @@ room { @@
     fading.enabled = false;
   end;
   pic = 'images/tower_level_4_room_2_light.png';
   decor = translate(ending_locale, 'true_solarscale_leaving');
+  decor = translate("ending_locale", 'true_solarscale_leaving');
 	way = {
 		path {translate(common_locale, 'continue'), 'ending_dissolving_tower_solarscale_alt'};
+		path {translate("common_locale", 'continue'), 'ending_dissolving_tower_solarscale_alt'};
 	};
+}
@@ @@ -655,7 +655,7 @@ room { @@
   notitle = true;
   nosave = true;
   noautosave = true;
   disp = translate(ending_locale, 'game_end');
+  disp = translate("ending_locale", 'game_end');
   themeInit = function(s)
     local scale = diretheme.get_scale();
     local width, height = diretheme.get_scaled_screen();
@@ @@ -686,9 +686,9 @@ room { @@
     }, true);
     timer:set(25);
 	end;
   dsc = translate(ending_locale, 'ending_dissolving_tower_solarscale_alt');
+  dsc = translate("ending_locale", 'ending_dissolving_tower_solarscale_alt');
   way = {
 		path {translate(common_locale, 'continue'), 'ending_solarscale_flies_away'};
+		path {translate("common_locale", 'continue'), 'ending_solarscale_flies_away'};
 	};
 };
@@ @@ -701,7 +701,7 @@ room { @@
   notitle = true;
   nosave = true;
   noautosave = true;
   disp = translate(ending_locale, 'game_end');
+  disp = translate("ending_locale", 'game_end');
   themeInit = function(s)
     local scale = diretheme.get_scale();
     local width, height = diretheme.get_scaled_screen();
@@ @@ -772,9 +772,9 @@ room { @@
         };
     }, true);
 	end;
   dsc = translate(ending_locale, 'true_solarscale_outside_part_2');
+  dsc = translate("ending_locale", 'true_solarscale_outside_part_2');
   way = {
 		path {translate(common_locale, 'continue'), 'ending_welcome'};
+		path {translate("common_locale", 'continue'), 'ending_welcome'};
 	};
+}
@@ @@ -870,9 +870,9 @@ ending_room { @@
     spr = nil;  -- remove reference
     timer:set(25);
 	end;
   dsc = translate(ending_locale, 'ending_welcome');
+  dsc = translate("ending_locale", 'ending_welcome');
   way = {
 		path {translate(common_locale, 'continue'), function(s)
+		path {translate("common_locale", 'continue'), function(s)
         if solarscale_stays then
           return 'ending_solarscale_flight';
         else
@@ @@ -1003,9 +1003,9 @@ ending_room { @@
     });
     timer:set(25);
   end;
   dsc = translate(ending_locale, 'ending_solarscale_flight');
+  dsc = translate("ending_locale", 'ending_solarscale_flight');
   way = {
 		path {translate(common_locale, 'continue'), 'ending_space_1'};
+		path {translate("common_locale", 'continue'), 'ending_space_1'};
 	};
+}
@@ @@ -1022,15 +1022,15 @@ ending_room { @@
 	end;
   dsc = function(s)
 		if solarscale_stays then
 			pr(translate_now(ending_locale, 'true_step_1_solarscale'));
+			pr(translate_now("ending_locale", 'true_step_1_solarscale'));
     else
       pr(translate_now(ending_locale, 'true_step_1_alone'));
+      pr(translate_now("ending_locale", 'true_step_1_alone'));
 		end;
     pn();
     pr(translate_now(ending_locale, 'true_step_1'));
+    pr(translate_now("ending_locale", 'true_step_1'));
 	end;
   way = {
 		path {translate(common_locale, 'continue'), function(s)
+		path {translate("common_locale", 'continue'), function(s)
       if irradiated then
         return 'ending_space_2_irradiated';
       else
@@ @@ -1042,7 +1042,7 @@ ending_room { @@
 room {
 	nam = 'ending_space_2';
 	disp = translate(ending_locale, 'game_end');
+	disp = translate("ending_locale", 'game_end');
 	noinv = true;
 	notitle = true;
 	nofollow = true;
@@ @@ -1059,13 +1059,13 @@ room { @@
 	end;
 	dsc = function(s)
     if solarscale_stays then
       return translate_now(ending_locale, 'true_step_2_solarscale');
+      return translate_now("ending_locale", 'true_step_2_solarscale');
     else
       return translate_now(ending_locale, 'true_step_2_alone');
+      return translate_now("ending_locale", 'true_step_2_alone');
     end;
   end;
   way = {
     path {translate(common_locale, 'continue'), function(s)
+    path {translate("common_locale", 'continue'), function(s)
         if solarscale_stays then
           _'ending_credits'.etype = 'main_solarscale';
         else
@@ @@ -1078,7 +1078,7 @@ room { @@
 room {
 	nam = 'ending_space_2_irradiated';
 	disp = translate(ending_locale, 'game_end');
+	disp = translate("ending_locale", 'game_end');
 	noinv = true;
 	notitle = true;
 	nofollow = true;
@@ @@ -1088,9 +1088,9 @@ room { @@
   themeInit = function(s)
 		show_ending('bwt', 'images/endings/space_bw.png');
 	end;
 	dsc = translate(ending_locale, 'true_step_2_irradiated');
+	dsc = translate("ending_locale", 'true_step_2_irradiated');
   way = {
     path {translate(common_locale, 'continue'), function(s)
+    path {translate("common_locale", 'continue'), function(s)
         _'ending_credits'.etype = 'bwm';
         return 'ending_credits';
     end};
@@ @@ -1099,7 +1099,7 @@ room { @@
 room {
 	nam = 'ending_credits';
 	disp = translate(ending_locale, 'thank_you_for_playing');
+	disp = translate("ending_locale", 'thank_you_for_playing');
 	noinv = true;
 	nofollow = true;
   nosave = true;
@@ @@ -1147,17 +1147,17 @@ room { @@
     fmt.para = true;
   end;
 	decor = function(s)
 		return translate_now(menu_locale, 'credits_author') .. ': Khaelenmore Thaal^' ..
 			translate_now(menu_locale, 'credits_art') .. ': Sabra Naikomy^' ..
 			translate_now(menu_locale, 'credits_music') .. ': Khaelenmore Thaal^' ..
 			translate_now(menu_locale, 'credits_engine') .. ': INSTEAD ' .. translate_now(menu_locale, 'credits_engine_author') .. ' {$link https://github.com/instead-hub/instead/}^' ..
 			translate_now(menu_locale, 'credits_sounds') .. ': {$link https://freesound.org/} CC-0^' ..
 			translate_now(menu_locale, 'credits_fonts') .. ': VileR {$link https://int10h.org/oldschool-pc-fonts/} CC-BY-SA 4.0^^' ..
       translate_now(menu_locale, 'credits_closed_beta') .. ': ' .. closed_beta_participants.. '^^'..
 			translate_now(menu_locale, 'credits_thanks');
 		return translate_now("menu_locale", 'credits_author') .. ': Khaelenmore Thaal^' ..
 			translate_now("menu_locale", 'credits_art') .. ': Sabra Naikomy^' ..
 			translate_now("menu_locale", 'credits_music') .. ': Khaelenmore Thaal^' ..
 			translate_now("menu_locale", 'credits_engine') .. ': INSTEAD ' .. translate_now("menu_locale", 'credits_engine_author') .. ' {$link https://github.com/instead-hub/instead/}^' ..
 			translate_now("menu_locale", 'credits_sounds') .. ': {$link https://freesound.org/} CC-0^' ..
 			translate_now("menu_locale", 'credits_fonts') .. ': VileR {$link https://int10h.org/oldschool-pc-fonts/} CC-BY-SA 4.0^^' ..
       translate_now("menu_locale", 'credits_closed_beta') .. ': ' .. closed_beta_participants.. '^^'..
 			translate_now("menu_locale", 'credits_thanks');
 	end;
   way = {
     path {translate(ending_locale, 'show_menu'), 'reset'};
+    path {translate("ending_locale", 'show_menu'), 'reset'};
   };
+}

forest.lua

➞

Show inline comments

@@ @@ -37,38 +37,38 @@ global { @@
 obj {
 	nam = 'raspberry_pie';
 	disp = translate(forest_locale, 'raspberry_pie');
 	inv = translate(forest_locale, 'raspberry_pie_inv');
 	disp = translate("forest_locale", 'raspberry_pie');
 	inv = translate("forest_locale", 'raspberry_pie_inv');
+}
 obj {
 	nam = 'flower';
 	disp =translate(forest_locale, 'flower');
 	inv = translate(forest_locale, 'flower_inv');
 	disp =translate("forest_locale", 'flower');
 	inv = translate("forest_locale", 'flower_inv');
+}
 obj {
 	nam = 'lock';
 	disp = translate(forest_locale, 'lock');
 	disp2 = translate(forest_locale, 'lock_disp2');
 	disp3 = translate(forest_locale, 'lock_disp3');
 	inv = translate(forest_locale, 'lock_inv');
 	disp = translate("forest_locale", 'lock');
 	disp2 = translate("forest_locale", 'lock_disp2');
 	disp3 = translate("forest_locale", 'lock_disp3');
 	inv = translate("forest_locale", 'lock_inv');
+}
 obj {
   nam = 'old_map';
   disp = translate(forest_locale, 'old_map_disp');
   disp2 = translate(forest_locale, 'old_map_disp2');
   disp3 = translate(forest_locale, 'old_map_disp3');
   disp = translate("forest_locale", 'old_map_disp');
   disp2 = translate("forest_locale", 'old_map_disp2');
   disp3 = translate("forest_locale", 'old_map_disp3');
   inv = function(s)
     p(translate_now("forest_locale", 'old_map_inv'););
     if village_visited then
       p(translate_now("forest_locale", 'old_map_inv_visited'));
       if _('fly_west_from_village'):disabled() then
         return translate_now(forest_locale, 'old_map_inv_visited');
       else
         return translate_now(forest_locale, 'old_map_inv_visited_2');
         p(translate_now("forest_locale", 'old_map_inv_visited_village'));
       end;
     else
-      return translate_now(forest_locale, 'old_map_inv_not_visited');
+      p(translate_now("forest_locale", 'old_map_inv_not_visited'));
     end;
   end;
+}
@@ @@ -76,12 +76,12 @@ obj { @@
 room {
 	nam = 'above_forest';
 	pic = 'images/above_forest.png';
 	disp = translate(forest_locale, 'above_forest');
+	disp = translate("forest_locale", 'above_forest');
 	theme = 'main';
 	decor = function(s)
 		p(translate_now(forest_locale, 'above_forest_decor'));
+		p(translate_now("forest_locale", 'above_forest_decor'));
 		if not village_visited then
 			p(translate_now(forest_locale, 'above_forest_decor_village'));
+			p(translate_now("forest_locale", 'above_forest_decor_village'));
 		end;
 	end;
 	enter = function(s)
@@ @@ -92,40 +92,40 @@ room { @@
 			stop_menu();
 		end;
 		if here():from()^'forest_glade' then
 			pr(translate_now(forest_locale, 'above_forest_enter'));
+			pr(translate_now("forest_locale", 'above_forest_enter'));
 		end;
 		snd.music('sound/bgm_forest.ogg');
 	end;
 	way = {
 		 path {"#down", translate(forest_locale, 'transition_land'), 'forest_glade'}:disable();
 		 path {"#north", translate(forest_locale, 'transition_north_along_road'), 'above_near_village'};
 		 path {"#down", translate("forest_locale", 'transition_land'), 'forest_glade'}:disable();
 		 path {"#north", translate("forest_locale", 'transition_north_along_road'), 'above_near_village'};
+	}
 }:with {
 	obj {
 		nam = '#thicket';
 		act = translate(forest_locale, 'above_forest_thicket_act');
+		act = translate("forest_locale", 'above_forest_thicket_act');
 	};
 	obj {
 		nam = '#road';
 		act = function(s)
 			pr(translate_now(forest_locale, 'above_forest_road_act'));
+			pr(translate_now("forest_locale", 'above_forest_road_act'));
 			if not village_visited then
 				pr(translate_now(forest_locale, 'above_forest_road_act_village'));
+				pr(translate_now("forest_locale", 'above_forest_road_act_village'));
 			end;
 		end;
 	};
 	obj {
 		nam = '#powerlines';
 		act = translate(forest_locale, 'above_forest_powerlines_act');
+		act = translate("forest_locale", 'above_forest_powerlines_act');
 	};
 	obj {
 		nam = '#glade';
 		act = function(s)
 			pr(translate_now(forest_locale, 'above_forest_glade_act'));
+			pr(translate_now("forest_locale", 'above_forest_glade_act'));
 			if _'#down':disabled() then
 				_'#down':enable();
 				pr(translate_now(forest_locale, 'above_forest_glade_act_first'));
+				pr(translate_now("forest_locale", 'above_forest_glade_act_first'));
 			end;
 		end;
 	};
@@ @@ -144,27 +144,27 @@ room { @@
 			return 'images/forest_glade.png;images/forest_glade_flower.png@269,201';
 		end;
 	end;
 	disp = translate(forest_locale, 'forest_glade');
+	disp = translate("forest_locale", 'forest_glade');
 	theme = 'main';
 	onenter = translate(forest_locale, 'forest_glade_enter');
 	decor = translate(forest_locale, 'forest_glade_decor');
 	onenter = translate("forest_locale", 'forest_glade_enter');
 	decor = translate("forest_locale", 'forest_glade_decor');
 	way = {
 		path {'#up', translate(forest_locale, 'transition_fly'), 'above_forest'};
+		path {'#up', translate("forest_locale", 'transition_fly'), 'above_forest'};
+	}
 }: with {
 	obj {
 		nam = '#thicket';
 		act = translate(forest_locale, 'forest_glade_thicket');
+		act = translate("forest_locale", 'forest_glade_thicket');
 	};
 	obj {
 		nam = '#birds';
 		act = translate(forest_locale, 'forest_glade_birds');
+		act = translate("forest_locale", 'forest_glade_birds');
 	};
 	obj {
 		nam = '#grass';
 		act = function(s)
 			_'#flowers':enable();
 			return translate_now(forest_locale, 'forest_glade_grass');
+			return translate_now("forest_locale", 'forest_glade_grass');
 		end;
 	};
 	obj {
@@ @@ -174,9 +174,9 @@ room { @@
 			if s.state == 0 then
 				take('flower');
 				s.state = 1;
 				return translate_now(forest_locale, 'forest_glade_flowers_first');
+				return translate_now("forest_locale", 'forest_glade_flowers_first');
 			else
 				return translate_now(forest_locale, 'forest_glade_flowers');
+				return translate_now("forest_locale", 'forest_glade_flowers');
 			end;
 		end;
 	}:disable();
@@ @@ -184,36 +184,36 @@ room { @@
 room {
 	nam = 'above_near_village';
-	disp = translate(forest_locale, 'above_near_village');
+	disp = translate("forest_locale", 'near_village');
 	pic = 'images/above_near_village.png';
 	theme = 'main';
 	onenter = function(s)
 		if here()^'near_village' then
 			return translate_now(forest_locale, 'above_near_village_enter');
+			return translate_now("forest_locale", 'above_near_village_enter');
 		end;
 	end;
 	decor = translate(forest_locale, 'above_near_village_decor');
+	decor = translate("forest_locale", 'above_near_village_decor');
 	way = {
 		path {"#south", translate(forest_locale, 'transition_south_along_road'), 'above_forest'};
 		path {"#down", translate(forest_locale, 'transition_land'), 'near_village'};
 		path {"#north", translate(forest_locale, 'transition_north_to_the_village'), 'above_village'};
 		path {"#south", translate("forest_locale", 'transition_south_along_road'), 'above_forest'};
 		path {"#down", translate("forest_locale", 'transition_land'), 'near_village'};
 		path {"#north", translate("forest_locale", 'transition_north_to_the_village'), 'above_village'};
+	}
 }: with {
 	obj {
 		nam = '#road';
 		act = translate(forest_locale, 'above_near_village_road');
+		act = translate("forest_locale", 'above_near_village_road');
 	};
 	obj {
 		nam = '#thicket';
 		act = translate(forest_locale, 'above_near_village_thicket');
+		act = translate("forest_locale", 'above_near_village_thicket');
 	};
 	obj {
 		nam = '#village';
 		act = function(s)
 			pr(translate_now(forest_locale, 'above_near_village_village'));
+			pr(translate_now("forest_locale", 'above_near_village_village'));
 			if not village_visited then
 				village_visited = true;
 				pr(translate_now(forest_locale, 'village_unvisited'));
+				pr(translate_now("forest_locale", 'village_unvisited'));
 			end;
 		end;
 	};
@@ @@ -226,30 +226,30 @@ room { @@
 room {
 	nam = 'above_village';
 	pic = 'images/above_village.png';
 	disp = translate(forest_locale, 'above_village');
+	disp = translate("forest_locale", 'above_village');
 	theme = 'main';
 	decor = translate(forest_locale, 'above_village_decor');
+	decor = translate("forest_locale", 'above_village_decor');
 	way = {
 		path {"#south", translate(forest_locale, 'transition_south_along_road'), 'above_near_village'};
 		path {"#down", translate(forest_locale, 'transition_land'), 'village_no_way'};
 		path {"fly_west_from_village", translate(forest_locale, 'transition_west'), 'above_west'}:disable();
 		path {"#south", translate("forest_locale", 'transition_south_along_road'), 'above_near_village'};
 		path {"#down", translate("forest_locale", 'transition_land'), 'village_no_way'};
 		path {"fly_west_from_village", translate("forest_locale", 'transition_west'), 'above_west'}:disable();
+	}
 }: with {
 	obj {
 		nam = '#thicket';
 		act = translate(forest_locale, 'above_village_thicket');
+		act = translate("forest_locale", 'above_village_thicket');
 	};
 	obj {
 		nam = '#road';
 		act = translate(forest_locale, 'above_village_road');
+		act = translate("forest_locale", 'above_village_road');
 	};
 	obj {
 		nam = '#village';
 		act = function(s)
 			pr(translate_now(forest_locale, 'above_village_village'));
+			pr(translate_now("forest_locale", 'above_village_village'));
 			if not village_visited then
 				village_visited = true;
 				pr(translate_now(forest_locale, 'village_unvisited'));
+				pr(translate_now("forest_locale", 'village_unvisited'));
 			end;
 		end;
 	};
@@ @@ -261,61 +261,61 @@ room { @@
 obj {
 	nam = 'sun';
 	act = translate(forest_locale, 'sun');
+	act = translate("forest_locale", 'sun');
 };
 obj {
 	nam = 'sun_transformed';
 	act = translate(forest_locale, 'sun_transformed');
+	act = translate("forest_locale", 'sun_transformed');
 };
 obj {
 	nam = 'clouds';
 	act = translate(forest_locale, 'clouds');
+	act = translate("forest_locale", 'clouds');
 };
 obj {
 	nam = 'wind';
 	act = translate(forest_locale, 'wind');
+	act = translate("forest_locale", 'wind');
 };
 obj {
 	nam = 'mountains';
 	act = translate(forest_locale, 'mountains');
+	act = translate("forest_locale", 'mountains');
 };
 room {
 	nam = 'above_west';
 	disp = translate(forest_locale, 'above_west');
+	disp = translate("forest_locale", 'above_west');
 	pic = 'images/above_west.png';
 	theme = 'main';
 	decor = translate(forest_locale, 'above_west_decor');
+	decor = translate("forest_locale", 'above_west_decor');
 	way = {
 		path {"#east", translate(forest_locale, 'transition_east_to_the_village'), 'above_village'};
 		path {"#west", translate(forest_locale, 'transition_west_to_the_crater'), 'above_crater'}:disable();
 		path {"#east", translate("forest_locale", 'transition_east_to_the_village'), 'above_village'};
 		path {"#west", translate("forest_locale", 'transition_west_to_the_crater'), 'above_crater'}:disable();
+	}
 }: with {
 	obj {
 		nam = '#village';
 		act = translate(forest_locale, 'above_west_village');
+		act = translate("forest_locale", 'above_west_village');
 	};
 	obj {
 		nam = '#mountains';
 		act = translate(forest_locale, 'above_west_mountains');
+		act = translate("forest_locale", 'above_west_mountains');
 	};
 	obj {
 		nam = '#mountaintops';
 		act = translate(forest_locale, 'above_west_mountaintops');
+		act = translate("forest_locale", 'above_west_mountaintops');
 	};
 	obj {
 		nam = '#mountainslopes';
 		act = translate(forest_locale, 'above_west_mountainslopes');
+		act = translate("forest_locale", 'above_west_mountainslopes');
 	};
 	obj {
 		nam = '#crater';
 		act = function(s)
 			_'#west':enable();
 			return translate_now(forest_locale, 'above_west_crater');
+			return translate_now("forest_locale", 'above_west_crater');
 		end;
 	};
 	'clouds';
@@ @@ -328,33 +328,33 @@ room { @@
 	theme = 'main';
 	onenter = function(s)
 		if here()^'inside_crater_glade' then
 			p(translate_now(forest_locale, 'above_crater_enter'));
+			p(translate_now("forest_locale", 'above_crater_enter'));
 		end;
 	end;
 	disp = translate(forest_locale, 'above_crater');
 	decor = translate(forest_locale, 'above_crater_decor');
 	disp = translate("forest_locale", 'above_crater');
 	decor = translate("forest_locale", 'above_crater_decor');
 	way = {
 		path {"#east", translate(forest_locale, 'transition_east'), 'above_west'};
 		path {"#down", translate(forest_locale, 'transition_land'), 'inside_crater_glade'}:disable();
 		path {"#east", translate("forest_locale", 'transition_east'), 'above_west'};
 		path {"#down", translate("forest_locale", 'transition_land'), 'inside_crater_glade'}:disable();
+	}
 }: with {
 	obj {
 		nam = '#crater';
 		act = translate(forest_locale, 'above_crater_crater');
+		act = translate("forest_locale", 'above_crater_crater');
 	};
 	obj {
 		nam = '#tower';
 		act = translate(forest_locale, 'above_crater_tower');
+		act = translate("forest_locale", 'above_crater_tower');
 	};
 	obj {
 		nam = '#trees';
 		act = translate(forest_locale, 'above_crater_trees');
+		act = translate("forest_locale", 'above_crater_trees');
 	};
 	obj {
 		nam = '#glade';
 		act = function(s)
 			_'#down':enable();
 			return translate_now(forest_locale, 'above_crater_glade');
+			return translate_now("forest_locale", 'above_crater_glade');
 		end;
 	};
 	'wind';
@@ @@ -366,9 +366,9 @@ room { @@
 	nam = 'village_no_way';
 	onenter = function(s)
 		if solarscale_with_me then
 			p(translate_now(forest_locale, 'village_no_way_solarscale'));
+			p(translate_now("forest_locale", 'village_no_way_solarscale'));
 		else
 			p(translate_now(forest_locale, 'village_no_way_alone'));
+			p(translate_now("forest_locale", 'village_no_way_alone'));
 		end;
 		return false;
 	end;
@@ @@ -376,35 +376,35 @@ room { @@
 room {
 	nam = 'near_village';
 	disp = translate(forest_locale, 'near_village');
+	disp = translate("forest_locale", 'near_village');
 	pic = 'images/near_village.png';
 	theme = 'main';
 	onenter = function(s)
 		if here()^'above_near_village' then
 			p(translate_now(forest_locale, 'near_village_enter'));
+			p(translate_now("forest_locale", 'near_village_enter'));
 		end;
 	end;
 	decor = translate(forest_locale, 'near_village_decor');
+	decor = translate("forest_locale", 'near_village_decor');
 	way = {
 		path {"#up", translate(forest_locale, 'transition_fly'), 'above_near_village'};
 		path {"#north", translate(forest_locale, 'transition_north_to_the_village'), 'village_south'};
 		path {"#up", translate("forest_locale", 'transition_fly'), 'above_near_village'};
 		path {"#north", translate("forest_locale", 'transition_north_to_the_village'), 'village_south'};
+	}
 }: with {
 	obj {
 		nam = '#road';
 		act = translate(forest_locale, 'near_village_road');
+		act = translate("forest_locale", 'near_village_road');
 	};
 	obj {
 		nam = '#forest';
 		act = translate(forest_locale, 'near_village_forest');
+		act = translate("forest_locale", 'near_village_forest');
 	};
 	obj {
 		nam = '#village';
 		act = function(s)
 			p(translate_now(forest_locale, 'near_village_village'));
+			p(translate_now("forest_locale", 'near_village_village'));
 			if not village_visited then
 				village_visited = true;
 				p(translate_now(forest_locale, 'village_unvisited'));
+				p(translate_now("forest_locale", 'village_unvisited'));
 			end;
 		end;
 	};
@@ @@ -414,44 +414,44 @@ room { @@
 room {
 	nam = 'village_south';
 	disp = translate(forest_locale, 'village_south');
+	disp = translate("forest_locale", 'village_south');
 	pic='images/village_south.png';
 	theme = 'main';
 	enter = function(s)
 		if not village_visited then
 			village_visited = true;
 			p(translate_now(forest_locale, 'village_unvisited'));
+			p(translate_now("forest_locale", 'village_unvisited'));
 		end;
 	end;
 	nofollow = function(s)
 		if here():from()^'near_village' then
-			return translate_now(forest_locale, 'village_south_follow');
+			return translate_now("solarscale_locale", 'follow_refuse') .. ' ' ..translate_now("solarscale_locale", 'follow_refuse_village');
 		else
 			return true;
 		end;
 	end;
 	decor = translate(forest_locale, 'village_south_decor');
+	decor = translate("forest_locale", 'village_south_decor');
 	way = {
 		path {'#south', translate(forest_locale, 'transition_south_to_the_forest'), 'near_village'};
 		path {'#in', translate(forest_locale, 'transition_inside_hut'), 'foresters_hut'};
 		path {'#north', translate(forest_locale, 'transition_north_to_the_townhall'), 'village_center'};
 		path {'#south', translate("forest_locale", 'transition_south_to_the_forest'), 'near_village'};
 		path {'#in', translate("forest_locale", 'transition_inside_hut'), 'foresters_hut'};
 		path {'#north', translate("forest_locale", 'transition_north_to_the_townhall'), 'village_center'};
 	};
 }:with {
 	obj {
 		nam = '#road';
 		act = translate(forest_locale, 'village_south_road');
+		act = translate("forest_locale", 'village_south_road');
 	};
 	obj {
 		nam = '#village';
 		act = translate(forest_locale, 'village_south_village');
+		act = translate("forest_locale", 'village_south_village');
 	};
 	obj {
 		nam = '#foresters_car';
 		act = translate(forest_locale, 'village_south_car');
+		act = translate("forest_locale", 'village_south_car');
 	};
 	obj {
 		nam = '#foresters_hut_out';
 		act = translate(forest_locale, 'village_south_hut');
+		act = translate("forest_locale", 'village_south_hut');
 	};
 	'sun_transformed';
 	'clouds';
@@ @@ -469,91 +469,91 @@ room { @@
 	end;
 	theme = 'main';
 	nofollow = true;
 	disp = translate(forest_locale, 'foresters_hut');
+	disp = translate("forest_locale", 'foresters_hut');
 	enter = function(s)
 		if s.state == 0 then
 			s.state = 1;
 			return translate_now(forest_locale, 'foresters_hut_enter');
+			return translate_now("forest_locale", 'foresters_hut_enter');
 		end;
 	end;
 	decor = translate(forest_locale, 'foresters_hut_decor');
+	decor = translate("forest_locale", 'foresters_hut_decor');
 	way = {
 		path {'#out', translate(forest_locale, 'transition_out'), 'village_south'};
+		path {'#out', translate("forest_locale", 'transition_out'), 'village_south'};
+	}
 }:with {
 	obj {
 		nam = '#sofa';
 		act = translate(forest_locale, 'foresters_hut_sofa');
+		act = translate("forest_locale", 'foresters_hut_sofa');
 	};
 	obj {
 		nam = '#cupboard';
 		act = translate(forest_locale, 'foresters_hut_cupboard');
+		act = translate("forest_locale", 'foresters_hut_cupboard');
 	};
 	obj {
 		nam = '#table';
 		act = translate(forest_locale, 'foresters_hut_table');
+		act = translate("forest_locale", 'foresters_hut_table');
 	};
 	obj {
 		nam = '#chairs';
 		act = translate(forest_locale, 'foresters_hut_chairs');
+		act = translate("forest_locale", 'foresters_hut_chairs');
 	};
 	obj {
 		nam = '#radio';
 		act = translate(forest_locale, 'foresters_hut_radio');
+		act = translate("forest_locale", 'foresters_hut_radio');
 	};
 	obj {
 		bought = false;
 		nam = 'forester';
 		dsc = translate(forest_locale, 'foresters_hut_forester');
+		dsc = translate("forest_locale", 'foresters_hut_forester');
 		act = function(s)
 			walkin('forester_dlg');
 		end;
 		used = function(s, o)
 			if o^'raspberry_pie' then
 				return translate_now(forest_locale, 'foresters_hut_forester_pie');
+				return translate_now("forest_locale", 'foresters_hut_forester_pie');
 			else
 				return translate_now(forest_locale, 'foresters_hut_not_interested');
+				return translate_now("forest_locale", 'foresters_hut_not_interested');
 			end;
 		end;
 	};
 	obj {
 		nam = 'rope';
 		disp = translate(forest_locale, 'foresters_hut_rope_disp');
 		dsc = translate(forest_locale, 'foresters_hut_rope');
 		disp = translate("forest_locale", 'foresters_hut_rope_disp');
 		dsc = translate("forest_locale", 'foresters_hut_rope');
 		act = function(s)
 			if _('forester').bought then
 				p(translate_now(forest_locale, 'foresters_hut_rope_taken'));
+				p(translate_now("forest_locale", 'foresters_hut_rope_taken'));
 				take('rope')
 			else
 				p(translate_now(forest_locale, 'foresters_hut_rope_not_taken'));
+				p(translate_now("forest_locale", 'foresters_hut_rope_not_taken'));
 			end;
 		end;
 		inv = translate(forest_locale, 'foresters_hut_rope_inv');
+		inv = translate("forest_locale", 'foresters_hut_rope_inv');
 	};
+}
 dlg {
 	nam = 'forester_dlg';
 	disp = translate(forest_locale, 'forester_dlg_disp');
+	disp = translate("forest_locale", 'forester_dlg_disp');
 	theme = 'main';
 	pic = 'images/characters/forester.png';
 	enter = translate(forest_locale, 'forester_dlg_enter');
+	enter = translate("forest_locale", 'forester_dlg_enter');
 	phr = {
 		{translate(forest_locale, 'common_dlg_greet'), translate(forest_locale, 'forester_dlg_greet_response'),
 			{translate(forest_locale, 'common_dlg_places'), translate(forest_locale, 'forester_dlg_places_response')};
 		{translate("forest_locale", 'common_dlg_greet'), translate("forest_locale", 'forester_dlg_greet_response'),
 			{translate("forest_locale", 'common_dlg_places'), translate("forest_locale", 'forester_dlg_places_response')};
 		},
 		{cond=function(s) return where('rope') and where('rope')^'foresters_hut' and not _('forester').bought end, translate(forest_locale, 'forester_dlg_rope'), function(s)
 			p(translate_now(forest_locale, 'forester_dlg_rope_response'));
 		{cond=function(s) return where('rope') and where('rope')^'foresters_hut' and not _('forester').bought end, translate("forest_locale", 'forester_dlg_rope'), function(s)
 			p(translate_now("forest_locale", 'forester_dlg_rope_response'));
 			raspberry_pie_status = 1;
 		end},
 		{cond=function(s) return have 'raspberry_pie' end, translate(forest_locale, 'forester_dlg_pie'), function(s)
+		{cond=function(s) return have 'raspberry_pie' end, translate("forest_locale", 'forester_dlg_pie'), function(s)
 			remove('raspberry_pie', pl);
 			p(translate_now(forest_locale, 'forester_dlg_pie_response'));
+			p(translate_now("forest_locale", 'forester_dlg_pie_response'));
 			raspberry_pie_status = 2;
 			_('forester').bought = 1;
 		end},
 		{true, translate(forest_locale, 'forester_dlg_farewell'), function(s)
 			p(translate_now(forest_locale, 'forester_dlg_farewell_response'));
 		{true, translate("forest_locale", 'common_dlg_bye'), function(s)
 			p(translate_now("forest_locale", 'forester_dlg_farewell_response'));
 			walkout();
 		end}
+	}
@@ @@ -564,51 +564,51 @@ room { @@
 	nofollow = true;
 	pic = 'images/village_center.png';
 	theme = 'main';
 	disp = translate(forest_locale, 'village_center');
+	disp = translate("forest_locale", 'village_center');
 	decor = function(s)
     p(translate_now(forest_locale, 'village_center_decor'));
     p(translate_now(forest_locale, 'village_all_decor'));
     p(translate_now("forest_locale", 'village_center_decor'));
     p(translate_now("forest_locale", 'village_all_decor'));
   end;
 	way = {
 		 path {translate(forest_locale, 'transition_south_to_hut'), 'village_south'};
 		 path {'#down', translate(forest_locale, 'transition_inside_well'), 'inside_well'}:disable();
 		 path {translate(forest_locale, 'transition_inside_town_hall'), 'townhall'};
 		 path {translate(forest_locale, 'transition_inside_tavern'), 'tavern'};
 		 path {translate(forest_locale, 'transition_north_to_library'), 'village_north'};
 		 path {translate("forest_locale", 'transition_south_to_hut'), 'village_south'};
 		 path {'#down', translate("forest_locale", 'transition_inside_well'), 'inside_well'}:disable();
 		 path {translate("forest_locale", 'transition_inside_town_hall'), 'townhall'};
 		 path {translate("forest_locale", 'transition_inside_tavern'), 'tavern'};
 		 path {translate("forest_locale", 'transition_north_to_library'), 'village_north'};
 	};
 }: with {
 	obj {
 		nam = '#townhall';
 		act = translate(forest_locale, 'village_center_townhall');
+		act = translate("forest_locale", 'village_center_townhall');
 	};
 	obj {
 		nam = '#music';
 		act = translate(forest_locale, 'village_center_music');
+		act = translate("forest_locale", 'village_center_music');
 	};
 	obj {
 		nam = '#tavern';
 		act = translate(forest_locale, 'village_center_tavern');
+		act = translate("forest_locale", 'village_center_tavern');
 	};
 	obj {
 		nam = '#library';
 		act = translate(forest_locale, 'village_center_library');
+		act = translate("forest_locale", 'village_center_library');
 	};
 	obj {
 		known = false;
 		nam = 'village_well';
 		dsc = function(s)
       p(translate_now(forest_locale, 'village_well_dsc'));
+      p(translate_now("forest_locale", 'village_well_dsc'));
 			if _('inside_well').state then
 				p(translate_now(forest_locale, 'village_well_dsc_rope'));
+				p(translate_now("forest_locale", 'village_well_dsc_rope'));
 			end;
 		end;
 		act = function(s)
 			if s.known then
 				_'#down':enable();
 				p(translate_now(forest_locale, 'village_well_act_key'));
+				p(translate_now("forest_locale", 'village_well_act_key'));
 			else
 				p(translate_now(forest_locale, 'village_well_act'));
+				p(translate_now("forest_locale", 'village_well_act'));
 			end;
 		end;
 		used = function(s, o)
@@ @@ -616,7 +616,7 @@ room { @@
         _'#down':enable();
 				_('inside_well').state = true;
 				remove('rope', pl);
 				p(translate_now(forest_locale, 'village_well_used'));
+				p(translate_now("forest_locale", 'village_well_used'));
 			else
 				return false;
 			end;
@@ @@ -625,23 +625,23 @@ room { @@
 	obj {
 		nam = 'maid';
 		dsc = function(s)
       p(translate_now(forest_locale, 'village_maid_dsc'));
+      p(translate_now("forest_locale", 'village_maid_dsc'));
 			if _('maid_dlg').flower then
 				p(translate_now(forest_locale, 'village_maid_flower'));
+				p(translate_now("forest_locale", 'village_maid_flower'));
 			end;
 		end;
 		act = function(s)
 			if _('maid_dlg').flower and (raspberry_pie_status == 0 or raspberry_pie_status == 2) then
-				return translate_now(forest_locale, 'village_maid_act');
+				return translate_now("forest_locale", 'maid_dlg_enter') .. ' ' .. translate_now("forest_locale", 'village_maid_act_no_dlg');
 			else
 				walkin('maid_dlg');
 			end;
 		end;
 		used = function(s, o)
 			if o^'flower' then
 				return translate_now(forest_locale, 'village_maid_used_flower');
+				return translate_now("forest_locale", 'village_maid_used_flower');
 			else
 				return translate_now(forest_locale, 'village_maid_used_other');
+				return translate_now("forest_locale", 'village_maid_used_other');
 			end;
 		end;
 	};
@@ @@ -651,7 +651,7 @@ room { @@
 dlg {
 	nam = 'maid_dlg';
 	disp = translate(forest_locale, 'maid_dlg');
+	disp = translate("forest_locale", 'maid_dlg');
 	theme = 'main';
 	pic = function(s)
 		if s.flower then
@@ @@ -665,86 +665,88 @@ dlg { @@
 	work_asked = false;
 	pie_asked = false;
 	enter = function(s)
     p(translate_now("forest_locale", 'maid_dlg_enter'));
 		if _('maid_dlg').flower then
 			return translate_now(forest_locale, 'maid_dlg_enter_flower');
 			p(translate_now("forest_locale", 'maid_dlg_enter_with_flower'));
       p(translate_now("forest_locale", 'village_maid_flower'));
 		else
-			return translate_now(forest_locale, 'maid_dlg_enter_no_flower');
+			p(translate_now("forest_locale", 'maid_dlg_enter_no_flower'));
 		end;
 	end;
 	phr = {
 		{cond=function(s) return not _('maid_dlg').flower end, translate(forest_locale, 'common_dlg_greet'), translate(forest_locale, 'maid_dlg_greet_response'),
 			{translate(forest_locale, 'common_dlg_places'), translate(forest_locale, 'maid_dlg_places_response'),
 				{translate(forest_locale, 'maid_dlg_places_like'), translate(forest_locale, 'maid_dlg_places_like_response'), only=true,
 		{cond=function(s) return not _('maid_dlg').flower end, translate("forest_locale", 'common_dlg_greet'), translate("forest_locale", 'maid_dlg_greet_response'),
 			{translate("forest_locale", 'common_dlg_places'), translate("forest_locale", 'maid_dlg_places_response'),
 				{translate("forest_locale", 'maid_dlg_places_like'), translate("forest_locale", 'maid_dlg_places_like_response'), only=true,
+					{
 						cond=function(s) return have 'flower' end,
 						translate(forest_locale, 'maid_dlg_flower'),
+						translate("forest_locale", 'maid_dlg_flower'),
 						function(s)
 							_('maid_dlg').flower = 1;
 							remove('flower', pl);
 							p(translate_now(forest_locale, 'maid_dlg_flower_response'));
+							p(translate_now("forest_locale", 'maid_dlg_flower_response'));
 						end
 					};
+					{
 						translate(forest_locale, 'maid_dlg_silent'),
 						translate(forest_locale, 'maid_dlg_silent_response')
 						translate("common_locale", 'dlg_keep_silent'),
 						translate("forest_locale", 'maid_dlg_silent_response')
+					}
 				};
 			};
 		};
 		{cond=function(s) return not _('maid_dlg').work_asked end, translate(forest_locale, 'maid_dlg_tavern'), function(s)
+		{cond=function(s) return not _('maid_dlg').work_asked end, translate("forest_locale", 'maid_dlg_tavern'), function(s)
 			_('maid_dlg').work_asked = true;
 			return translate_now(forest_locale, 'maid_dlg_tavern_response');
+			return translate_now("forest_locale", 'maid_dlg_tavern_response');
 		end};
+		{
 			cond=function(s) return _('maid_dlg').pie_asked and have 'flower' end,
 			translate(forest_locale, 'maid_dlg_flower'),
+			translate("forest_locale", 'maid_dlg_flower'),
 			function(s)
 				_('maid_dlg').flower = 1;
 				remove('flower', pl);
 				raspberry_pie_status = 2;
 				take 'raspberry_pie'
 				p(translate_now(forest_locale, 'maid_dlg_pie_response'));
+				p(translate_now("forest_locale", 'maid_dlg_pie_response'));
 			end
 		};
+		{
 			cond=function(s) return _('maid_dlg').work_asked and not _('maid_dlg').pie_asked and _('maid_dlg').flower and raspberry_pie_status == 1; end;
 			translate(forest_locale, 'maid_dlg_pie'),
+			translate("forest_locale", 'maid_dlg_pie'),
 			function(s)
 				raspberry_pie_status = 2;
 				take 'raspberry_pie'
 				p(translate_now(forest_locale, 'maid_dlg_pie_response'));
+				p(translate_now("forest_locale", 'maid_dlg_pie_response'));
 			end;
 		};
+		{
 			cond=function(s) return _('maid_dlg').work_asked and not _('maid_dlg').pie_asked and not _('maid_dlg').flower and raspberry_pie_status == 1; end;
 			translate(forest_locale, 'maid_dlg_pie'),
 			translate(forest_locale, 'maid_dlg_pie_fail_response'), only=true,
 			translate("forest_locale", 'maid_dlg_pie'),
 			translate("forest_locale", 'maid_dlg_pie_fail_response'), only=true,
+			{
 				translate(forest_locale, 'maid_dlg_no_money'), function(s)
+				translate("forest_locale", 'maid_dlg_no_money'), function(s)
 					_('maid_dlg').pie_asked = 1;
 					p(translate_now(forest_locale, 'maid_dlg_no_money_response'));
+					p(translate_now("forest_locale", 'maid_dlg_no_money_response'));
 				end, only=true,
+				{
 					cond=function(s) return have 'flower' end,
 					translate(forest_locale, 'maid_dlg_flower'),
+					translate("forest_locale", 'maid_dlg_flower'),
 					function(s)
 						_('maid_dlg').flower = 1;
 						remove('flower', pl);
 						raspberry_pie_status = 2;
 						take('raspberry_pie');
 						p(translate_now(forest_locale, 'maid_dlg_pie_response'));
+						p(translate_now("forest_locale", 'maid_dlg_pie_response'));
 					end
 				};
         {translate(forest_locale, 'maid_dlg_flower_agree'), translate(forest_locale, 'maid_dlg_flower_agree_response')};
 				{translate(forest_locale, 'maid_dlg_flower_think'), translate(forest_locale, 'maid_dlg_flower_think_response')};
         {translate("forest_locale", 'maid_dlg_flower_agree'), translate("forest_locale", 'maid_dlg_flower_agree_response')};
 				{translate("forest_locale", 'maid_dlg_flower_think'), translate("forest_locale", 'maid_dlg_flower_think_response')};
 			},
+			{
 				translate(forest_locale, 'maid_dlg_pie_ask'), translate(forest_locale, 'maid_dlg_pie_ask_response')
+				translate("forest_locale", 'maid_dlg_pie_ask'), translate("forest_locale", 'maid_dlg_pie_ask_response')
+			}
 		};
+		{
 			translate(forest_locale, 'maid_dlg_bye'), function(s)
 			p(translate_now(forest_locale, 'maid_dlg_bye_response'));
 			translate("forest_locale", 'maid_dlg_bye'), function(s)
 			p(translate_now("forest_locale", 'maid_dlg_bye_response'));
 			walkout();
 		end
+		}
@@ @@ -760,41 +762,41 @@ room { @@
 			return 'images/tavern.png;images/tavern_pie.png@181,124';
 		end;
 	end;
 	disp = translate(forest_locale, 'tavern');
+	disp = translate("forest_locale", 'tavern');
 	theme = 'main';
 	nofollow = true;
 	decor = translate(forest_locale, 'tavern_decor');
+	decor = translate("forest_locale", 'tavern_decor');
 	way = {
 		path {'#outside', translate(forest_locale, 'transition_out'), 'village_center'};
+		path {'#outside', translate("forest_locale", 'transition_out'), 'village_center'};
 	};
 }: with {
 	obj {
 		nam = '#windows';
 		act = translate(forest_locale, 'tavern_windows');
+		act = translate("forest_locale", 'tavern_windows');
 	};
 	obj {
 		nam = '#tables';
 		act = translate(forest_locale, 'tavern_tables');
+		act = translate("forest_locale", 'tavern_tables');
 	};
 	obj {
 		nam = '#walls';
 		act = translate(forest_locale, 'tavern_walls');
+		act = translate("forest_locale", 'tavern_walls');
 	};
 	obj {
 		nam = '#lights';
 		act = translate(forest_locale, 'tavern_lights');
+		act = translate("forest_locale", 'tavern_lights');
 	};
 	obj {
 		nam = '#fireplace';
 		act = translate(forest_locale, 'tavern_fireplace');
+		act = translate("forest_locale", 'tavern_fireplace');
 	};
 	obj {
 		nam = '#cauldron';
 		act = translate(forest_locale, 'tavern_cauldron');
+		act = translate("forest_locale", 'tavern_cauldron');
 	};
 	obj {
 		nam = 'tavernkeeper';
 		dsc = translate(forest_locale, 'tavern_keeper');
+		dsc = translate("forest_locale", 'tavern_keeper');
 		act = function(s)
 			walkin 'tavernkeeper_dlg'
 		end;
@@ @@ -804,20 +806,20 @@ room { @@
 dlg {
 	nam = 'tavernkeeper_dlg';
 	noinv = true;
 	title = translate(forest_locale, 'tavernkeeper_dlg');
+	title = translate("forest_locale", 'tavernkeeper_dlg');
 	pic = 'images/characters/tavernkeeper.png';
 	theme = 'main';
 	enter = translate(forest_locale, 'tavernkeeper_dlg_enter');
+	enter = translate("forest_locale", 'tavernkeeper_dlg_enter');
 	phr = {
 		{translate(forest_locale, 'common_dlg_greet'), translate(forest_locale, 'tavernkeeper_dlg_greet_response'),
 			{translate(forest_locale, 'tavernkeeper_dlg_money'), translate(forest_locale, 'tavernkeeper_dlg_money_response')};
 			{translate(forest_locale, 'common_dlg_places'), translate(forest_locale, 'tavernkeeper_dlg_places_response')};
 		{translate("forest_locale", 'common_dlg_greet'), translate("forest_locale", 'tavernkeeper_dlg_greet_response'),
 			{translate("forest_locale", 'tavernkeeper_dlg_money'), translate("forest_locale", 'tavernkeeper_dlg_money_response')};
 			{translate("forest_locale", 'common_dlg_places'), translate("forest_locale", 'tavernkeeper_dlg_places_response')};
 		};
 		{cond=function(s) return raspberry_pie_status == 1; end, translate(forest_locale, 'tavernkeeper_dlg_pie'), translate(forest_locale, 'tavernkeeper_dlg_pie_response'),
 			{translate(forest_locale, 'tavernkeeper_dlg_pie_2'), translate(forest_locale, 'tavernkeeper_dlg_pie_response_2')}
 		{cond=function(s) return raspberry_pie_status == 1; end, translate("forest_locale", 'tavernkeeper_dlg_pie'), translate("forest_locale", 'tavernkeeper_dlg_pie_response'),
 			{translate("forest_locale", 'tavernkeeper_dlg_pie_2'), translate("forest_locale", 'tavernkeeper_dlg_pie_response_2')}
 		};
 		{true, translate(forest_locale, 'tavernkeeper_dlg_bye'), function(s)
 			p(translate_now(forest_locale, 'tavernkeeper_dlg_bye_response'));
 		{true, translate("forest_locale", 'common_dlg_bye'), function(s)
 			p(translate_now("forest_locale", 'tavernkeeper_dlg_bye_response'));
 			walkout();
 		end};
 	};
@@ @@ -827,52 +829,52 @@ room { @@
 	nam = 'townhall';
 	pic='images/townhall.png';
 	theme = 'main';
 	title = translate(forest_locale, 'townhall');
+	title = translate("forest_locale", 'townhall');
 	nofollow = true;
 	decor = translate(forest_locale, 'townhall_decor');
+	decor = translate("forest_locale", 'townhall_decor');
 	onexit = function(s)
 		if have 'oil' then
 			p(translate_now(forest_locale, 'townhall_onexit'));
+			p(translate_now("forest_locale", 'townhall_onexit'));
 			return false;
 		end;
 	end;
 	way = {
 		path {'#out', translate(forest_locale, 'transition_out'), 'village_center'};
+		path {'#out', translate("forest_locale", 'transition_out'), 'village_center'};
 	};
 }: with {
 	obj {
 		nam = '#ceiling';
 		act = translate(forest_locale, 'townhall_ceiling');
+		act = translate("forest_locale", 'townhall_ceiling');
 	};
 	obj {
 		nam = '#chandelier';
 		act = translate(forest_locale, 'townhall_chandelier');
+		act = translate("forest_locale", 'townhall_chandelier');
 	};
 	obj {
 		nam = '#curtains';
 		act = translate(forest_locale, 'townhall_curtains');
+		act = translate("forest_locale", 'townhall_curtains');
 	};
 	obj {
 		nam = '#table';
 		act = translate(forest_locale, 'townhall_table');
+		act = translate("forest_locale", 'townhall_table');
 	};
 	obj {
 		nam = '#chairs';
 		act = translate(forest_locale, 'townhall_chairs');
+		act = translate("forest_locale", 'townhall_chairs');
 	};
 	obj {
 		nam = '#head';
 		act = translate(forest_locale, 'townhall_head');
+		act = translate("forest_locale", 'townhall_head');
 	};
 	obj {
 		flask = true;
 		nam = 'cabinet';
 		dsc = translate(forest_locale, 'townhall_cabinet');
+		dsc = translate("forest_locale", 'townhall_cabinet');
 		act = function(s)
 			if s.flask then
 				return translate_now(forest_locale, 'townhall_cabinet_act_oil');
+				return translate_now("forest_locale", 'townhall_cabinet_act_oil');
 			else
 				return translate_now(forest_locale, 'townhall_cabinet_act');
+				return translate_now("forest_locale", 'townhall_cabinet_act');
 			end;
 		end;
 		used = function(s, o)
@@ @@ -880,30 +882,30 @@ room { @@
 				s.flask = true;
 				remove(o, pl);
 				put(o, 'townhall');
 				return translate_now(forest_locale, 'townhall_cabinet_used_oil');
+				return translate_now("forest_locale", 'townhall_cabinet_used_oil');
 			end;
 		end;
 	}:with {
 		obj {
 			nam = 'records';
 			act = translate(forest_locale, 'townhall_cabinet_records');
+			act = translate("forest_locale", 'townhall_cabinet_records');
 		};
 		obj {
 			nam = 'parts';
 			act = translate(forest_locale, 'townhall_cabinet_parts');
+			act = translate("forest_locale", 'townhall_cabinet_parts');
 		};
 		obj {
 			nam = 'oil';
 			disp = translate(forest_locale, 'townhall_cabinet_oil');
+			disp = translate("forest_locale", 'townhall_cabinet_oil');
 			tak = function(s)
 				_('cabinet').flask = false;
 				return translate_now(forest_locale, 'townhall_cabinet_oil_tak');
+				return translate_now("forest_locale", 'townhall_cabinet_oil_tak');
 			end;
 			inv = translate(forest_locale, 'townhall_cabinet_oil_inv');
+			inv = translate("forest_locale", 'townhall_cabinet_oil_inv');
 		};
 		obj {
 			nam = 'record_player';
 			act = translate(forest_locale, 'townhall_cabinet_record_player');
+			act = translate("forest_locale", 'townhall_cabinet_record_player');
 		};
 	};
+}
@@ @@ -914,23 +916,23 @@ room { @@
 	nam = 'inside_well';
 	theme = 'tower';
 	pic = 'images/oldwell.png';
 	disp = translate(forest_locale, 'inside_well');
+	disp = translate("forest_locale", 'inside_well');
 	onenter = function(s)
 		if not s.state then
 			p(translate_now(forest_locale, 'inside_well_enter'));
+			p(translate_now("forest_locale", 'inside_well_enter'));
 			return false;
 		end;
 	end;
 	decor = translate(forest_locale, 'inside_well_decor');
+	decor = translate("forest_locale", 'inside_well_decor');
 	way = {
 		path {translate(forest_locale, 'transition_up'), 'village_center'};
+		path {translate("forest_locale", 'transition_up'), 'village_center'};
+	}
 }:with {
 	obj {
 		nam = 'loose_rock';
 		dsc = translate(forest_locale, 'inside_well_loose_rock');
+		dsc = translate("forest_locale", 'inside_well_loose_rock');
 		act = function(s)
 			p(translate_now(forest_locale, 'inside_well_loose_rock_act'));
+			p(translate_now("forest_locale", 'inside_well_loose_rock_act'));
 			take('hidden_key');
 			s:disable();
 		end;
@@ @@ -939,46 +941,46 @@ room { @@
 obj {
 	nam = 'hidden_key';
 	disp = translate(forest_locale, 'hidden_key_disp');
 	disp2 = translate(forest_locale, 'hidden_key_disp2');
 	disp3 = translate(forest_locale, 'hidden_key_disp3');
 	inv = translate(forest_locale, 'hidden_key_inv');
 	disp = translate("forest_locale", 'hidden_key_disp');
 	disp2 = translate("forest_locale", 'hidden_key_disp2');
 	disp3 = translate("forest_locale", 'hidden_key_disp3');
 	inv = translate("forest_locale", 'hidden_key_inv');
+}
 room {
 	nam = 'village_north';
 	pic = 'images/village_north.png';
 	disp = translate(forest_locale, 'village_north');
+	disp = translate("forest_locale", 'village_north');
 	theme = 'main';
 	nofollow = true;
 	decor = function(s)
       p(translate_now(forest_locale, 'village_north_decor'));
       p(translate_now(forest_locale, 'village_all_decor'));
       p(translate_now("forest_locale", 'village_north_decor'));
       p(translate_now("forest_locale", 'village_all_decor'));
   end;
 	way = {
 		path {'#south', translate(forest_locale, 'transition_south_to_town_hall'), 'village_center'};
 		path {'#in', translate(forest_locale, 'transition_inside_library'), 'library'};
 		path {'#south', translate("forest_locale", 'transition_south_to_town_hall'), 'village_center'};
 		path {'#in', translate("forest_locale", 'transition_inside_library'), 'library'};
 	};
 }: with {
 	obj {
 		nam = '#village';
 		act = translate(forest_locale, 'village_north_village');
+		act = translate("forest_locale", 'village_north_village');
 	};
 	obj {
 		nam = '#road';
 		act = translate(forest_locale, 'village_north_road');
+		act = translate("forest_locale", 'village_north_road');
 	};
 	obj {
 		nam = '#forest';
 		act = translate(forest_locale, 'village_north_forest');
+		act = translate("forest_locale", 'village_north_forest');
 	};
 	obj {
 		nam = '#library';
 		act = translate(forest_locale, 'village_north_library');
+		act = translate("forest_locale", 'village_north_library');
 	};
 	obj {
 		nam = '#mountains';
 		act = translate(forest_locale, 'village_north_mountains');
+		act = translate("forest_locale", 'village_north_mountains');
 	};
 	'sun_transformed';
 	'clouds';
@@ @@ -987,53 +989,53 @@ room { @@
 room {
 	nam = 'library';
 	pic = 'images/library.png';
 	disp = translate(forest_locale, 'library');
+	disp = translate("forest_locale", 'library');
 	theme = 'main';
 	nofollow = true;
 	decor = translate(forest_locale, 'library_decor');
+	decor = translate("forest_locale", 'library_decor');
 	way = {
 		path {'#out', translate(forest_locale, 'transition_out'), 'village_north'};
 		path {'library_hidden_path', translate(forest_locale, 'transition_to_hidden_room'), 'library_hidden_room'}:disable();
 		path {'#out', translate("forest_locale", 'transition_out'), 'village_north'};
 		path {'library_hidden_path', translate("forest_locale", 'transition_to_hidden_room'), 'library_hidden_room'}:disable();
 	};
 }:with {
 	obj {
 		nam = 'librarian';
 		dsc = translate(forest_locale, 'library_librarian');
+		dsc = translate("forest_locale", 'library_librarian');
 		act = function(s)
 			walkin 'librarian_dlg'
 		end;
 		used = function(s, o)
 			if o^'box' then
 				return translate_now(forest_locale, 'library_librarian_used_box');
+				return translate_now("forest_locale", 'library_librarian_used_box');
 			else
 				return translate_now(forest_locale, 'library_librarian_used_other');
+				return translate_now("forest_locale", 'library_librarian_used_other');
 			end;
 		end;
 	};
 	obj {
 		nam = '#tables';
 		act = translate(forest_locale, 'library_tables');
+		act = translate("forest_locale", 'library_tables');
 	};
 	obj {
 		nam = '#chairs';
 		act = translate(forest_locale, 'library_chairs');
+		act = translate("forest_locale", 'library_chairs');
 	};
 	obj {
 		nam = '#lamps';
 		act = translate(forest_locale, 'library_lamps');
+		act = translate("forest_locale", 'library_lamps');
 	};
 	obj {
 		nam = '#windows';
 		act = translate(forest_locale, 'library_windows');
+		act = translate("forest_locale", 'library_windows');
 	};
 	obj {
 		state = 0;
 		nam = 'library_shelves';
 		act = function(s)
 			if s.state == 0 then
 				p(translate_now(forest_locale, 'library_shelves_act_first'));
+				p(translate_now("forest_locale", 'library_shelves_act_first'));
 			else
 				p(translate_now(forest_locale, 'library_shelves_act'));
+				p(translate_now("forest_locale", 'library_shelves_act'));
 			end;
 		end;
 	},
@@ @@ -1041,7 +1043,7 @@ room { @@
 		nam = 'library_the_shelf';
 		act = function(s)
 			if	_'library_shelves'.state == 0 then
 				p(translate_now(forest_locale, 'library_the_shelf_act', {word=library_word}));
+				p(translate_now("forest_locale", 'library_the_shelf_act', {word=library_word}));
 			end;
 			_'library_shelves'.state = 1;
 			walkin('library_shelf_puzzle');
@@ @@ -1058,12 +1060,12 @@ room { @@
 room {
 	nam = 'library_notice_inside';
 	pic = 'images/library.png';
 	disp = translate(forest_locale, 'library');
+	disp = translate("forest_locale", 'library');
 	theme = 'main';
   nofollow = true;
 	decor = translate(forest_locale, 'library_notice_inside_decor');
+	decor = translate("forest_locale", 'library_notice_inside_decor');
 	way = {
 		path {translate(common_locale, 'back'), 'library'};
+		path {translate("common_locale", 'back'), 'library'};
 	};
+}
@@ @@ -1073,25 +1075,25 @@ dlg { @@
 	pic = 'images/characters/librarian.png';
 	theme = 'main';
 	noinv = true;
 	title = translate(forest_locale, 'librarian_dlg');
+	title = translate("forest_locale", 'librarian_dlg');
 	enter = function(s)
 		seen_ring_librarian = true;
 		return translate_now(forest_locale, 'librarian_dlg_enter');
+		return translate_now("forest_locale", 'librarian_dlg_enter');
 	end;
 	phr = {
 		{translate(forest_locale, 'common_dlg_greet'), translate(forest_locale, 'librarian_dlg_greet_response'),
 			{translate(forest_locale, 'common_dlg_places'), translate(forest_locale, 'librarian_dlg_places_response'),
 				{translate(forest_locale, 'librarian_dlg_library'), translate(forest_locale, 'librarian_dlg_library_response')};
         {translate(forest_locale, 'librarian_dlg_library_old'), translate(forest_locale, 'librarian_dlg_library_old_response')};
 		{translate("forest_locale", 'common_dlg_greet'), translate("forest_locale", 'librarian_dlg_greet_response'),
 			{translate("forest_locale", 'common_dlg_places'), translate("forest_locale", 'librarian_dlg_places_response'),
 				{translate("forest_locale", 'librarian_dlg_library'), translate("forest_locale", 'librarian_dlg_library_response')};
         {translate("forest_locale", 'librarian_dlg_library_old'), translate("forest_locale", 'librarian_dlg_library_old_response')};
 			},
 			{translate(forest_locale, 'librarian_dlg_ring'), translate(forest_locale, 'librarian_dlg_ring_response')}
+			{translate("forest_locale", 'librarian_dlg_ring'), translate("forest_locale", 'librarian_dlg_ring_response')}
 		},
 		{cond=function(s) return seen_ring_box; end, translate(forest_locale, 'librarian_dlg_ring_look'), function(s)
+		{cond=function(s) return seen_ring_box; end, translate("forest_locale", 'librarian_dlg_ring_look'), function(s)
 			_('village_well').known = 1;
 			return translate_now(forest_locale, 'librarian_dlg_ring_look_response');
+			return translate_now("forest_locale", 'librarian_dlg_ring_look_response');
 		end};
 		{true, translate(forest_locale, 'librarian_dlg_bye'), function(s)
 			p(translate_now(forest_locale, 'librarian_dlg_bye_response'));
 		{true, translate("forest_locale", 'common_dlg_bye'), function(s)
 			p(translate_now("forest_locale", 'librarian_dlg_bye_response'));
 			walkout();
 		end}
+	}
@@ @@ -1101,10 +1103,12 @@ function book(number) @@
   return obj {
     book = number;
     nam = 'book_' .. tostring(number);
     disp = translate(forest_locale, 'library_shelf_book_disp', {number=number});
     dsc = translate(forest_locale, 'library_shelf_book_dsc', {number=number});
     tak = translate(forest_locale, 'library_shelf_book_tak');
     inv = translate(forest_locale, 'library_shelf_book_inv');
     disp = translate("forest_locale", 'library_shelf_book_disp', {number=number});
     dsc = function(s)
       return '{"' .. translate_now("forest_locale", 'library_shelf_book_disp', {number=number}) .. '"}';
     end;
     tak = translate("forest_locale", 'library_shelf_book_tak');
     inv = translate("forest_locale", 'library_shelf_book_inv');
     used = function(s, o)
       if o.book and where(s)^'shelf' then
         local t = _'shelf'.obj;
@@ @@ -1118,14 +1122,14 @@ function book(number) @@
         remove(o, pl);
         _'shelf'.obj:add(o, idx);
         p(translate_now(forest_locale, 'library_shelf_puzzle_used_book'));
+        p(translate_now("forest_locale", 'library_shelf_puzzle_used_book'));
         if #t == 9 then
 					for i = 1, 9 do
 						if library_book_map[t[i].book] ~= i then
 							return;
 						end;
 					end;
 					p(translate_now(forest_locale, 'library_shelf_puzzle_used_book_success'));
+					p(translate_now("forest_locale", 'library_shelf_puzzle_used_book_success'));
 					disable 'library_shelves'
 					enable 'library_hidden_path'
 					walkout()
@@ @@ -1140,11 +1144,11 @@ end; @@
 room {
 	nam = 'library_shelf_puzzle';
 	nofollow = true;
 	disp = translate(forest_locale, 'library');
+	disp = translate("forest_locale", 'library');
 	theme = 'main';
   onexit = function(s)
     if have('book_1') or have('book_2') or have('book_3') or have('book_4') or have('book_5') or have('book_6') or have('book_7') or have('book_8')or have('book_9') then
       p(translate_now(forest_locale, 'leave_books_message'));
+      p(translate_now("forest_locale", 'leave_books_message'));
       return false;
     end;
   end;
@@ @@ -1156,7 +1160,7 @@ room { @@
 		return pic;
 	end;
 	way = {
 		path {'#back', translate(forest_locale, 'transition_away_from_bookstand'), 'library'};
+		path {'#back', translate("forest_locale", 'transition_away_from_bookstand'), 'library'};
 	};
 }:with {
 	obj {
@@ @@ -1164,21 +1168,21 @@ room { @@
 		dsc = function(s)
 			local count = #s.obj;
 			if count > 1 then
 				p(translate_now(forest_locale, 'library_shelf_puzzle_shelf_multiple'));
+				p(translate_now("forest_locale", 'library_shelf_puzzle_shelf_multiple'));
 			elseif count == 1 then
 				p(translate_now(forest_locale, 'library_shelf_puzzle_shelf_single'));
+				p(translate_now("forest_locale", 'library_shelf_puzzle_shelf_single'));
 			else
 				p(translate_now(forest_locale, 'library_shelf_puzzle_shelf_none'));
+				p(translate_now("forest_locale", 'library_shelf_puzzle_shelf_none'));
 			end;
 		end;
 		act = function(s)
       return translate_now(forest_locale, 'library_shelf_puzzle_shelf_act', {word=library_word});
+      return translate_now("forest_locale", 'library_shelf_puzzle_shelf_act', {word=library_word});
     end;
 		used = function(s, o)
 			if o.book then
 				remove(o, pl);
 				_'shelf'.obj:add(o);
 				p(translate_now(forest_locale, 'library_shelf_puzzle_used_book'));
+				p(translate_now("forest_locale", 'library_shelf_puzzle_used_book'));
 				if #s.obj == 9 then
 					for i = 1, 9 do
@@ @@ -1186,7 +1190,7 @@ room { @@
 							return;
 						end;
 					end;
 					p(translate_now(forest_locale, 'library_shelf_puzzle_used_book_success'));
+					p(translate_now("forest_locale", 'library_shelf_puzzle_used_book_success'));
 					disable 'library_shelves'
 					enable 'library_hidden_path'
 					walkout()
@@ @@ -1217,41 +1221,41 @@ room { @@
       return 'images/library_hidden_room.png';
     end;
   end;
 	disp = translate(forest_locale, 'library_hidden_room');
+	disp = translate("forest_locale", 'library_hidden_room');
 	theme = 'main';
 	nofollow = true;
 	decor = translate(forest_locale, 'library_hidden_room_decor');
+	decor = translate("forest_locale", 'library_hidden_room_decor');
 	way = {
 		path {translate(forest_locale, 'transition_to_main_hall'), 'library'};
+		path {translate("forest_locale", 'transition_to_main_hall'), 'library'};
 	};
 }:with {
 	obj {
 		nam = '#table';
 		act = translate(forest_locale, 'library_hidden_room_table');
+		act = translate("forest_locale", 'library_hidden_room_table');
 	};
 	obj {
 		oiled = false;
 		opened = false;
 		lock_taken = false;
 		nam = 'box';
 		disp = translate(forest_locale, 'box_disp');
 		disp2 = translate(forest_locale, 'box_disp2');
 		disp3 = translate(forest_locale, 'box_disp3');
 		dsc = translate(forest_locale, 'box_dsc');
 		tak = translate(forest_locale, 'box_tak');
 		disp = translate("forest_locale", 'box_disp');
 		disp2 = translate("forest_locale", 'box_disp2');
 		disp3 = translate("forest_locale", 'box_disp3');
 		dsc = translate("forest_locale", 'box_dsc');
 		tak = translate("forest_locale", 'box_tak');
 		inv = function(s)
 			seen_ring_box = true;
 			if s.lock_taken then
 				p(translate_now(forest_locale, 'box_inv_without_lock'));
+				p(translate_now("forest_locale", 'box_inv_without_lock'));
 			elseif s.opened then
 				s.lock_taken = true;
 				p(translate_now(forest_locale, 'box_inv_take_lock'));
+				p(translate_now("forest_locale", 'box_inv_take_lock'));
 				take('lock');
 				remove('box', pl);
 			else
         p(translate_now(forest_locale, 'box_inv'));
+        p(translate_now("forest_locale", 'box_inv'));
         if seen_ring_librarian then
           p(translate_now(forest_locale, 'box_inv_known'));
+          p(translate_now("forest_locale", 'box_inv_known'));
         end;
 			end;
 		end;
@@ @@ -1260,16 +1264,16 @@ room { @@
 				if s.oiled then
 					s.opened = true;
 					take('map');
 					p(translate_now(forest_locale, 'box_used_key_success'));
+					p(translate_now("forest_locale", 'box_used_key_success'));
 				else
 					p(translate_now(forest_locale, 'box_used_key_failed'));
+					p(translate_now("forest_locale", 'box_used_key_failed'));
 				end;
 			elseif o^'oil' then
 				if not s.oiled then
 					s.oiled = true;
 					p(translate_now(forest_locale, 'box_used_key_oil'));
+					p(translate_now("forest_locale", 'box_used_key_oil'));
 				else
 					p(translate_now(forest_locale, 'box_used_key_oil2'));
+					p(translate_now("forest_locale", 'box_used_key_oil2'));
 				end;
 			end;
 		end;
@@ @@ -1278,11 +1282,11 @@ room { @@
 obj {
 	nam = 'map';
 	disp = translate(forest_locale, 'map_disp');
 	disp2 = translate(forest_locale, 'map_disp2');
 	disp3 = translate(forest_locale, 'map_disp3');
 	disp = translate("forest_locale", 'map_disp');
 	disp2 = translate("forest_locale", 'map_disp2');
 	disp3 = translate("forest_locale", 'map_disp3');
 	inv = function(s)
 		p(translate_now(forest_locale, 'map_inv'));
+		p(translate_now("forest_locale", 'map_inv'));
 		_('fly_west_from_village'):enable();
 	end;
+}
@@ @@ -1290,42 +1294,42 @@ obj { @@
 room {
 	nam = 'inside_crater_glade';
 	pic = 'images/inside_crater_glade.png';
 	disp = translate(forest_locale, 'inside_crater_glade');
+	disp = translate("forest_locale", 'inside_crater_glade');
 	theme = 'main';
 	onenter = function(s)
 		if here()^'above_crater' then
 			p(translate_now(forest_locale, 'inside_crater_glade_on_enter'));
+			p(translate_now("forest_locale", 'inside_crater_glade_on_enter'));
 		end;
 	end;
 	decor = translate(forest_locale, 'inside_crater_glade_decor');
+	decor = translate("forest_locale", 'inside_crater_glade_decor');
 	way = {
 		path {translate(forest_locale, 'transition_fly'), "above_crater"};
 		path {translate(forest_locale, 'transition_along_the_path'), "inside_crater_path"};
 		path {translate("forest_locale", 'transition_fly'), "above_crater"};
 		path {translate("forest_locale", 'transition_along_the_path'), "inside_crater_path"};
+	}
 }: with {
 	obj {
 		nam = '#forest';
 		act = translate(forest_locale, 'inside_crater_glade_forest');
+		act = translate("forest_locale", 'inside_crater_glade_forest');
 	};
 	obj {
 		nam = '#oak';
 		act = translate(forest_locale, 'inside_crater_glade_oak');
+		act = translate("forest_locale", 'inside_crater_glade_oak');
 	};
 	obj {
 		nam = '#grass';
 		act = translate(forest_locale, 'inside_crater_glade_grass');
+		act = translate("forest_locale", 'inside_crater_glade_grass');
 	};
 	obj {
 		nam = '#path';
 		act = translate(forest_locale, 'inside_crater_glade_path');
+		act = translate("forest_locale", 'inside_crater_glade_path');
 	};
 	obj {
 		nam = '#tower';
 		act = translate(forest_locale, 'inside_crater_glade_tower');
+		act = translate("forest_locale", 'inside_crater_glade_tower');
 	};
 	obj {
 		nam = '#crater';
 		act = translate(forest_locale, 'inside_crater_glade_crater');
+		act = translate("forest_locale", 'inside_crater_glade_crater');
 	};
+}
@@ @@ -1338,46 +1342,46 @@ room { @@
 		end;
 		return p;
 	end;
 	disp = translate(forest_locale, 'inside_crater_path');
+	disp = translate("forest_locale", 'inside_crater_path');
 	theme = 'main';
 	decor = translate(forest_locale, 'inside_crater_path_decor');
+	decor = translate("forest_locale", 'inside_crater_path_decor');
 	exit = function(s, t)
 		if t^'crater_near_tower' and seen('solarscale', s) then
 			remove('solarscale', where('solarscale'));
 			p(translate_now(forest_locale, 'inside_crater_path_exit'));
+			p(translate_now("forest_locale", 'inside_crater_path_exit'));
 		end;
 	end;
 	way = {
 		path {translate(forest_locale, 'transition_to_glade'), "inside_crater_glade"};
 		path {translate(forest_locale, 'transition_to_tower'), "crater_near_tower"};
 		path {translate("forest_locale", 'transition_to_glade'), "inside_crater_glade"};
 		path {translate("forest_locale", 'transition_to_tower'), "crater_near_tower"};
 	};
 }: with {
 	obj {
 		nam = '#grass';
 		act = translate(forest_locale, 'inside_crater_path_grass');
+		act = translate("forest_locale", 'inside_crater_path_grass');
 	};
 	obj {
 		nam = '#crater';
 		act = translate(forest_locale, 'inside_crater_path_crater')
+		act = translate("forest_locale", 'inside_crater_path_crater')
 	};
 	obj {
 		nam = '#trees';
 		act = translate(forest_locale, 'inside_crater_path_trees')
+		act = translate("forest_locale", 'inside_crater_path_trees')
 	};
 	obj {
 		nam = '#tower';
 		act = translate(forest_locale, 'inside_crater_path_tower')
+		act = translate("forest_locale", 'inside_crater_path_tower')
 	};
 	obj {
 		nam = '#stump';
 		dsc = function(s)
 			if seen('solarscale', here()) then
 				p(translate_now(forest_locale, 'inside_crater_path_stump_with_solarscale'));
+				p(translate_now("forest_locale", 'inside_crater_path_stump_with_solarscale'));
 			else
 				p(translate_now(forest_locale, 'inside_crater_path_stump'));
+				p(translate_now("forest_locale", 'inside_crater_path_stump'));
 			end;
 		end;
 		act = translate(forest_locale, 'inside_crater_path_stump_act');
+		act = translate("forest_locale", 'inside_crater_path_stump_act');
 	};
 	obj {
 		nam = 'solarscale';
@@ @@ -1389,55 +1393,55 @@ room { @@
 dlg {
 	nam = 'solarscale_dlg';
 	disp = translate(solarscale_locale, 'disp');
+	disp = translate("solarscale_locale", 'disp');
 	theme = 'main';
 	pic = 'images/inside_crater_path.png;images/characters/solarscale.png';
 	enter = translate(solarscale_locale, 'first_dlg_enter');
+	enter = translate("solarscale_locale", 'first_dlg_enter');
   convince = 0;
   open_q45 = false;
 	phr = {
     {only=true, '#q1', translate(solarscale_locale, 'first_dlg_dragon'), translate(solarscale_locale, 'first_dlg_dragon_response'),
       {translate(solarscale_locale, 'first_dlg_dragon_admit'), function(s)
     {only=true, '#q1', translate("solarscale_locale", 'first_dlg_dragon'), translate("solarscale_locale", 'first_dlg_dragon_response'),
       {translate("solarscale_locale", 'first_dlg_dragon_admit'), function(s)
         _('solarscale_dlg').convince = _('solarscale_dlg').convince + 1;
         return translate_now(solarscale_locale, 'first_dlg_dragon_admit_response');
+        return translate_now("solarscale_locale", 'first_dlg_dragon_admit_response');
       end};
       {translate(solarscale_locale, 'first_dlg_dragon_question'), translate(solarscale_locale, 'first_dlg_dragon_question_response')};
       {translate(solarscale_locale, 'first_dlg_dragon_decline'), function(s)
       {translate("solarscale_locale", 'first_dlg_dragon_question'), translate("solarscale_locale", 'first_dlg_dragon_question_response')};
       {translate("solarscale_locale", 'first_dlg_dragon_decline'), function(s)
         _('solarscale_dlg').convince = _('solarscale_dlg').convince - 1;
         return translate_now(solarscale_locale, 'first_dlg_dragon_decline_response');
+        return translate_now("solarscale_locale", 'first_dlg_dragon_decline_response');
       end};
     };
     {only=true, '#q2', translate(solarscale_locale, 'first_dlg_about_map'), function(s)
+    {only=true, '#q2', translate("solarscale_locale", 'first_dlg_about_map'), function(s)
         _('solarscale_dlg').convince = _('solarscale_dlg').convince + 1;
         _('solarscale_ally').tower_know_discussed = true;
         return translate_now(solarscale_locale, 'first_dlg_about_map_response');
+        return translate_now("solarscale_locale", 'first_dlg_about_map_response');
     end,
       {translate(solarscale_locale, 'first_dlg_about_map_1'), translate(solarscale_locale, 'first_dlg_about_map_1_response')};
       {translate(solarscale_locale, 'first_dlg_about_map_2'), translate(solarscale_locale, 'first_dlg_about_map_1_response')};
       {translate(solarscale_locale, 'first_dlg_about_map_3'), function(s)
       {translate("solarscale_locale", 'first_dlg_about_map_1'), translate("solarscale_locale", 'first_dlg_about_map_1_response')};
       {translate("solarscale_locale", 'first_dlg_about_map_2'), translate("solarscale_locale", 'first_dlg_about_map_1_response')};
       {translate("solarscale_locale", 'first_dlg_about_map_3'), function(s)
           disable('#q3');
           _('solarscale_dlg').open_q45 = true;
           return translate_now(solarscale_locale, 'first_dlg_about_map_3_response');
+          return translate_now("solarscale_locale", 'first_dlg_about_map_3_response');
       end};
     };
     {'#q3', translate(solarscale_locale, 'first_dlg_unusual'), function(s)
+    {'#q3', translate("solarscale_locale", 'first_dlg_unusual'), function(s)
         _('solarscale_dlg').open_q45 = true;
         return translate_now(solarscale_locale, 'first_dlg_unusual_response');
+        return translate_now("solarscale_locale", 'first_dlg_unusual_response');
     end};
     {cond=function(s) return _('solarscale_dlg').open_q45 end, '#q4', translate(solarscale_locale, 'first_dlg_tower'), translate(solarscale_locale, 'first_dlg_tower_response')};
     {cond=function(s) return _('solarscale_dlg').open_q45 end, '#q5', translate(solarscale_locale, 'first_dlg_tower_join'), function(s)
     {cond=function(s) return _('solarscale_dlg').open_q45 end, '#q4', translate("solarscale_locale", 'first_dlg_tower'), translate("solarscale_locale", 'first_dlg_tower_response')};
     {cond=function(s) return _('solarscale_dlg').open_q45 end, '#q5', translate("solarscale_locale", 'first_dlg_tower_join'), function(s)
       if _('solarscale_dlg').convince >= 3 then
         walkout();
         solarscale_with_me = true;
         remove('solarscale', where('solarscale'));
         put('solarscale_ally', here());
         lifeon(_'solarscale_ally');
         return translate_now(solarscale_locale, 'first_dlg_tower_join_response_success_1');
+        return translate_now("solarscale_locale", 'first_dlg_tower_join_response_success_1');
       else
         return translate_now(solarscale_locale, 'first_dlg_tower_join_response_fail');
+        return translate_now("solarscale_locale", 'first_dlg_tower_join_response_fail');
       end;
     end;
       {translate(solarscale_locale, 'first_dlg_tower_join_1'), function(s)
+      {translate("solarscale_locale", 'first_dlg_tower_join_1'), function(s)
         _('solarscale_dlg').convince = _('solarscale_dlg').convince + 1;
         if _('solarscale_dlg').convince >= 3 then
           walkout();
@@ @@ -1445,13 +1449,13 @@ dlg { @@
           remove('solarscale', where('solarscale'));
           put('solarscale_ally', here());
           lifeon(_'solarscale_ally');
           return translate_now(solarscale_locale, 'first_dlg_tower_join_response_success_1');
+          return translate_now("solarscale_locale", 'first_dlg_tower_join_response_success_1');
         else
           return translate_now(solarscale_locale, 'first_dlg_tower_join_response_fail_1');
+          return translate_now("solarscale_locale", 'first_dlg_tower_join_response_fail_1');
         end;
       end;};
       {translate(solarscale_locale, 'first_dlg_tower_join_2'), translate(solarscale_locale, 'first_dlg_tower_join_response_2')};
       {translate(solarscale_locale, 'first_dlg_tower_join_3'), function(s)
       {translate("solarscale_locale", 'first_dlg_tower_join_2'), translate("solarscale_locale", 'first_dlg_tower_join_response_2')};
       {translate("solarscale_locale", 'first_dlg_tower_join_3'), function(s)
         _('solarscale_dlg').convince = _('solarscale_dlg').convince + 1;
         if _('solarscale_dlg').convince >= 3 then
           walkout();
@@ @@ -1459,27 +1463,27 @@ dlg { @@
           remove('solarscale', where('solarscale'));
           put('solarscale_ally', here());
           lifeon(_'solarscale_ally');
           return translate_now(solarscale_locale, 'first_dlg_tower_join_response_success_3');
+          return translate_now("solarscale_locale", 'first_dlg_tower_join_response_success_3');
         else
           return translate_now(solarscale_locale, 'first_dlg_tower_join_response_fail_3');
+          return translate_now("solarscale_locale", 'first_dlg_tower_join_response_fail_3');
         end;
       end;};
       {translate(solarscale_locale, 'first_dlg_tower_bye_thanks'), function(s)
+      {translate("solarscale_locale", 'first_dlg_tower_bye_thanks'), function(s)
         walkout();
         remove('solarscale', where('solarscale'));
         return translate_now(solarscale_locale, 'first_dlg_tower_bye_response');
+        return translate_now("solarscale_locale", 'first_dlg_tower_bye_response');
       end};
     };
     {'#q6', function(s)
         if not closed('#q3') then
           return translate_now(solarscale_locale, 'first_dlg_tower_bye_no_time');
+          return translate_now("solarscale_locale", 'first_dlg_tower_bye_no_time');
         else
           return translate_now(solarscale_locale, 'first_dlg_tower_bye_thanks');
+          return translate_now("solarscale_locale", 'first_dlg_tower_bye_thanks');
         end;
     end, function(s)
 			walkout();
 			remove('solarscale', where('solarscale'));
 			return translate_now(solarscale_locale, 'first_dlg_tower_bye_response');
+			return translate_now("solarscale_locale", 'first_dlg_tower_bye_response');
 		end};
+  }
+}
@@ @@ -1487,31 +1491,31 @@ dlg { @@
 room {
 	nam = 'crater_near_tower';
 	pic = 'images/crater_near_tower.png';
 	disp = translate(forest_locale, 'crater_near_tower');
+	disp = translate("forest_locale", 'crater_near_tower');
 	theme = 'main';
 	decor = translate(forest_locale, 'crater_near_tower_decor');
+	decor = translate("forest_locale", 'crater_near_tower_decor');
   enter = function(s)
     tower_seen = true;
   end;
 	way = {
 		path {translate(forest_locale, 'transition_along_the_path'), "inside_crater_path"};
 		path {translate(forest_locale, 'transition_inside_tower'), "tower_level_1"};
 		path {translate("forest_locale", 'transition_along_the_path'), "inside_crater_path"};
 		path {translate("forest_locale", 'transition_inside_tower'), "tower_level_1"};
 	};
 }:with {
 	obj {
 		nam = '#tower';
 		act = translate(forest_locale, 'crater_near_tower_tower');
+		act = translate("forest_locale", 'crater_near_tower_tower');
 	};
 	obj {
 		nam = '#grass';
 		act = translate(forest_locale, 'crater_near_tower_grass');
+		act = translate("forest_locale", 'crater_near_tower_grass');
 	};
 	obj {
 		nam = '#trees';
 		act = translate(forest_locale, 'crater_near_tower_trees');
+		act = translate("forest_locale", 'crater_near_tower_trees');
 	};
 	obj {
 		nam = '#sun';
 		act = translate(forest_locale, 'crater_near_tower_sun');
+		act = translate("forest_locale", 'crater_near_tower_sun');
 	};
+}

images/title/about.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/title/back.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/title/load.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/title/quit.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/title/save.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/title/settings.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/title/start.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/title/tutorial.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

lib/link.lua

➞

Show inline comments

@@ @@ -13,7 +13,7 @@ obj { @@
 		if not instead.clipboard or instead.clipboard() ~= w then
 			std.pr ('{@link ', w, '|', w, '}')
 		else
 			std.pr(fmt.u (w) ..' [' .. translate_now(link_locale, 'copied') .. ']')
+			std.pr(fmt.u (w) ..' [' .. translate_now("link_locale", 'copied') .. ']')
 		end
 	end;
+}

lib/locale.lua

➞

Show inline comments

 local language = ''
 local lang_map = {
@@ @@ -7,7 +6,16 @@ local lang_map = { @@
 	['uk'] = 'ru'
+}
 function translate_now(table, key, subst)
 local lang_list = {
   {'en', 'English'},
   {'ru', 'Русский'},
+}
 local default_locale = {};
 local locale = {};
 function translate_now(domain, key, subst)
 	local lang = language
 	if lang == '' then
 		if lang_map[LANG] then
@@ @@ -17,11 +25,13 @@ function translate_now(table, key, subst @@
 		end;
 	end;
   local val = key;
   local table = locale[domain];
   local default_table = default_locale[domain];
 	if table[key] ~= nil  then
     if table[key][lang] ~= nil then
       val = table[key][lang];
     elseif table[key]['en'] ~= nil then
       val = table[key]['en'];
     if table[key] ~= nil then
       val = table[key];
     elseif default_table[key] ~= nil then
       val = default_table[key]
     end;
 	end
@@ @@ -31,13 +41,12 @@ function translate_now(table, key, subst @@
     end;
   end;
   --dprint(key, val);
   return val
 end;
-function translate(table, key, subst)
+function translate(domain, key, subst)
 	return function()
-		return translate_now(table, key, subst);
+		return translate_now(domain, key, subst);
 	end;
 end;
@@ @@ -45,8 +54,18 @@ function set_language(lng) @@
 	language = lng;
 	prefs.language = lng;
 	prefs:store();
   dofile('translation/' .. get_language() .. '.lua');
 end;
 obj {
 	nam = '@set_language';
 	act = function(s, w)
     set_language(w);
 		walk(here())
 	end;
+}
 function get_language_saved()
   return language;
 end;
@@ @@ -57,17 +76,33 @@ function get_language() @@
 	elseif lang_map[LANG] then
 		return lang_map[LANG];
 	else
-		return 'en';
+		return lang_list[1][1];
 	end;
 end;
 function get_default_language()
   return lang_list[1][1];
 end;
 function get_language_list()
   return lang_list;
 end;
 function set_locale_data(data)
   locale = data;
 end;
 std.mod_init(function()
   dofile('translation/' .. get_language_list()[1][1] .. '.lua');
   default_locale = locale;
 	prefs:load();
 	if prefs.language then
 		language = prefs.language;
 	else
 		prefs.language = '';
 	end;
   dofile('translation/' .. get_language() .. '.lua');
 end)

main3.lua

➞

Show inline comments

@@ @@ -16,7 +16,6 @@ require "lib/dire/theme" @@
 require "lib/locale"
 require "lib/fading"
 require "lib/smoke"
 include "translation"
 declare({
     closed_beta_participants = 'arbtttrn6, De@th K!d, Fehatt, Lesha Pak, Łukasz Sawicki, Niko Flang, Oleg Bosh, Terracon, Андрей Лобанов';
@@ @@ -27,15 +26,15 @@ fmt.filter = function(r) @@
     local utf8 = (std.ref 'game'.codepage == 'UTF-8' or std.ref 'game'.codepage == 'utf-8')
     if utf8 then
         r = r:gsub('"([^"]*)"', translate_now(common_locale, 'quotes'));
+        r = r:gsub('"([^"]*)"', translate_now("common_locale", 'quotes'));
     end;
     return r;
 end;
 game.act = translate(main_locale, 'empty_act');
+game.act = translate('main_locale', 'empty_act');
 game.use = function(s)
 	return translate_now(main_locale, random_phrase({
+	return translate_now('main_locale', random_phrase({
     'empty_use_1',
 		'empty_use_2',
 		'empty_use_3',
@@ @@ -43,7 +42,7 @@ game.use = function(s) @@
 		'empty_use_5'
   }));
 end;
 game.inv = translate(main_locale, 'empty_inv');
+game.inv = translate("main_locale", 'empty_inv');
 instead.notitle = function()
 	return here().notitle;
@@ @@ -170,7 +169,11 @@ function get_sprite(path, transparent) @@
 	local s = diretheme.get_scale();
 	if not menu_sprites[path] then
 		menu_sprites[path] = pixels.new(path):scale(s, s):sprite();
     if s ~= 1 then
       menu_sprites[path] = pixels.new(path):scale(s, s):sprite();
     else
       menu_sprites[path] = sprite.new(path);
     end;
     if transparent then
       menu_sprites[path]:colorkey(transparent);
     end;
@@ @@ -179,6 +182,28 @@ function get_sprite(path, transparent) @@
 	return menu_sprites[path];
 end;
 function get_button(button_name)
   local path = 'images/title/' .. button_name .. '.' .. get_language() .. '.png';
   if menu_sprites[path] then
     return menu_sprites[path];
   end;
   local sprite = nil;
   --Check if file exists(only used here, so not moved to function)
   local f = io.open(path, 'r');
   if f then
     f:close();
     sprite = get_sprite(path, 'fuchsia')
   end;
   if not sprite then
     local path = 'images/title/' .. button_name .. '.' .. get_default_language() .. '.png';
     sprite = get_sprite(path, 'fuchsia');
   end;
   return sprite
 end;
 function stop_menu()
 	D {'bgframe'};
 	D {'background'};
@@ @@ -272,7 +297,7 @@ function init_menu(with_text, buttons) @@
 		D {
 			buttons[1],
 			'img',
-			get_sprite('images/title/' .. buttons[1] .. '.' .. get_language() .. '.png', 'fuchsia'),
+      get_button(buttons[1]),
 			x=ox + 398 * scale,
 			y=oy + (btop + button_dy) * scale,
 			click=true,
@@ @@ -283,7 +308,7 @@ function init_menu(with_text, buttons) @@
 		D {
 			buttons[1],
 			'img',
-			get_sprite('images/title/' .. buttons[1] .. '.' .. get_language() .. '.png', 'fuchsia'),
+			get_button(buttons[1]),
 			x=ox + (157 + button_dx) * scale,
 			y=oy + (btop + button_dy) * scale,
 			click=true,
@@ @@ -293,8 +318,8 @@ function init_menu(with_text, buttons) @@
 		D {
 			buttons[2],
 			'img',
 			get_sprite('images/title/' .. buttons[2] .. '.' .. get_language() .. '.png', 'fuchsia'),
 			x=ox + 398 * scale,
 			get_button(buttons[2]),
 			x=ox + 398 * scale,
 			y=oy + (btop + button_dy) * scale,
 			click=true,
       background=true,
@@ @@ -303,7 +328,7 @@ function init_menu(with_text, buttons) @@
 		D {
 			buttons[3],
 			'img',
-			get_sprite('images/title/' .. buttons[3] .. '.' .. get_language() .. '.png', 'fuchsia'),
+			get_button(buttons[3]),
 			x=ox + (639 - button_dx) * scale,
 			y=oy + (btop + button_dy) * scale,
 			click=true,
@@ @@ -317,7 +342,7 @@ function init_menu(with_text, buttons) @@
 		D {
 			buttons[4],
 			'img',
-			get_sprite('images/title/' .. buttons[4] .. '.' .. get_language() .. '.png', 'fuchsia'),
+			get_button(buttons[4]),
 			x=ox + (278 + button_dx / 2) * scale,
 			y=oy + (btop + button_dy) * scale,
 			click=true,
@@ @@ -328,7 +353,7 @@ function init_menu(with_text, buttons) @@
 		D {
 			buttons[5],
 			'img',
-			get_sprite('images/title/' .. buttons[5] .. '.' .. get_language() .. '.png', 'fuchsia'),
+			get_button(buttons[5]),
 			x=ox + (519 - button_dx / 2) * scale,
 			y=oy + (btop + button_dy) * scale,
 			click=true,
@@ @@ -483,7 +508,7 @@ room { @@
 		end;
 		return false;
 	end;
 	decor = translate(menu_locale, 'intro');
+	decor = translate("menu_locale", 'intro');
+}
 room {
@@ @@ -519,14 +544,14 @@ room { @@
 		return false;
 	end;
 	decor = function(s)
 		return translate_now(menu_locale, 'credits_author') .. ': Khaelenmore Thaal^' ..
 			translate_now(menu_locale, 'credits_art') .. ': Sabra Naikomy^' ..
 			translate_now(menu_locale, 'credits_music') .. ': Khaelenmore Thaal^' ..
 			translate_now(menu_locale, 'credits_engine') .. ': INSTEAD ' .. translate_now(menu_locale, 'credits_engine_author') .. ' {$link https://github.com/instead-hub/instead/}^' ..
 			translate_now(menu_locale, 'credits_sounds') .. ': {$link https://freesound.org/} CC-0^' ..
 			translate_now(menu_locale, 'credits_fonts') .. ': VileR {$link https://int10h.org/oldschool-pc-fonts/} CC-BY-SA 4.0^^' ..
       translate_now(menu_locale, 'credits_closed_beta') .. ': ' .. closed_beta_participants .. '^^'..
 			translate_now(menu_locale, 'credits_thanks');
 		return translate_now("menu_locale", 'credits_author') .. ': Khaelenmore Thaal^' ..
 			translate_now("menu_locale", 'credits_art') .. ': Sabra Naikomy^' ..
 			translate_now("menu_locale", 'credits_music') .. ': Khaelenmore Thaal^' ..
 			translate_now("menu_locale", 'credits_engine') .. ': INSTEAD ' .. translate_now("menu_locale", 'credits_engine_author') .. ' {$link https://github.com/instead-hub/instead/}^' ..
 			translate_now("menu_locale", 'credits_sounds') .. ': {$link https://freesound.org/} CC-0^' ..
 			translate_now("menu_locale", 'credits_fonts') .. ': VileR {$link https://int10h.org/oldschool-pc-fonts/} CC-BY-SA 4.0^^' ..
       translate_now("menu_locale", 'credits_closed_beta') .. ': ' .. closed_beta_participants .. '^^'..
 			translate_now("menu_locale", 'credits_thanks');
 	end;
+}
@@ @@ -573,7 +598,7 @@ room { @@
 	obj {
 		nam = '#system_settings';
 		dsc = function(s)
 			return fmt.c(fmt.b('{[' .. translate_now(menu_locale, 'system_settings') .. ']}^^'));
+			return fmt.c(fmt.b('{[' .. translate_now("menu_locale", 'system_settings') .. ']}^^'));
 		end;
 		act = function(s)
 			instead.menu('settings');
@@ @@ -582,30 +607,25 @@ room { @@
 	obj {
 		nam = '#language';
 		dsc = function(s)
 			local l = translate_now(menu_locale, 'auto_option');
+			local l = translate_now("menu_locale", 'auto_option');
 			pn(fmt.c(fmt.b(translate_now(menu_locale, 'language'))));
+			pn(fmt.c(fmt.b(translate_now("menu_locale", 'language'))));
-			local t = '';
 			local t;
 			if get_language_saved() == '' then
-				t = t .. l .. ' | ';
 				t = l;
 			else
-				t = t .. '{#l_auto|'.. l .. '} | ';
 				t = '{#l_auto|'.. l .. '}';
 			end;
 			if get_language_saved() == 'ru' then
 				t = t .. 'Русский | ';
 			else
 				t = t .. '{#l_ru|Русский} | ';
 			end;
 			if get_language_saved() == 'en' then
 				t = t .. 'English';
 			else
 				t = t .. '{#l_en|English}';
 			end;
       for i, language in ipairs(get_language_list()) do
         if get_language_saved() == language[1] then
           t = t .. ' | ' .. language[2];
         else
           t = t .. ' | ' .. '{@set_language ' .. language[1] .. '|' .. language[2] .. '}';
         end;
       end;
 			pn(fmt.c(t) .. '^')
 		end;
@@ @@ -617,27 +637,13 @@ room { @@
 				walk(here());
 			end;
 		};
 		obj {
 			nam = '#l_en';
 			act = function(s)
 				set_language('en');
 				walk(here());
 			end;
 		};
 		obj {
 			nam = '#l_ru';
 			act = function(s)
 				set_language('ru');
 				walk(here());
 			end;
 		};
 	};
 	obj {
 		nam = '#graphics_scale';
 		dsc = function(s)
 			local graphic_scale = get_graphic_scale();
 			pn(fmt.c(fmt.b(translate_now(menu_locale, 'graphic_scale')) .. ' {[' .. translate_now(menu_locale, 'auto_option') .. ']}'))
+			pn(fmt.c(fmt.b(translate_now("menu_locale", 'graphic_scale')) .. ' {[' .. translate_now("menu_locale", 'auto_option') .. ']}'))
 			local t = '';
@@ @@ -647,7 +653,7 @@ room { @@
 				t = t .. '<< ';
 			end;
 			local l =  translate_now(menu_locale, 'auto_option') .. ' (' .. tostring(graphic_scale * 100) .. '%)';
+			local l =  translate_now("menu_locale", 'auto_option') .. ' (' .. tostring(graphic_scale * 100) .. '%)';
 			if prefs.graphic_scale then
@@ @@ -724,7 +730,7 @@ room { @@
 		dsc = function(s)
 			local cursor_scale = get_cursor_scale();
 			pn(fmt.c(fmt.b(translate_now(menu_locale, 'cursor_scale')) .. ' {[' .. translate_now(menu_locale, 'auto_option') .. ']}'))
+			pn(fmt.c(fmt.b(translate_now("menu_locale", 'cursor_scale')) .. ' {[' .. translate_now("menu_locale", 'auto_option') .. ']}'))
 			local t = '';
@@ @@ -734,7 +740,7 @@ room { @@
 				t = t .. '<< ';
 			end;
 			local l = translate_now(menu_locale, 'auto_option') .. ' (' .. tostring(cursor_scale * 100) .. '%)';
+			local l = translate_now("menu_locale", 'auto_option') .. ' (' .. tostring(cursor_scale * 100) .. '%)';
 			if prefs.cursor_scale then
 				l = tostring(cursor_scale * 100) .. '%';
@@ @@ -811,7 +817,7 @@ room { @@
 			local graphic_scale = get_graphic_scale();
 			local font_scale = get_font_scale();
 			pn(fmt.c(fmt.b(translate_now(menu_locale, 'font_scale')) .. ' {[' .. translate_now(menu_locale, 'auto_option') .. ']}'));
+			pn(fmt.c(fmt.b(translate_now("menu_locale", 'font_scale')) .. ' {[' .. translate_now("menu_locale", 'auto_option') .. ']}'));
 			local t = '';
@@ @@ -824,7 +830,7 @@ room { @@
 			if prefs.font_scale then
 				t = t .. tostring(font_scale) .. '%';
 			else
 				t = t .. translate_now(menu_locale, 'auto_option') .. ' (' .. tostring(font_scale) .. '%)';
+				t = t .. translate_now("menu_locale", 'auto_option') .. ' (' .. tostring(font_scale) .. '%)';
 			end;
@@ @@ -871,7 +877,7 @@ room { @@
 			local graphic_scale = get_graphic_scale();
 			local font_scale = get_inventory_font_scale();
 			pn(fmt.c(fmt.b(translate_now(menu_locale, 'inventory_scale')) .. ' {[' .. translate_now(menu_locale, 'auto_option') .. ']}'));
+			pn(fmt.c(fmt.b(translate_now("menu_locale", 'inventory_scale')) .. ' {[' .. translate_now("menu_locale", 'auto_option') .. ']}'));
 			local t = '';
@@ @@ -884,7 +890,7 @@ room { @@
 			if prefs.inventory_scale then
 				t = t .. tostring(font_scale) .. '%';
 			else
 				t = t .. translate_now(menu_locale, 'auto_option') .. ' (' .. tostring(font_scale) .. '%)';
+				t = t .. translate_now("menu_locale", 'auto_option') .. ' (' .. tostring(font_scale) .. '%)';
 			end;
@@ @@ -928,7 +934,7 @@ room { @@
 	obj {
 		nam = '#text_width';
 		dsc = function(s)
 			pn(fmt.c(fmt.b(translate_now(menu_locale, 'text_width'))));
+			pn(fmt.c(fmt.b(translate_now("menu_locale", 'text_width'))));
 			local t = '';
 			if prefs.text_width > 40 then
 				t = t .. '{#fw_less|<<} ';
@@ @@ -986,21 +992,21 @@ room { @@
 	obj {
 		nam = '#text_alignment';
 		dsc = function(s)
 			pn(fmt.c(fmt.b(translate_now(menu_locale, 'text_alignment'))));
+			pn(fmt.c(fmt.b(translate_now("menu_locale", 'text_alignment'))));
 			local t = '';
 			if prefs.text_alignment == 1 then
 				t = t .. translate_now(menu_locale, 'text_alignment_justify') .. ' | ';
+				t = t .. translate_now("menu_locale", 'text_alignment_justify') .. ' | ';
 			else
 				t = t .. '{#align_just|' .. translate_now(menu_locale, 'text_alignment_justify') .. '} | ';
+				t = t .. '{#align_just|' .. translate_now("menu_locale", 'text_alignment_justify') .. '} | ';
 			end;
 			if prefs.text_alignment == 2 then
 				t = t .. translate_now(menu_locale, 'text_alignment_left');
+				t = t .. translate_now("menu_locale", 'text_alignment_left');
 			else
 				t = t .. '{#align_left|' .. translate_now(menu_locale, 'text_alignment_left') .. '}';
+				t = t .. '{#align_left|' .. translate_now("menu_locale", 'text_alignment_left') .. '}';
 			end;
 			pn(fmt.c(t) .. '^');
 		end;
@@ @@ -1029,21 +1035,21 @@ room { @@
 	obj {
 		nam = '#padding';
 		dsc = function(s)
 			pn(fmt.c(fmt.b(translate_now(menu_locale, 'padding'))));
+			pn(fmt.c(fmt.b(translate_now("menu_locale", 'padding'))));
 			local t = '';
 			if prefs.text_padding == 1 then
 				t = t .. translate_now(menu_locale, 'normal') .. ' | ';
+				t = t .. translate_now("menu_locale", 'normal') .. ' | ';
 			else
 				t = t .. '{#pad_norm|' .. translate_now(menu_locale, 'normal') .. '} | ';
+				t = t .. '{#pad_norm|' .. translate_now("menu_locale", 'normal') .. '} | ';
 			end;
 			if prefs.text_padding == 2 then
 				t = t .. translate_now(menu_locale, 'extended');
+				t = t .. translate_now("menu_locale", 'extended');
 			else
 				t = t .. '{#pad_large|' .. translate_now(menu_locale, 'extended') .. '}';
+				t = t .. '{#pad_large|' .. translate_now("menu_locale", 'extended') .. '}';
 			end;
 			pn(fmt.c(t) .. '^');
 		end;
@@ @@ -1072,21 +1078,21 @@ room { @@
 	obj {
 		nam = '#interval';
 		dsc = function(s)
 			pn(fmt.c(fmt.b(translate_now(menu_locale, 'interval'))));
+			pn(fmt.c(fmt.b(translate_now("menu_locale", 'interval'))));
 			local t = '';
 			if prefs.text_interval == 1 then
 				t = t .. translate_now(menu_locale, 'normal') .. ' | ';
+				t = t .. translate_now("menu_locale", 'normal') .. ' | ';
 			else
 				t = t .. '{#int_norm|' .. translate_now(menu_locale, 'normal') .. '} | ';
+				t = t .. '{#int_norm|' .. translate_now("menu_locale", 'normal') .. '} | ';
 			end;
 			if prefs.text_interval == 2 then
 				t = t .. translate_now(menu_locale, 'extended');
+				t = t .. translate_now("menu_locale", 'extended');
 			else
 				t = t .. '{#int_large|' .. translate_now(menu_locale, 'extended') .. '}';
+				t = t .. '{#int_large|' .. translate_now("menu_locale", 'extended') .. '}';
 			end;
 			pn(fmt.c(t) .. '^');
 		end;
@@ @@ -1115,13 +1121,13 @@ room { @@
   obj {
     nam = '#textinput';
     dsc = function(s)
       pn(fmt.c(fmt.b(translate_now(menu_locale, 'use_text_input'))));
+      pn(fmt.c(fmt.b(translate_now("menu_locale", 'use_text_input'))));
       local t = '';
       if prefs.text_input then
         t = '{#ti_disable|' .. translate_now(menu_locale, 'disable') .. '} | ' .. translate_now(menu_locale, 'enable');
+        t = '{#ti_disable|' .. translate_now("menu_locale", 'disable') .. '} | ' .. translate_now("menu_locale", 'enable');
 			else
 				t = translate_now(menu_locale, 'disable') .. ' | {#ti_enable|' .. translate_now(menu_locale, 'enable') .. '}';
+				t = translate_now("menu_locale", 'disable') .. ' | {#ti_enable|' .. translate_now("menu_locale", 'enable') .. '}';
 			end;
       pn(fmt.c(t) .. '^');
@@ @@ -1153,13 +1159,13 @@ room { @@
 	theme = 'black';
   noinv = true;
 	nam = 'resolution_warning';
 	title = translate(menu_locale, 'warning');
 	decor = translate(menu_locale, 'resolution_warning');
 	title = translate("menu_locale", 'warning');
 	decor = translate("menu_locale", 'resolution_warning');
 	onenter = stop_menu;
 }: with {
 	obj {
 		nam = '#sysset';
 		dsc = function(s) return '{' .. translate_now(menu_locale, 'system_settings') .. '}'; end;
+		dsc = function(s) return '{' .. translate_now("menu_locale", 'system_settings') .. '}'; end;
 		act = function(s)
 			instead.menu();
 		end;
@@ @@ -1173,13 +1179,13 @@ room { @@
 	theme = 'black';
   noinv = true;
 	nam = 'theme_warning';
 	title = translate(menu_locale, 'warning');
 	decor = translate(menu_locale, 'theme_warning');
 	title = translate("menu_locale", 'warning');
 	decor = translate("menu_locale", 'theme_warning');
 	onenter = stop_menu;
 }: with {
 	obj {
 		nam = '#sysset';
 		dsc = function(s) return '{' .. translate_now(menu_locale, 'system_settings') .. '}'; end;
+		dsc = function(s) return '{' .. translate_now("menu_locale", 'system_settings') .. '}'; end;
 		act = function(s)
 			instead.menu();
 		end;

solarscale.lua

➞

Show inline comments

@@ @@ -20,32 +20,32 @@ obj { @@
   nofollowloc = false;
 	dsc = function(s)
 		if here()^'above_forest' or here()^'above_near_village' or here()^'above_village' or here()^'above_crater' or here()^'above_west' then
 			return translate_now(solarscale_locale, 'solarscale_ally_outside');
+			return translate_now("solarscale_locale", 'solarscale_ally_outside');
 		elseif here()^'forest_glade' then
 			return translate_now(solarscale_locale, 'solarscale_ally_glade');
+			return translate_now("solarscale_locale", 'solarscale_ally_glade');
 		elseif here()^'crater_near_tower' then
 			return translate_now(solarscale_locale, 'solarscale_ally_near_tower');
+			return translate_now("solarscale_locale", 'solarscale_ally_near_tower');
 		elseif here()^'tower_level_2' then
 			return translate_now(solarscale_locale, 'solarscale_ally_tower_level_2');
+			return translate_now("solarscale_locale", 'solarscale_ally_tower_level_2');
 		elseif here()^'tower_level_3' then
 			return translate_now(solarscale_locale, 'solarscale_ally_tower_level_3');
+			return translate_now("solarscale_locale", 'solarscale_ally_tower_level_3');
 		elseif here()^'tower_level_4' then
 			return translate_now(solarscale_locale, 'solarscale_ally_tower_level_4');
+			return translate_now("solarscale_locale", 'solarscale_ally_tower_level_4');
 		elseif here()^'tower_level_4_room_2' then
 			return translate_now(solarscale_locale, 'solarscale_ally_tower_level_4_room_2');
+			return translate_now("solarscale_locale", 'solarscale_ally_tower_level_4_room_2');
 		elseif here()^'tower_level_3_room_2' then
 			if here().light then
 				return translate_now(solarscale_locale, 'solarscale_ally_tower_level_3_room_2_lit');
+				return translate_now("solarscale_locale", 'solarscale_ally_tower_level_3_room_2_lit');
 			else
 				return translate_now(solarscale_locale, 'solarscale_ally_tower_level_3_room_2_dark');
+				return translate_now("solarscale_locale", 'solarscale_ally_tower_level_3_room_2_dark');
 			end;
     elseif here()^'tower_level_2_room_2' then
 			return translate_now(solarscale_locale, 'solarscale_ally_tower_level_2_room_2');
+			return translate_now("solarscale_locale", 'solarscale_ally_tower_level_2_room_2');
 		elseif here()^'tower_level_1_room_2' then
 			return translate_now(solarscale_locale, 'solarscale_ally_tower_level_1_room_2');
+			return translate_now("solarscale_locale", 'solarscale_ally_tower_level_1_room_2');
 		end;
 		return translate_now(solarscale_locale, 'solarscale_ally_follows');
+		return translate_now("solarscale_locale", 'solarscale_ally_follows');
 	end;
 	act = function(s)
 		walkin('solarscale_ally_dlg');
@@ @@ -56,44 +56,44 @@ obj { @@
 			if (here() ~= where('solarscale_ally')) then
 				if here()^'crater_near_tower' then
 					p(translate_now(solarscale_locale, 'solarscale_ally_near_tower_life'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_near_tower_life'));
         elseif here()^'above_forest' and not solarscale_glade_visited then
 					p(translate_now(solarscale_locale, 'solarscale_ally_glade_suggestion'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_glade_suggestion'));
         elseif here()^'forest_glade' and not solarscale_glade_visited then
           solarscale_glade_visited = true;
 					p(translate_now(solarscale_locale, 'solarscale_ally_glade_life'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_glade_life'));
 				elseif here()^'tower_level_1' and not s.level_1_visited then
 					s.level_1_visited = true;
 					p(translate_now(solarscale_locale, 'solarscale_ally_tower_level_1_life'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_tower_level_1_life'));
 				elseif here()^'tower_level_2' and not s.level_2_visited then
 					s.level_2_visited = true;
 					p(translate_now(solarscale_locale, 'solarscale_ally_tower_level_2_life'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_tower_level_2_life'));
 				elseif here()^'tower_level_3' and not s.level_3_visited then
 					s.level_3_visited = true;
 					p(translate_now(solarscale_locale, 'solarscale_ally_tower_level_3_life'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_tower_level_3_life'));
 				elseif here()^'tower_level_4' and not s.level_4_visited then
 					s.level_4_visited = true;
 					p(translate_now(solarscale_locale, 'solarscale_ally_tower_level_4_life'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_tower_level_4_life'));
 				elseif here()^'tower_level_4_room_2' and not s.level_4_2_visited then
 					s.level_4_2_visited = true;
 					p(translate_now(solarscale_locale, 'solarscale_ally_tower_level_4_room_2_life'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_tower_level_4_room_2_life'));
 				elseif here()^'tower_level_3_room_2' and not s.level_3_2_visited then
 					s.level_3_2_visited = true;
 					p(translate_now(solarscale_locale, 'solarscale_ally_tower_level_3_room_2_life'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_tower_level_3_room_2_life'));
 				elseif here()^'tower_level_2_room_2' and not s.level_2_2_visited then
 					s.level_2_2_visited = true;
 					p(translate_now(solarscale_locale, 'solarscale_ally_tower_level_2_room_2_life'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_tower_level_2_room_2_life'));
 				elseif here()^'tower_level_1_room_2' and not s.level_1_2_visited then
 					s.level_1_2_visited = true;
 					p(translate_now(solarscale_locale, 'solarscale_ally_tower_level_1_room_2_life'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_tower_level_1_room_2_life'));
 				elseif here()^'above_forest' and where('solarscale_ally') and where('solarscale_ally')^'forest_glade' then
 					p(translate_now(solarscale_locale, 'solarscale_ally_glade_left'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_glade_left'));
         elseif where('solarscale_ally') and where('solarscale_ally')^'inside_crater_glade' and here()^'above_crater' and not s.crater_left then
           s.crater_left = true;
           p(translate_now(solarscale_locale, 'solarscale_ally_above_crater_life'));
+          p(translate_now("solarscale_locale", 'solarscale_ally_above_crater_life'));
 				else
 					p(translate_now(solarscale_locale, 'solarscale_ally_follow_life'));
+					p(translate_now("solarscale_locale", 'solarscale_ally_follow_life'));
 				end;
 				remove('solarscale_ally', where('solarscale_ally'));
 				put('solarscale_ally', where(pl));
@@ @@ -113,12 +113,12 @@ obj { @@
       end;
 		end;
 	end;
 	used = translate(solarscale_locale, 'solarscale_used');
+	used = translate("solarscale_locale", 'solarscale_used');
+}
 dlg {
 	nam = 'solarscale_ally_dlg';
 	disp = translate(solarscale_locale, 'disp');
+	disp = translate("solarscale_locale", 'disp');
 	pic = function(s)
 		local pic = std.call(from(), 'pic');
 		local spic = 'images/characters/solarscale.png';
@@ @@ -140,129 +140,129 @@ dlg { @@
     local ss = _'solarscale_ally'
 		local from = here():from();
 		if from^'above_forest' and not solarscale_glade_visited then
       return translate_now(solarscale_locale, 'solarscale_ally_glade_suggestion');
+      return translate_now("solarscale_locale", 'solarscale_ally_glade_suggestion');
     elseif (from^'above_crater' or from^'above_near_village' or from^'above_village' or from^'above_west' or from^'near_village') and not solarscale_glade_visited and not ss.crater_left_discussed then
       return translate_now(solarscale_locale, 'solarscale_ally_dlg_above_crater_enter');
+      return translate_now("solarscale_locale", 'solarscale_ally_dlg_above_crater_enter');
     elseif from^'above_forest' or from^'above_crater' or from^'inside_crater_path' or from ^'inside_crater_glade' or from^'above_west' then
 			return translate_now(solarscale_locale, 'solarscale_ally_dlg_enter_back_to_tower_' .. tostring(rnd(3)));
+			return translate_now("solarscale_locale", 'solarscale_ally_dlg_enter_back_to_tower_' .. tostring(rnd(3)));
     elseif ss.level_1_visited and not ss.tower_discussed then
       push(); --Add root phrase to the tree
       push('#about_tower_1');
       ss.tower_discussed = true;
       return translate_now(solarscale_locale, 'solarscale_ally_tower_first_enter');
+      return translate_now("solarscale_locale", 'solarscale_ally_tower_first_enter');
 		elseif from^'tower_level_4_room_2' then
       local phrase = translate_now(solarscale_locale, 'solarscale_ally_terminal');
+      local phrase = translate_now("solarscale_locale", 'solarscale_ally_terminal');
 			if power_on then
 				if pc_status ~= 'fail' then
 					phrase = phrase .. ' ' .. translate_now(solarscale_locale, 'solarscale_ally_terminal_try');
+					phrase = phrase .. ' ' .. translate_now("solarscale_locale", 'solarscale_ally_terminal_try');
 				end;
 			end;
       return phrase;
     elseif from^'tower_level_3_room_2' then
       if not from.light then
         return translate_now(solarscale_locale, 'solarscale_ally_level_3_2');
+        return translate_now("solarscale_locale", 'solarscale_ally_level_3_2');
       end;
     elseif from^'crater_near_tower' then
       return translate_now(solarscale_locale, 'solarscale_ally_near_tower');
+      return translate_now("solarscale_locale", 'solarscale_ally_near_tower');
 		elseif from^'forest_glade' then
       return translate_now(solarscale_locale, 'solarscale_ally_glade_enter');
+      return string.gsub(translate_now("solarscale_locale", 'solarscale_ally_glade'), '[{}]', '') .. ' ' .. translate_now("solarscale_locale", 'solarscale_ally_glade_enter');
 		elseif from^'above_village' then
 			return translate_now(solarscale_locale, 'solarscale_ally_above_village');
+			return translate_now("solarscale_locale", 'solarscale_ally_above_village');
     else
       return translate_now(solarscale_locale, 'solarscale_dlg_enter_generic_' .. tostring(rnd(3)));
+      return translate_now("solarscale_locale", 'solarscale_dlg_enter_generic_' .. tostring(rnd(3)));
 		end;
 	end;
 	phr = {
     {cond=function(s) return not solarscale_glade_visited and here():from()^'above_forest' end, translate(solarscale_locale, 'solarscale_ally_glade_question'), translate(solarscale_locale, 'solarscale_ally_glade_answer')};
     {'#above_crater_1', cond=function(s) return (from()^'above_crater' or from()^'above_near_village' or from()^'above_village' or from()^'above_west' or from()^'near_village') and not solarscale_glade_visited and not _'solarscale_ally'.crater_left_discussed end, translate(solarscale_locale, 'solarscale_ally_dlg_above_crater_1'), function(s)
     {cond=function(s) return not solarscale_glade_visited and here():from()^'above_forest' end, translate("solarscale_locale", 'solarscale_ally_glade_question'), translate("solarscale_locale", 'solarscale_ally_glade_answer')};
     {'#above_crater_1', cond=function(s) return (from()^'above_crater' or from()^'above_near_village' or from()^'above_village' or from()^'above_west' or from()^'near_village') and not solarscale_glade_visited and not _'solarscale_ally'.crater_left_discussed end, translate("solarscale_locale", 'solarscale_ally_dlg_above_crater_1'), function(s)
       close('#above_crater_1');
       close('#above_crater_2');
       close('#above_crater_3');
       return translate_now(solarscale_locale, 'solarscale_ally_dlg_above_crater_1_response')
+      return translate_now("solarscale_locale", 'solarscale_ally_dlg_above_crater_1_response')
     end;};
     {'#above_crater_2', cond=function(s) return (from()^'above_crater' or from()^'above_near_village' or from()^'above_village' or from()^'above_west' or from()^'near_village') and not solarscale_glade_visited and not _'solarscale_ally'.crater_left_discussed and tower_seen end, translate(solarscale_locale, 'solarscale_ally_dlg_above_crater_2'), function(s)
+    {'#above_crater_2', cond=function(s) return (from()^'above_crater' or from()^'above_near_village' or from()^'above_village' or from()^'above_west' or from()^'near_village') and not solarscale_glade_visited and not _'solarscale_ally'.crater_left_discussed and tower_seen end, translate("solarscale_locale", 'solarscale_ally_dlg_above_crater_2'), function(s)
       close('#above_crater_1');
       close('#above_crater_2');
       close('#above_crater_3');
       return translate_now(solarscale_locale, 'solarscale_ally_dlg_above_crater_2_response');
+      return translate_now("solarscale_locale", 'solarscale_ally_dlg_above_crater_2_response');
     end;};
     {'#above_crater_3', cond=function(s) return (from()^'above_crater' or from()^'above_near_village' or from()^'above_village' or from()^'above_west' or from()^'near_village') and not solarscale_glade_visited and not _('solarscale_ally').crater_left_discussed and not tower_seen end, translate(solarscale_locale, 'solarscale_ally_dlg_above_crater_3'), function(s)
+    {'#above_crater_3', cond=function(s) return (from()^'above_crater' or from()^'above_near_village' or from()^'above_village' or from()^'above_west' or from()^'near_village') and not solarscale_glade_visited and not _('solarscale_ally').crater_left_discussed and not tower_seen end, translate("solarscale_locale", 'solarscale_ally_dlg_above_crater_3'), function(s)
       close('#above_crater_1');
       close('#above_crater_2');
       close('#above_crater_3');
       return translate_now(solarscale_locale, 'solarscale_ally_dlg_above_crater_3_response')
+      return translate_now("solarscale_locale", 'solarscale_ally_dlg_above_crater_3_response')
     end;};
     {cond = function(s) return not _('solarscale_ally').tower_know_discussed end; translate(solarscale_locale, 'solarscale_ally_dlg_know_tower'), function(s)
+    {cond = function(s) return not _('solarscale_ally').tower_know_discussed end; translate("solarscale_locale", 'solarscale_ally_dlg_know_tower'), function(s)
       _('solarscale_ally').tower_know_discussed = true;
       if tower_seen then
         return translate_now(solarscale_locale, 'solarscale_ally_dlg_know_tower_response_visited');
+        return translate_now("solarscale_locale", 'solarscale_ally_dlg_know_tower_response_visited');
       else
         return translate_now(solarscale_locale, 'solarscale_ally_dlg_know_tower_response_not_visited');
+        return translate_now("solarscale_locale", 'solarscale_ally_dlg_know_tower_response_not_visited');
       end;
     end, only=true,
       {translate(solarscale_locale, 'solarscale_ally_dlg_know_tower_1'), translate(solarscale_locale, 'solarscale_ally_dlg_know_tower_1_response')},
       {translate(solarscale_locale, 'solarscale_ally_dlg_know_tower_2'), translate(solarscale_locale, 'solarscale_ally_dlg_know_tower_2_response')},
       {translate("solarscale_locale", 'solarscale_ally_dlg_know_tower_1'), translate("solarscale_locale", 'solarscale_ally_dlg_know_tower_1_response')},
       {translate("common_locale", 'dlg_keep_silent'), translate("solarscale_locale", 'solarscale_ally_dlg_know_tower_2_response')},
     };
     {false, '#about_tower_1', only=true,
       {translate(solarscale_locale, 'solarscale_ally_dlg_about_tower_1_1'), translate(solarscale_locale, 'solarscale_nods_in_agreement')};
       {translate(solarscale_locale, 'solarscale_ally_dlg_about_tower_1_2'), translate(solarscale_locale, 'solarscale_nods_in_agreement')};
       {translate(solarscale_locale, 'solarscale_ally_dlg_about_tower_1_3'), translate(solarscale_locale, 'solarscale_nods_in_agreement')};
       {translate(solarscale_locale, 'solarscale_ally_dlg_about_tower_1_4'), translate(solarscale_locale, 'solarscale_nods_in_agreement')};
       {translate("solarscale_locale", 'solarscale_ally_dlg_about_tower_1_1'), translate("solarscale_locale", 'solarscale_nods_in_agreement')};
       {translate("solarscale_locale", 'solarscale_ally_dlg_about_tower_1_2'), translate("solarscale_locale", 'solarscale_nods_in_agreement')};
       {translate("solarscale_locale", 'solarscale_ally_dlg_about_tower_1_3'), translate("solarscale_locale", 'solarscale_nods_in_agreement')};
       {translate("solarscale_locale", 'solarscale_ally_dlg_about_tower_1_4'), translate("solarscale_locale", 'solarscale_nods_in_agreement')};
     };
     {cond=function(s) return _'solarscale_ally'.tower_discussed and not _'solarscale_ally'.after_discussed end, only=true, translate(solarscale_locale, 'solarscale_ally_dlg_after_tower'), function(s)
+    {cond=function(s) return _'solarscale_ally'.tower_discussed and not _'solarscale_ally'.after_discussed end, only=true, translate("solarscale_locale", 'solarscale_ally_dlg_after_tower'), function(s)
       _'solarscale_ally'.after_discussed = true;
       return translate_now(solarscale_locale, 'solarscale_ally_dlg_after_tower_response')
+      return translate_now("solarscale_locale", 'solarscale_ally_dlg_after_tower_response')
     end,
       {translate(solarscale_locale, 'solarscale_ally_dlg_after_tower_1'), translate(solarscale_locale, 'solarscale_ally_dlg_after_tower_1_response')};
       {translate(solarscale_locale, 'solarscale_don_t_know'), translate(solarscale_locale, 'solarscale_ally_dlg_after_tower_2_response')};
       {cond=function(s) return tower_accept_level >= 2 end, translate(solarscale_locale, 'solarscale_ally_dlg_after_tower_3'), translate(solarscale_locale, 'solarscale_ally_dlg_after_tower_3_response')};
       {translate("solarscale_locale", 'solarscale_ally_dlg_after_tower_1'), translate("solarscale_locale", 'solarscale_ally_dlg_after_tower_1_response')};
       {translate("solarscale_locale", 'solarscale_don_t_know'), translate("solarscale_locale", 'solarscale_ally_dlg_after_tower_2_response')};
       {cond=function(s) return tower_accept_level >= 2 end, translate("solarscale_locale", 'solarscale_ally_dlg_after_tower_3'), translate("solarscale_locale", 'solarscale_ally_dlg_after_tower_3_response')};
     };
     {cond=function(s) return tower_accept_level >= 3 and not _'solarscale_ally'.connection_discussed end, translate(solarscale_locale, 'solarscale_ally_dlg_connection'), translate(solarscale_locale, 'solarscale_ally_dlg_connection_response'), only=true;
       {translate(solarscale_locale, 'solarscale_ally_dlg_connection_1'), function(s)
     {cond=function(s) return tower_accept_level >= 3 and not _'solarscale_ally'.connection_discussed end, translate("solarscale_locale", 'solarscale_ally_dlg_connection'), translate("solarscale_locale", 'solarscale_ally_dlg_connection_response'), only=true;
       {translate("solarscale_locale", 'solarscale_ally_dlg_connection_1'), function(s)
         _'solarscale_ally'.connection_discussed = true;
         return translate_now(solarscale_locale, 'solarscale_ally_dlg_connection_1_response');
+        return translate_now("solarscale_locale", 'solarscale_ally_dlg_connection_1_response');
       end, only=true;
         {translate(solarscale_locale, 'solarscale_ally_dlg_connection_1_1'), translate(solarscale_locale, 'solarscale_ally_dlg_connection_1_1_response')};
         {translate(solarscale_locale, 'solarscale_ally_dlg_connection_1_2'), translate(solarscale_locale, 'solarscale_ally_dlg_connection_1_2_response')};
         {translate(solarscale_locale, 'solarscale_ally_dlg_connection_1_3'), translate(solarscale_locale, 'solarscale_ally_dlg_connection_1_3_response')};
         {translate("solarscale_locale", 'solarscale_ally_dlg_connection_1_1'), translate("solarscale_locale", 'solarscale_ally_dlg_connection_1_1_response')};
         {translate("solarscale_locale", 'solarscale_ally_dlg_connection_1_2'), translate("solarscale_locale", 'solarscale_ally_dlg_connection_1_2_response')};
         {translate("solarscale_locale", 'solarscale_ally_dlg_connection_1_3'), translate("solarscale_locale", 'solarscale_ally_dlg_connection_1_3_response')};
       };
       {translate(solarscale_locale, 'solarscale_ally_dlg_connection_2'), translate(solarscale_locale, 'solarscale_ally_dlg_connection_2_response')};
+      {translate("solarscale_locale", 'solarscale_ally_dlg_connection_2'), translate("solarscale_locale", 'solarscale_ally_dlg_connection_2_response')};
     };
 		{cond=function(s) return here():from()^'tower_level_1' and not have('tower_box') and not _('tower_level_1').keys_taken and not have('tower_level_2_key') and _('level_1_up'):disabled() end, translate(solarscale_locale, 'solarscale_ally_dlg_level_1_1'), translate(solarscale_locale, 'solarscale_ally_dlg_level_1_1_response')};
     {cond=function(s) return here():from()^'tower_level_1' and have('tower_box') and not _('tower_level_1').keys_taken and _('level_1_up'):disabled() end, translate(solarscale_locale, 'solarscale_do_you_have_any_ideas'), translate(solarscale_locale, 'solarscale_ally_dlg_level_1_2_response'),
 		{cond=function(s) return here():from()^'tower_level_1' and not have('tower_box') and not _('tower_level_1').keys_taken and not have('tower_level_2_key') and _('level_1_up'):disabled() end, translate("solarscale_locale", 'solarscale_ally_dlg_level_1_1'), translate("solarscale_locale", 'solarscale_ally_dlg_level_1_1_response')};
     {cond=function(s) return here():from()^'tower_level_1' and have('tower_box') and not _('tower_level_1').keys_taken and _('level_1_up'):disabled() end, translate("solarscale_locale", 'solarscale_do_you_have_any_ideas'), translate("solarscale_locale", 'solarscale_ally_dlg_level_1_2_response'),
 			only=true;
 			{function(s) return '[' .. translate_now(solarscale_locale, 'solarscale_pass_box') .. '] ' .. translate_now(solarscale_locale, 'solarscale_accept_help') end, translate(solarscale_locale, 'solarscale_ally_dlg_level_1_2_agree_response')};
 			{translate(solarscale_locale, 'solarscale_ally_dlg_not_now'), translate(solarscale_locale, 'solarscale_ally_dlg_not_now_response')};
 			{function(s) return '[' .. translate_now("solarscale_locale", 'solarscale_pass_box') .. '] ' .. translate_now("solarscale_locale", 'solarscale_accept_help') end, translate("solarscale_locale", 'solarscale_ally_dlg_level_1_2_agree_response')};
 			{translate("solarscale_locale", 'solarscale_ally_dlg_not_now'), translate("solarscale_locale", 'solarscale_nods_silently')};
 		};
     {cond=function(s) return here():from()^'tower_level_1' and not have('tower_box') and _('tower_level_1').keys_taken and not have('tower_level_2_key') and _('level_1_up'):disabled() end, translate(solarscale_locale, 'solarscale_do_you_have_any_ideas'), translate(solarscale_locale, 'solarscale_ally_dlg_level_1_3_response'),
+    {cond=function(s) return here():from()^'tower_level_1' and not have('tower_box') and _('tower_level_1').keys_taken and not have('tower_level_2_key') and _('level_1_up'):disabled() end, translate("solarscale_locale", 'solarscale_do_you_have_any_ideas'), translate("solarscale_locale", 'solarscale_ally_dlg_level_1_3_response'),
 			only=true;
 			{translate(solarscale_locale, 'solarscale_ally_dlg_level_1_3_1'), translate(solarscale_locale, 'solarscale_ally_dlg_level_1_3_1_or_2_response')};
 			{translate(solarscale_locale, 'solarscale_ally_dlg_level_1_3_2'), translate(solarscale_locale, 'solarscale_ally_dlg_level_1_3_1_or_2_response')};
 			{translate(solarscale_locale, 'solarscale_ally_dlg_level_1_3_3'), translate(solarscale_locale, 'solarscale_ally_dlg_level_1_3_3_response')};
 			{translate("solarscale_locale", 'solarscale_ally_dlg_level_1_3_1'), translate("solarscale_locale", 'solarscale_ally_dlg_level_1_3_1_or_2_response')};
 			{translate("solarscale_locale", 'solarscale_ally_dlg_level_1_3_2'), translate("solarscale_locale", 'solarscale_ally_dlg_level_1_3_1_or_2_response')};
 			{translate("solarscale_locale", 'solarscale_ally_dlg_level_1_3_3'), translate("solarscale_locale", 'solarscale_ally_dlg_level_1_3_3_response')};
 		};
     {cond=function(s) return here():from()^'tower_level_1' and have('tower_box') and _('tower_level_1').keys_taken and not have('tower_level_2_key') and _('level_1_up'):disabled() end, translate(solarscale_locale, 'solarscale_do_you_have_any_ideas'), translate(solarscale_locale, 'solarscale_ally_dlg_level_1_4_response'),
+    {cond=function(s) return here():from()^'tower_level_1' and have('tower_box') and _('tower_level_1').keys_taken and not have('tower_level_2_key') and _('level_1_up'):disabled() end, translate("solarscale_locale", 'solarscale_do_you_have_any_ideas'), translate("solarscale_locale", 'solarscale_ally_dlg_level_1_4_response'),
 			only=true;
 			{function(s) return '[' .. translate_now(solarscale_locale, 'solarscale_pass_items_level_1') .. '] ' .. translate_now(solarscale_locale, 'solarscale_accept_help') end, function(s)
+			{function(s) return '[' .. translate_now("solarscale_locale", 'solarscale_pass_items_level_1') .. '] ' .. translate_now("solarscale_locale", 'solarscale_accept_help') end, function(s)
 				if solarscale_helps > 0 then
 					open('#level1_agree');
 					open('#level1_disagree');
 					close('#level1_no_help');
 					return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_1_4_1_response');
+					return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_1_4_1_response') .. ' ' .. translate_now("solarscale_locale", 'solarscale_ally_dlg_level_1_4_1_response_positive');
 				else
 					close('#level1_agree');
 					close('#level1_disagree');
 					open('#level1_no_help');
 					return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_1_4_1_response_negative');
+					return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_1_4_1_response') .. ' ' .. translate_now("solarscale_locale", 'solarscale_ally_dlg_level_1_4_1_response_negative');
 				end;
 			end,
 				only=true;
 				{'#level1_agree', translate(solarscale_locale, 'solarscale_accept_help'), function(s)
+				{'#level1_agree', translate("solarscale_locale", 'solarscale_accept_help'), function(s)
 					remove('tower_box', pl);
 					remove('tower_hint_1', pl);
 					remove('tower_key_0', pl);
@@ @@ -271,30 +271,30 @@ dlg { @@
 					remove('tower_key_3', pl);
 					take('tower_level_2_key');
 					solarscale_helps = solarscale_helps - 1;
 					return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_1_4_1_1_response');
+					return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_1_4_1_1_response');
 				end};
 				{'#level1_disagree', translate(solarscale_locale, 'solarscale_ally_reject_help'), translate(solarscale_locale, 'solarscale_ally_dlg_level_1_4_1_no_help_response')};
 				{'#level1_no_help', translate(solarscale_locale, 'solarscale_ally_no_help'), translate(solarscale_locale, 'solarscale_ally_dlg_level_1_4_1_no_help_response')};
 				{'#level1_disagree', translate("solarscale_locale", 'solarscale_ally_reject_help'), translate("solarscale_locale", 'solarscale_ally_dlg_level_1_4_1_no_help_response')};
 				{'#level1_no_help', translate("solarscale_locale", 'solarscale_ally_no_help'), translate("solarscale_locale", 'solarscale_ally_dlg_level_1_4_1_no_help_response')};
 			};
-			{translate(solarscale_locale, 'solarscale_ally_dlg_not_now'), translate(solarscale_locale, 'solarscale_ally_dlg_not_now_response')};
+			{translate("solarscale_locale", 'solarscale_ally_dlg_not_now'), translate("solarscale_locale", 'solarscale_nods_silently')};
 		};
     {cond=function(s) return here():from()^'tower_level_2' end, translate(solarscale_locale, 'solarscale_ally_dlg_level_2_1'), translate(solarscale_locale, 'solarscale_ally_dlg_level_2_1_response'),
 			{translate(solarscale_locale, 'solarscale_ally_dlg_level_2_1_1'), translate(solarscale_locale, 'solarscale_ally_dlg_level_2_1_1_response')};
     {cond=function(s) return here():from()^'tower_level_2' end, translate("solarscale_locale", 'solarscale_ally_dlg_level_2_1'), translate("solarscale_locale", 'solarscale_ally_dlg_level_2_1_response'),
 			{translate("solarscale_locale", 'solarscale_ally_dlg_level_2_1_1'), translate("solarscale_locale", 'solarscale_ally_dlg_level_2_1_1_response')};
 		};
     {cond=function(s) return here():from()^'tower_level_3' and _('level_3_up'):disabled() end, translate(solarscale_locale, 'solarscale_ally_dlg_level_3_1'), function(s)
+    {cond=function(s) return here():from()^'tower_level_3' and _('level_3_up'):disabled() end, translate("solarscale_locale", 'solarscale_ally_dlg_level_3_1'), function(s)
 			if solarscale_helps > 0 then
 				open('#level3_agree');
 				open('#level3_disagree');
 				close('#level3_no_help');
 				return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_3_1_response');
+				return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_3_1_response');
 			else
 				close('#level3_agree');
 				close('#level3_disagree');
 				open('#level3_no_help');
 				return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_3_1_response_negative');
+				return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_3_1_response_negative');
 			end;
 		end, only=true,
 			{"#level3_agree", translate(solarscale_locale, 'solarscale_accept_help'), function(s)
+			{"#level3_agree", translate("solarscale_locale", 'solarscale_accept_help'), function(s)
 				remove('figure_wolf', pl);
 				remove('figure_tiger', pl);
 				remove('figure_lion', pl);
@@ @@ -303,27 +303,27 @@ dlg { @@
 				_('tower_level_3_table').solved = true;
 				_('level_3_up'):enable();
 				solarscale_helps = solarscale_helps - 1;
 				return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_3_1_1_response');
+				return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_3_1_1_response');
 			end};
 			{"#level3_disagree", translate(solarscale_locale, 'solarscale_let_me_try'), translate(solarscale_locale, 'solarscale_nods_silently')};
 			{"#level3_no_help", translate(solarscale_locale, 'solarscale_let_me_try_2'), translate(solarscale_locale, 'solarscale_nods_silently')};
 			{"#level3_disagree", translate("solarscale_locale", 'solarscale_let_me_try'), translate("solarscale_locale", 'solarscale_nods_silently')};
 			{"#level3_no_help", translate("solarscale_locale", 'solarscale_let_me_try_2'), translate("solarscale_locale", 'solarscale_nods_silently')};
 		};
     {cond=function(s) return here():from()^'tower_level_4' and _('level_4_next_room'):disabled() end, translate(solarscale_locale, 'solarscale_do_you_have_any_ideas'), function(s)
+    {cond=function(s) return here():from()^'tower_level_4' and _('level_4_next_room'):disabled() end, translate("solarscale_locale", 'solarscale_do_you_have_any_ideas'), function(s)
 			if solarscale_helps > 0 then
 				open('#level4_agree');
 				open('#level4_disagree');
 				close('#level4_no_help');
 				return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_1_response');
+				return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_1_response');
 			else
 				close('#level4_agree');
 				close('#level4_disagree');
 				open('#level4_no_help');
 				return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_1_response_negative');
+				return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_1_response_negative');
 			end;
 		end, only=true,
 			{"#level4_agree", translate(solarscale_locale, 'solarscale_ally_dlg_level_4_1_1'), function(s)
+			{"#level4_agree", translate("solarscale_locale", 'solarscale_ally_dlg_level_4_1_1'), function(s)
 				candles_solved = true;
 				_('level_3_up'):enable();
 				solarscale_helps = solarscale_helps - 1;
@@ @@ -339,70 +339,70 @@ dlg { @@
 				_('level_4_next_room'):enable();
 				return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_1_1_response');
+				return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_1_1_response');
 			end};
 			{"#level4_disagree", translate(solarscale_locale, 'solarscale_let_me_try'), translate(solarscale_locale, 'solarscale_nods_silently')};
 			{"#level4_no_help", translate(solarscale_locale, 'solarscale_let_me_try_2'), translate(solarscale_locale, 'solarscale_nods_silently')};
 			{"#level4_disagree", translate("solarscale_locale", 'solarscale_let_me_try'), translate("solarscale_locale", 'solarscale_nods_silently')};
 			{"#level4_no_help", translate("solarscale_locale", 'solarscale_let_me_try_2'), translate("solarscale_locale", 'solarscale_nods_silently')};
 		};
     {cond=function(s) return here():from()^'tower_level_4_room_2' and power_on and pc_status ~= 'fail' end, translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1'), function(s)
 			p(translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_response_turnon'));
     {cond=function(s) return here():from()^'tower_level_4_room_2' and power_on and pc_status ~= 'fail' end, translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1'), function(s)
 			p(translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_turnon'));
 			local rval = _('system_unit'):check(true);
 			close('#tl4r2a');
       close('#tl4r2b');
-		</i>
 			if rval == 'motherboard' then
 				p(translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_response_motherboard'));
+				p(translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_issue', {broken=translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_motherboard')}));
         open('#tl4r2b');
 				return;
 			elseif rval == 'cpu' then
-				p(translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_response_cpu'));
+        p(translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_issue', {broken=translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_cpu')}));
         open('#tl4r2b');
 				return;
 			elseif rval == 'ram' then
-				p(translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_response_ram'));
+        p(translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_issue', {broken=translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_ram')}));
         open('#tl4r2b');
 				return;
 			elseif rval == 'video' then
-				p(translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_response_video'));
+        p(translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_issue', {broken=translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_video')}));
         open('#tl4r2b');
 				return;
 			elseif rval == 'keyboard' then
-				p(translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_response_keyboard'));
+        p(translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_issue', {broken=translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_keyboard')}));
         open('#tl4r2b');
 				return;
       elseif rval == 'network' then
-				p(translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_response_network'));
+        p(translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_issue', {broken=translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_network')}));
         open('#tl4r2b');
 				return;
 			end;
 			open('#tl4r2a');
 			p(translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_response_fixed'));
+			p(translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_response_fixed'));
 		end,
+		{
 			'#tl4r2a', translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_1'),
+			'#tl4r2a', translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_1'),
 			function(s)
 				walkin('terminal');
 			end;
 		},
 		{'#tl4r2b', translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2'), function(s)
+		{'#tl4r2b', translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2'), function(s)
 			if have('part_box') then
 				if solarscale_helps > 0 then
 					open('#tl4r2cfa');
 					open('#tl4r2cfb');
 					close('#tl4r2cfc');
 					close('#tl4r2cfd');
 					return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_response');
+					return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_response');
 				else
 					close('#tl4r2cfa');
 					close('#tl4r2cfb');
 					close('#tl4r2cfc');
 					open('#tl4r2cfd');
 					return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_response_negative');
+					return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_response_negative');
 				end;
 			else
 				if solarscale_helps > 0 then
@@ @@ -410,17 +410,17 @@ dlg { @@
           close('#tl4r2cfb');
           close('#tl4r2cfd');
           open('#tl4r2cfc');
 					return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_response_no_parts');
+					return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_response_no_parts');
 				else
           close('#tl4r2cfa');
 					close('#tl4r2cfb');
 					close('#tl4r2cfc');
 					open('#tl4r2cfd');
 					return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_response_negative');
+					return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_response_negative');
 				end;
 			end;
 		end, only=true,
 			{'#tl4r2cfa', translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_1'), function(s)
+			{'#tl4r2cfa', translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_1'), function(s)
 				walkout();
 				local motherboard = lookup('#motherboard', _'system_unit');
 				local cpu= lookup('#cpu', _'system_unit');
@@ @@ -485,37 +485,37 @@ dlg { @@
 				lookup('#computer', 'tower_level_4_room_2').assembled = true;
 				return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_1_response');
+				return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_1_response');
 			end},
 			{'#tl4r2cfb', translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_2'), function(s)
+			{'#tl4r2cfb', translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_2'), function(s)
 				walkout();
 				return translate_now(solarscale_locale, 'solarscale_nods_silently');
+				return translate_now("solarscale_locale", 'solarscale_nods_silently');
 			end},
 			{'#tl4r2cfc', translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_3'), translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_3_response')},
 			{'#tl4r2cfd', translate(solarscale_locale, 'solarscale_ally_dlg_end'), function(s)
 			{'#tl4r2cfc', translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_3'), translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_3_response')},
 			{'#tl4r2cfd', translate("solarscale_locale", 'solarscale_ally_dlg_end'), function(s)
 				walkout();
 			end}
 		};
+		{
 			'#tl4r2c', translate(solarscale_locale, 'solarscale_ally_dlg_end'),
+			'#tl4r2c', translate("solarscale_locale", 'solarscale_ally_dlg_end'),
 			function(s)
 				walkout();
 			end;
 		}};
     {cond=function(s) return here():from()^'tower_level_4_room_2' and pc_status == 'fail'; end, translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2'), function(s)
+    {cond=function(s) return here():from()^'tower_level_4_room_2' and pc_status == 'fail'; end, translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2'), function(s)
 			if have('part_box') then
 				if solarscale_helps > 0 then
 					open('#tl4r2fa');
 					open('#tl4r2fb');
 					close('#tl4r2fc');
 					close('#tl4r2fd');
 					return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_response');
+					return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_response');
 				else
 					close('#tl4r2fa');
 					close('#tl4r2fb');
 					close('#tl4r2fc');
 					open('#tl4r2fd');
 					return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_response_negative');
+					return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_response_negative');
 				end;
 			else
 				if solarscale_helps > 0 then
@@ @@ -523,17 +523,17 @@ dlg { @@
           close('#tl4r2fb');
           close('#tl4r2fd');
           open('#tl4r2fc');
 					return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_response_no_parts');
+					return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_response_no_parts');
 				else
           close('#tl4r2fa');
 					close('#tl4r2fb');
 					close('#tl4r2fc');
 					open('#tl4r2fd');
 					return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_response_negative');
+					return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_response_negative');
 				end;
 			end;
 		end, only=true,
 			{'#tl4r2fa', translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_1'), function(s)
+			{'#tl4r2fa', translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_1'), function(s)
 				walkout();
 				local motherboard = lookup('#motherboard', _'system_unit');
 				local cpu= lookup('#cpu', _'system_unit');
@@ @@ -598,48 +598,48 @@ dlg { @@
 				lookup('#computer', 'tower_level_4_room_2').assembled = true;
 				return translate_now(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_1_response');
+				return translate_now("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_1_response');
 			end},
 			{'#tl4r2fb', translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_2'), function(s)
+			{'#tl4r2fb', translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_2'), function(s)
 				walkout();
 				return translate_now(solarscale_locale, 'solarscale_nods_silently');
+				return translate_now("solarscale_locale", 'solarscale_nods_silently');
 			end},
 			{'#tl4r2fc', translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_3'), translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_1_2_3_response')},
 			{'#tl4r2fd', translate(solarscale_locale, 'solarscale_ally_dlg_end'), function(s)
 			{'#tl4r2fc', translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_3'), translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_1_2_3_response')},
 			{'#tl4r2fd', translate("solarscale_locale", 'solarscale_ally_dlg_end'), function(s)
 				walkout();
 			end}
 		};
     {cond=function(s) return here():from()^'tower_level_4_room_2' and not power_on end, translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_3'), translate(solarscale_locale, 'solarscale_ally_dlg_level_4_room_2_3_response')};
+    {cond=function(s) return here():from()^'tower_level_4_room_2' and not power_on end, translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_3'), translate("solarscale_locale", 'solarscale_ally_dlg_level_4_room_2_3_response')};
     {cond=function(s) return here():from()^'tower_level_3_room_2' and not _'tower_level_3_room_2'.light end, translate(solarscale_locale, 'solarscale_ally_dlg_light'), function(s)
+    {cond=function(s) return here():from()^'tower_level_3_room_2' and not _'tower_level_3_room_2'.light end, translate("solarscale_locale", 'solarscale_ally_dlg_light'), function(s)
       if solarscale_helps > 0 then
         open('#level32_agree');
         open('#level32_disagree');
         close('#level32_no_help');
         return translate_now(solarscale_locale, 'solarscale_ally_dlg_light_response')
+        return translate_now("solarscale_locale", 'solarscale_ally_dlg_light_response')
       else
         close('#level32_agree');
         close('#level32_disagree');
         open('#level32_no_help');
         return translate_now(solarscale_locale, 'solarscale_ally_dlg_light_response_negative')
+        return translate_now("solarscale_locale", 'solarscale_ally_dlg_light_response_negative')
       end;
     end, only=true,
       {'#level32_agree', translate(solarscale_locale, 'solarscale_ally_dlg_light_agree'), function(s)
+      {'#level32_agree', translate("solarscale_locale", 'solarscale_ally_dlg_light_agree'), function(s)
         _'tower_level_3_room_2'.light = true;
         lookup('#door', 'tower_level_3_room_2'):enable();
         lookup('#shelves', 'tower_level_3_room_2'):enable();
         _'level_3_room_2_down':enable()
         lookup('#darkness', 'tower_level_3_room_2'):disable();
         return translate_now(solarscale_locale, 'solarscale_ally_dlg_light_agree_response')
+        return translate_now("solarscale_locale", 'solarscale_ally_dlg_light_agree_response')
       end},
       {'#level32_disagree', translate(solarscale_locale, 'solarscale_let_me_try'), translate(solarscale_locale, 'solarscale_nods_silently')},
       {'#level32_no_help', translate(solarscale_locale, 'solarscale_let_me_try_2'), translate(solarscale_locale, 'solarscale_nods_silently')},
       {'#level32_disagree', translate("solarscale_locale", 'solarscale_let_me_try'), translate("solarscale_locale", 'solarscale_nods_silently')},
       {'#level32_no_help', translate("solarscale_locale", 'solarscale_let_me_try_2'), translate("solarscale_locale", 'solarscale_nods_silently')},
     };
     {cond=function(s) return here():from()^'tower_level_1_room_2' and _'solarscale_ally'.tea_found and not _'solarscale_ally'.tea_asked end, translate(solarscale_locale, 'solarscale_ally_ask_tea'), function(s)
+    {cond=function(s) return here():from()^'tower_level_1_room_2' and _'solarscale_ally'.tea_found and not _'solarscale_ally'.tea_asked end, translate("solarscale_locale", 'solarscale_ally_ask_tea'), function(s)
 			_'solarscale_ally'.tea_asked = true;
 			return translate_now(solarscale_locale, 'solarscale_ally_ask_tea_response')
+			return translate_now("solarscale_locale", 'solarscale_ally_ask_tea_response')
 		end};
     {translate(solarscale_locale, 'solarscale_ally_dlg_end'), function(s) walkout(); end};
+    {translate("solarscale_locale", 'solarscale_ally_dlg_end'), function(s) walkout(); end};
 	};
+}
@@ @@ -647,7 +647,7 @@ dlg { @@
   other_dragons = false;
   repeat_question = false;
   nam = 'solarscale_tea_dlg';
   disp = translate(solarscale_locale, 'disp');
+  disp = translate("solarscale_locale", 'disp');
 	pic = function(s)
 		local pic = std.call(from(), 'pic');
 		local spic = 'images/characters/solarscale.png';
@@ @@ -665,101 +665,101 @@ dlg { @@
   theme = function(s)
 		return here():from().theme;
 	end;
   enter = translate(solarscale_locale, 'tea_start');
+  enter = translate("solarscale_locale", 'tea_start');
   phr = {
     {translate(solarscale_locale, 'solarscale_don_t_know'), function(s)
+    {translate("solarscale_locale", 'solarscale_don_t_know'), function(s)
         tea_answer_1 = 2;
         if tower_accept_level == 3 then
           return translate_now(solarscale_locale, 'tea_q1_response_1_tower_accepts');
+          return translate_now("solarscale_locale", 'tea_q1_response_1_tower_accepts');
         else
           return translate_now(solarscale_locale, 'tea_q1_response_1');
+          return translate_now("solarscale_locale", 'tea_q1_response_1');
         end;
     end, next='#question2'};
     {translate(solarscale_locale, 'tea_q1_darkness'), function(s)
+    {translate("solarscale_locale", 'tea_q1_darkness'), function(s)
         if tower_accept_level == 3 then
           return translate_now(solarscale_locale, 'tea_q1_response_1_tower_accepts');
+          return translate_now("solarscale_locale", 'tea_q1_response_1_tower_accepts');
         else
           return translate_now(solarscale_locale, 'tea_q1_response_1');
+          return translate_now("solarscale_locale", 'tea_q1_response_1');
         end;
     end, next='#question2'};
     {translate(solarscale_locale, 'tea_q1_dragons'), function(s)
+    {translate("solarscale_locale", 'tea_q1_dragons'), function(s)
         tea_answer_1 = 1;
         _'solarscale_tea_dlg'.other_dragons = true;
         return translate_now(solarscale_locale, 'tea_q1_response_dragons');
+        return translate_now("solarscale_locale", 'tea_q1_response_dragons');
     end, next='#question2'};
     {cond=function(s) return tower_accept_level == 3 end, translate(solarscale_locale, 'tea_q1_i'), function(s)
+    {cond=function(s) return tower_accept_level == 3 end, translate("solarscale_locale", 'tea_q1_i'), function(s)
       tea_answer_1 = 1;
       return translate_now(solarscale_locale, 'tea_q1_response_i');
+      return translate_now("solarscale_locale", 'tea_q1_response_i');
     end, next='#question2'};
     only=true;
     {false, '#question2',
       {translate(solarscale_locale, 'solarscale_don_t_know'), function(s)
+      {translate("solarscale_locale", 'solarscale_don_t_know'), function(s)
         tea_answer_2 = 2;
         local r = translate_now(solarscale_locale, 'tea_q2_r1');
+        local r = translate_now("solarscale_locale", 'tea_q2_r1');
         if _'solarscale_tea_dlg'.other_dragons then
           return r .. translate_now(solarscale_locale, 'tea_q2_other_dragons_1');
+          return r .. translate_now("solarscale_locale", 'tea_q2_other_dragons_1');
         else
           return r .. translate_now(solarscale_locale, 'tea_q2_other_dragons_2');
+          return r .. translate_now("solarscale_locale", 'tea_q2_other_dragons_2');
         end;
       end, next='#question3'};
       {translate(solarscale_locale, 'tea_q2_me'), function(s)
           local r = translate_now(solarscale_locale, 'tea_q2_r2');
       {translate("solarscale_locale", 'tea_q2_me'), function(s)
           local r = translate_now("solarscale_locale", 'tea_q2_r2');
           if _'solarscale_tea_dlg'.other_dragons then
             return r .. translate_now(solarscale_locale, 'tea_q2_other_dragons_1');
+            return r .. translate_now("solarscale_locale", 'tea_q2_other_dragons_1');
           else
             return r .. translate_now(solarscale_locale, 'tea_q2_other_dragons_2');
+            return r .. translate_now("solarscale_locale", 'tea_q2_other_dragons_2');
           end;
       end, next='#question3'};
       {translate(solarscale_locale, 'tea_q2_us'), function(s)
+      {translate("solarscale_locale", 'tea_q2_us'), function(s)
           tea_answer_2 = 1;
           local r = translate_now(solarscale_locale, 'tea_q2_r3');
+          local r = translate_now("solarscale_locale", 'tea_q2_r3');
           if _'solarscale_tea_dlg'.other_dragons then
             return r .. translate_now(solarscale_locale, 'tea_q2_other_dragons_1');
+            return r .. translate_now("solarscale_locale", 'tea_q2_other_dragons_1');
           else
             return r .. translate_now(solarscale_locale, 'tea_q2_other_dragons_2');
+            return r .. translate_now("solarscale_locale", 'tea_q2_other_dragons_2');
           end;
       end, next='#question3'};
       {translate(solarscale_locale, 'tea_q2_itself'), function(s)
           local r = translate_now(solarscale_locale, 'tea_q2_r1');
       {translate("solarscale_locale", 'tea_q2_itself'), function(s)
           local r = translate_now("solarscale_locale", 'tea_q2_r1');
           if _'solarscale_tea_dlg'.other_dragons then
             return r .. translate_now(solarscale_locale, 'tea_q2_other_dragons_1');
+            return r .. translate_now("solarscale_locale", 'tea_q2_other_dragons_1');
           else
             return r .. translate_now(solarscale_locale, 'tea_q2_other_dragons_2');
+            return r .. translate_now("solarscale_locale", 'tea_q2_other_dragons_2');
           end;
       end, next='#question3'};
       only=true
     };
     {false, '#question3',
       {translate(solarscale_locale, 'tea_q3_know_nothing'), function(s)
+      {translate("solarscale_locale", 'tea_q3_know_nothing'), function(s)
           walkout();
           return translate_now(solarscale_locale, 'tea_q3_r1') .. '^' .. translate_now(solarscale_locale, 'tea_end');
+          return translate_now("solarscale_locale", 'tea_q3_r1') .. '^' .. translate_now("solarscale_locale", 'tea_end');
       end};
       {translate(solarscale_locale, 'tea_q3_thought_alone'), function(s)
+      {translate("solarscale_locale", 'tea_q3_thought_alone'), function(s)
           tea_answer_3 = 1;
           walkout();
           return translate_now(solarscale_locale, 'tea_q3_r1') .. '^' .. translate_now(solarscale_locale, 'tea_end');
+          return translate_now("solarscale_locale", 'tea_q3_r1') .. '^' .. translate_now("solarscale_locale", 'tea_end');
       end};
       {translate(solarscale_locale, 'tea_q3_alone'), function(s)
+      {translate("solarscale_locale", 'tea_q3_alone'), function(s)
           tea_answer_3 = 1;
           walkout();
           return translate_now(solarscale_locale, 'tea_q3_r1') .. '^' .. translate_now(solarscale_locale, 'tea_end');
+          return translate_now("solarscale_locale", 'tea_q3_r1') .. '^' .. translate_now("solarscale_locale", 'tea_end');
       end};
       {translate(solarscale_locale, 'tea_q3_exist'), function(s)
+      {translate("solarscale_locale", 'tea_q3_exist'), function(s)
           tea_answer_3 = 1;
           walkout();
           return translate_now(solarscale_locale, 'tea_q3_r2') .. '^' .. translate_now(solarscale_locale, 'tea_end');
+          return translate_now("solarscale_locale", 'tea_q3_r2') .. '^' .. translate_now("solarscale_locale", 'tea_end');
       end};
       {cond=function(s) return not _'solarscale_tea_dlg'.repeat_question end; translate(solarscale_locale, 'solarscale_don_t_know'), function(s)
+      {cond=function(s) return not _'solarscale_tea_dlg'.repeat_question end; translate("solarscale_locale", 'solarscale_don_t_know'), function(s)
           _'solarscale_tea_dlg'.repeat_question = true;
           return translate_now(solarscale_locale, 'tea_q3_r_try_again');
+          return translate_now("solarscale_locale", 'tea_q3_r_try_again');
       end};
       {cond=function(s) return _'solarscale_tea_dlg'.repeat_question end; translate(solarscale_locale, 'tea_q3_don_t_know_final'); function(s)
+      {cond=function(s) return _'solarscale_tea_dlg'.repeat_question end; translate("solarscale_locale", 'tea_q3_don_t_know_final'); function(s)
           tea_answer_3 = 2;
           walkout();
           if tea_answer_1 == 2 and tea_answer_2 == 2 then
             return translate_now(solarscale_locale, 'tea_q3_r_don_t_know');
+            return translate_now("solarscale_locale", 'tea_q3_r_don_t_know');
           else
             return translate_now(solarscale_locale, 'solarscale_nods_silently') .. '^' .. translate_now(solarscale_locale, 'tea_end');
+            return translate_now("solarscale_locale", 'solarscale_nods_silently') .. '^' .. translate_now("solarscale_locale", 'tea_end');
           end;
       end};
+    }

terminal.lua

➞

Show inline comments

@@ @@ -307,11 +307,11 @@ room { @@
 		if s.status == 'command' then
 			return s.path .. '>' .. s.entry .. '_';
 		elseif s.status == 'crypt' or s.status == 'connect' then
-			return translate_now(computer_locale, 'query_password') .. entry .. '_';
+			return translate_now("terminal_locale", 'query_password') .. entry .. '_';
 		elseif s.status == 'format' then
-			return translate_now(computer_locale, 'query_type_yes') .. entry .. '_';
+			return translate_now("terminal_locale", 'query_type_yes') .. entry .. '_';
 		elseif s.status == 'wait_format' then
-			return translate_now(computer_locale, 'query_formatting') .. " " .. tostring(s.format_percent) .. '%';
+			return translate_now("terminal_locale", 'query_formatting') .. " " .. tostring(s.format_percent) .. '%';
 		elseif s.status == 'format_done' then
 		end;
 		return '';
@@ @@ -320,12 +320,12 @@ room { @@
 	command_preprocessor = function(s, command)
 		if s.status == 'crypt' then
 			s.status = 'command';
-			s:push(translate_now(computer_locale, 'query_password') .. command);
+			s:push(translate_now("terminal_locale", 'query_password') .. command);
 			if command == password1 then
 				s:push(password2);
 				s:push('');
 			else
-				s:push(translate_now(computer_locale, 'invalid_password'));
+				s:push(translate_now("terminal_locale", 'invalid_password'));
 				s:push('');
 			end;
 			s.entry = '';
@@ @@ -333,7 +333,7 @@ room { @@
 		elseif s.status == 'connect' then
 			s.entry = '';
 			s.status = 'command';
-			s:push(translate_now(computer_locale, 'query_password') .. command);
+			s:push(translate_now("terminal_locale", 'query_password') .. command);
 			if command == password2 then
         if irradiated then
           snd.music('sound/bgm_ending_space_irradiated.ogg');
@@ @@ -347,20 +347,20 @@ room { @@
         end;
 			else
-				s:push(translate_now(computer_locale, 'invalid_password_2'));
+				s:push(translate_now("terminal_locale", 'invalid_password_2'));
 			end;
 			return true;
 		elseif s.status == 'format' then
 			s.status = 'format';
 			s.entry = '';
-			s:push(translate_now(computer_locale, 'query_type_yes') .. command);
+			s:push(translate_now("terminal_locale", 'query_type_yes') .. command);
 			--s:push("Type 'Yes' to confirm:" .. command);
 			if command:lower() == 'yes' then
 				s.status = 'wait_format';
 				timer:set(25);
 			else
-				s:push(translate_now(computer_locale, 'operation_cancelled'));
+				s:push(translate_now("terminal_locale", 'operation_cancelled'));
 				s.status = 'command';
 			end;
@@ @@ -378,12 +378,12 @@ room { @@
 				d:replace_line(s:query_formatter(s.path, s.entry));
 			else
 				s.status = 'format_done';
-				s:push(translate_now(computer_locale, 'formatting_complete'));
+				s:push(translate_now("terminal_locale", 'formatting_complete'));
 			end;
 			return false;
 		elseif s.status == 'format_done' then
       if s.format_percent < 120 then
-        s:push(translate_now(computer_locale, 'critical_failure'));
+        s:push(translate_now("terminal_locale", 'critical_failure'));
       end;
 			s.format_percent = s.format_percent + 1;
@@ @@ -421,11 +421,11 @@ room { @@
 		s.history = {};
 		s:process_directory_structure(s.directory_structure['C:']);
-		s:push(translate_now(computer_locale, 'starting_tower'));
+		s:push(translate_now("terminal_locale", 'tower_os_line_1'));
 		s:push('');
-		s:push(translate_now(computer_locale, 'tower_version'));
+		s:push(translate_now("terminal_locale", 'tower_os_line_2'));
 		s:push('');
-		s:push(translate_now(computer_locale, 'type_help'));
+		s:push(translate_now("terminal_locale", 'tower_os_line_3'));
 		s:push('');
 		s:makekeyboard();
@@ @@ -819,17 +819,17 @@ room { @@
 				['DOCS'] = {
 					['PASSWORD.TXT'] = function(s, command, args)
 						if command == 'PRINT.COM' then
-							s:push(translate_now(computer_locale, 'binary_data'));
+							s:push(translate_now("terminal_locale", 'binary_data'));
 						else
-							s:push(translate_now(computer_locale, 'bad_command'));
+							s:push(translate_now("terminal_locale", 'bad_command'));
 						end;
 					end;
 					['CRYPT.COM'] = function(s, command, args)
 						if command == 'PRINT.COM' then
-							s:push(translate_now(computer_locale, 'binary_data'));
+							s:push(translate_now("terminal_locale", 'binary_data'));
 						elseif command == '' then
 							if not args then
-								s:push(translate_now(computer_locale, 'crypt_usage'));
+								s:push(translate_now("terminal_locale", 'crypt_usage'));
 							else
 								local new_args = {};
 								for i in string.gmatch(args, "%S+") do
@@ @@ -839,10 +839,10 @@ room { @@
 								end;
 								if #new_args > 2 then
-									s:push(translate_now(computer_locale, 'crypt_usage'));
+									s:push(translate_now("terminal_locale", 'crypt_usage'));
 									return
 								elseif #new_args < 2 then
-                  s:push(translate_now(computer_locale, 'crypt_key_unset'));
+                  s:push(translate_now("terminal_locale", 'crypt_key_unset'));
 									return;
 								end;
 								local name, path;
@@ @@ -851,15 +851,15 @@ room { @@
 								if name ~= nil and path == 'C:\\DOCS\\PASSWORD.TXT' then
 									name, path = s:walk_directory(new_args[2], true);
 									if name ~= nil and path == 'C:\\DOCS\\KEY.TXT' then
-										s:push(translate_now(computer_locale, 'crypt_key_locked'));
+										s:push(translate_now("terminal_locale", 'crypt_key_locked'));
 										s.status = 'crypt';
 										return true;
 									else
-										s:push(translate_now(computer_locale, 'crypt_invalid_key'));
+										s:push(translate_now("terminal_locale", 'crypt_invalid_key'));
 									end;
 								else
-									s:push(translate_now(computer_locale, 'crypt_unencrypted'));
+									s:push(translate_now("terminal_locale", 'crypt_unencrypted'));
 								end;
 							end;
 						end;
@@ @@ -872,21 +872,21 @@ room { @@
 							s:push('HARDWARE=FALSE');
 							s:push(';KEY=KEY.TXT');
 						else
-							s:push(translate_now(computer_locale, 'bad_command'));
+							s:push(translate_now("terminal_locale", 'bad_command'));
 						end;
 					end;
 					['KEY.TXT'] = function(s, command, args)
 						if command == 'PRINT.COM' then
-							s:push(translate_now(computer_locale, 'binary_data'));
+							s:push(translate_now("terminal_locale", 'binary_data'));
 						else
-							s:push(translate_now(computer_locale, 'bad_command'));
+							s:push(translate_now("terminal_locale", 'bad_command'));
 						end;
 					end;
 				},
 				['SYSTEM'] = {
 					['CONNECT.EXE'] = function(s, command, args)
 						if command == 'PRINT.COM' then
-							s:push(translate_now(computer_locale, 'binary_data'));
+							s:push(translate_now("terminal_locale", 'binary_data'));
 						elseif command == '' then
 							s.status = 'connect';
 							return true;
@@ @@ -894,46 +894,46 @@ room { @@
 					end;
 					['FORMAT.COM'] = function(s, command, args)
 						if command == 'PRINT.COM' then
-							s:push(translate_now(computer_locale, 'binary_data'));
+							s:push(translate_now("terminal_locale", 'binary_data'));
 						elseif command == '' then
 							if args and args:lower() == 'c:' then
 								s.status = 'format';
 								return true;
 							elseif args and string.match(args, "^[A-z]:$") == args then
-								s:push(translate_now(computer_locale, 'format_invalid_device'));
+								s:push(translate_now("terminal_locale", 'format_invalid_device'));
 							else
-                s:push(translate_now(computer_locale, 'format_usage'));
+                s:push(translate_now("terminal_locale", 'format_usage'));
 							end;
 						end;
 					end;
 					['HELP.COM'] = function(s, command, args)
 						if command == 'PRINT.COM' then
-							s:push(translate_now(computer_locale, 'binary_data'));
+							s:push(translate_now("terminal_locale", 'binary_data'));
 						elseif command == '' then
               s:push(translate_now(computer_locale, 'help_cd'));
               s:push(translate_now(computer_locale, 'help_dir'));
               s:push(translate_now(computer_locale, 'help_disk'));
               s:push(translate_now(computer_locale, 'help_connect'));
               s:push(translate_now(computer_locale, 'help_format'));
               s:push(translate_now(computer_locale, 'help_help'));
               s:push(translate_now(computer_locale, 'help_print'));
               s:push(translate_now(computer_locale, 'help_exit'));
               s:push(translate_now(computer_locale, 'help_com_exe'));
               s:push(translate_now("terminal_locale", 'help_cd'));
               s:push(translate_now("terminal_locale", 'help_dir'));
               s:push(translate_now("terminal_locale", 'help_disk'));
               s:push(translate_now("terminal_locale", 'help_connect'));
               s:push(translate_now("terminal_locale", 'help_format'));
               s:push(translate_now("terminal_locale", 'help_help'));
               s:push(translate_now("terminal_locale", 'help_print'));
               s:push(translate_now("terminal_locale", 'help_exit'));
               s:push(translate_now("terminal_locale", 'help_com_exe'));
 						end;
 					end;
 					['PRINT.COM'] = function(s, command, args)
 						if command == 'PRINT.COM' then
-							s:push(translate_now(computer_locale, 'binary_data'));
+							s:push(translate_now("terminal_locale", 'binary_data'));
 						elseif command == '' then
 							if args then
 								local cmd = s:walk_directory(args:upper(), true);
 								if type(cmd) == 'function' then
 									cmd(s, 'PRINT.COM', '')
 								else
-									s:push(translate_now(computer_locale, 'print_no_file'));
+									s:push(translate_now("terminal_locale", 'print_no_file'));
 								end;
 							else
-								s:push(translate_now(computer_locale, 'print_usage'));
+								s:push(translate_now("terminal_locale", 'print_usage'));
 							end;
 						end;
 					end;
@@ @@ -941,9 +941,9 @@ room { @@
 				['AUTOEXEC.BAT'] = function(s, command, args)
 					if command == 'PRINT.COM' then
 						s:push('SET PATH=C:\\SYSTEM');
-            s:push(translate_now(computer_locale, 'connect_comment'));
+            s:push(translate_now("terminal_locale", 'connect_comment'));
 					elseif command == '' then
-						s:push(translate_now(computer_locale, 'bad_command'));
+						s:push(translate_now("terminal_locale", 'bad_command'));
 					end;
 				end;
 				['CONFIG.SYS'] = function(s, command, args)
@@ @@ -956,21 +956,21 @@ room { @@
 						s:push('DEVICE=C:\\SYSTEM\\EMM386.EXE');
 						s:push('DEVICE=C:\\SYSTEM\\TOWER.SYS');
 					elseif command == '' then
-						s:push(translate_now(computer_locale, 'bad_command'));
+						s:push(translate_now("terminal_locale", 'bad_command'));
 					end;
 				end;
 				['COMMAND.COM'] = function(s, command, args)
 					if command == 'PRINT.COM' then
-						s:push(translate_now(computer_locale, 'binary_data'));
+						s:push(translate_now("terminal_locale", 'binary_data'));
 					elseif command == '' then
-						s:push(translate_now(computer_locale, 'command_already_started'));
+						s:push(translate_now("terminal_locale", 'command_already_started'));
 					end;
 				end;
 				['HELLO.TXT'] = function(s, command, args)
 					if command == 'PRINT.COM' then
-            s:push(translate_now(computer_locale, 'hello_txt'));
+            s:push(translate_now("terminal_locale", 'hello_txt'));
 					elseif command == '' then
-						s:push(translate_now(computer_locale, 'bad_command'));
+						s:push(translate_now("terminal_locale", 'bad_command'));
 					end;
 				end;
+			}
@@ @@ -1056,26 +1056,26 @@ room { @@
 				if type(dir) == 'table' then
 					s.path = path .. '\\';
 				else
-          s:push(translate_now(computer_locale, 'cd_invalid_directory', {path=args}));
+          s:push(translate_now("terminal_locale", 'cd_invalid_directory', {path=args}));
 				end;
 			else
-        s:push(translate_now(computer_locale, 'cd_usage'));
+        s:push(translate_now("terminal_locale", 'cd_usage'));
 			end;
 		elseif command == 'ver' then
 			s:push(translate_now(terminal_locale, 'tower_os_line_2'));
+			s:push(translate_now("terminal_locale", 'tower_os_line_2'));
 		elseif command == 'exit' then
 			walk('tower_level_4_room_2');
       return true;
     elseif command == 'rm' and args and #args >= 2 and (args == '-rf . /' or args == '-rf /') then
       s:push(translate_now(terminal_locale, random_phrase({'unix_line_3', 'unix_line_4'})));
+      s:push(translate_now("terminal_locale", random_phrase({'unix_line_3', 'unix_line_4'})));
     elseif command == 'sudo' or command == 'su' or command == 'ls' or command == 'rm' then
       s:push(translate_now(terminal_locale, random_phrase({'unix_line_1', 'unix_line_2'})));
+      s:push(translate_now("terminal_locale", random_phrase({'unix_line_1', 'unix_line_2'})));
     elseif command == 'cat' then
       s:push(translate_now(terminal_locale, random_phrase({'cat_line_1', 'cat_line_2', 'cat_line_3'})));
+      s:push(translate_now("terminal_locale", random_phrase({'cat_line_1', 'cat_line_2', 'cat_line_3'})));
     elseif command == 'more' or command == 'less' then
       s:push(translate_now(terminal_locale, 'more_line_1'));
+      s:push(translate_now("terminal_locale", 'more_line_1'));
     elseif command == 'head' or command == 'tail' then
       s:push(translate_now(terminal_locale, random_phrase({'head_line_1', 'head_line_2'})));
+      s:push(translate_now("terminal_locale", random_phrase({'head_line_1', 'head_line_2'})));
     elseif command == 'echo' then
       if args then
         s:push(args);
@@ @@ -1094,14 +1094,14 @@ room { @@
 			if (s.directory_structure[command]) then
 				s.path = command:upper() .. '\\';
 			else
-        s:push(translate_now(computer_locale, 'format_invalid_device'));
+        s:push(translate_now("terminal_locale", 'format_invalid_device'));
 			end;
 		else
 			local cmd = s:walk_directory(command:upper())
 			if type(cmd) == 'function' then
 				r = cmd(s, '', args);
 			else
-        s:push(translate_now(computer_locale, 'bad_command'));
+        s:push(translate_now("terminal_locale", 'bad_command'));
 			end;
 		end;
 		if not r then

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general) First comment