nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

Browse source
This commit is contained in:
Kevin Pope 2015-01-07 10:26:10 -08:00
commit 13ab34c851
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
LocalizedString.cs
View file

@ -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

3
StaticData/Translations/Master.txt
View file

@ -2930,9 +2930,6 @@ Translated:Expand Distance
English:Insert
Translated:Insert
English:Insert
Translated:Insert
English:Restore
Translated:Restore