From 01b57876a3b2752ae9705b8f094b63a568d48147 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 7 Jan 2015 10:11:08 -0800 Subject: [PATCH 1/2] test removal --- StaticData/Translations/Master.txt | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index ad0e2509d..15c01c927 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -2920,22 +2920,3 @@ Translated:The default temperature to set the bed to. Can sometimes be overridde English:Turns on and off the creation of a raft which can help parts adhere to the bed. Translated:Turns on and off the creation of a raft which can help parts adhere to the bed. - -English:Options -Translated:Options - -English:Expand Distance -Translated:Expand Distance - -English:Insert -Translated:Insert - -English:Insert -Translated:Insert - -English:Restore -Translated:Restore - -English:WINDOWED MODE: This tab has been moved to a separate window. -Translated:WINDOWED MODE: This tab has been moved to a separate window. - From 5326c2e28065649baf3df869c513a9ee706cbfc7 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 7 Jan 2015 10:24:55 -0800 Subject: [PATCH 2/2] localized strings working again --- LocalizedString.cs | 2 +- StaticData/Translations/Master.txt | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/LocalizedString.cs b/LocalizedString.cs index be0e87324..edef9bb01 100644 --- a/LocalizedString.cs +++ b/LocalizedString.cs @@ -56,7 +56,7 @@ namespace MatterHackers.Localizations if (MatterControlTranslationMap == null) { - string pathToTranslationsFolder = Path.Combine(StaticData.Instance.MapPath("Translations")); + string pathToTranslationsFolder = "Translations"; MatterControlTranslationMap = new TranslationMap(pathToTranslationsFolder, language); } #if DEBUG_SHOW_TRANSLATED_STRINGS && DEBUG diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 15c01c927..9aa13267b 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -2920,3 +2920,19 @@ Translated:The default temperature to set the bed to. Can sometimes be overridde English:Turns on and off the creation of a raft which can help parts adhere to the bed. Translated:Turns on and off the creation of a raft which can help parts adhere to the bed. + +English:Options +Translated:Options + +English:Expand Distance +Translated:Expand Distance + +English:Insert +Translated:Insert + +English:Restore +Translated:Restore + +English:WINDOWED MODE: This tab has been moved to a separate window. +Translated:WINDOWED MODE: This tab has been moved to a separate window. +