From 61d1ee5b82aa5d2c33c28a3e9011eb079e5ff75d Mon Sep 17 00:00:00 2001
From: "Marcus \"Chaosblog" <chaosblog@debilbox.de>
Date: Fri, 26 Oct 2018 00:51:31 +0200
Subject: [PATCH] Keep Translation.cpp and json-files in sync (#385)

The russish and the italian translations in the json files and the Translation.cpp were not in sync.
---
 Translation Editor/translation_ru.json | 22 +++++++++++-----------
 workspace/TS100/src/Translation.cpp    |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Translation Editor/translation_ru.json b/Translation Editor/translation_ru.json
index 2a9d8583..049b28d7 100644
--- a/Translation Editor/translation_ru.json	
+++ b/Translation Editor/translation_ru.json	
@@ -1,7 +1,7 @@
 {
 	"languageCode": "RU",
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Калибровка выполнена!",
 		"SettingsCalibrationWarning": "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!",
 		"SettingsResetWarning": "Вы действительно хотите сбросить настройки до значений по умолчанию?",
 		"UVLOWarningString": "АККУМ--",
@@ -198,26 +198,26 @@
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
-				"Model"
+				"Модель",
+				"жало"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Выбор модели жало"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
-				"Calibration"
+				"Простая",
+				"калибровка"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Простая калибровка с использованием горячей воды"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
-				"Calibration"
+				"Подробная",
+				"калибровка"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Калибровка с помощью термопары"
 		},
 		"PowerInput": {
 			"text": "PWRW",
@@ -229,4 +229,4 @@
 		}
 	},
 	"languageLocalName": "Русский"
-}
+}
\ No newline at end of file
diff --git a/workspace/TS100/src/Translation.cpp b/workspace/TS100/src/Translation.cpp
index ca9a8392..e564004d 100644
--- a/workspace/TS100/src/Translation.cpp
+++ b/workspace/TS100/src/Translation.cpp
@@ -959,7 +959,7 @@ const char* SettingsDescriptions[] = {
   /* TipModel                  */ "Seleziona il modello della punta in uso",
   /* SimpleCalibrationMode     */ "Calibra le rilevazioni di temperatura tramite l'utilizzo di acqua calda",
   /* AdvancedCalibrationMode   */ "Calibra le rilevazioni di temperatura attraverso la termocoppia presente nella punta",
-  /* PowerInput                */ "Power Wattage of the power adapter used",
+  /* PowerInput                */ "Imposta la potenza dell'alimentatore in uso",
 };
 
 const char* SettingsCalibrationDone = "Calibrazione effettuata";
@@ -1009,7 +1009,7 @@ const char* SettingsShortNames[][2] = {
   /* TipModel                  */ { "Modello", "della punta" },
   /* SimpleCalibrationMode     */ { "Calibrazione", "semplice" },
   /* AdvancedCalibrationMode   */ { "Calibrazione", "avanzata" },
-  /* PowerInput                */ { "Power", "Wattage" },
+  /* PowerInput                */ { "Potenza", "alimentaz" },
 };
 
 const char* SettingsMenuEntries[4] = {