4 files changed, 37 insertions, 330 deletions
diff --git a/src/hmi/qml/Core/translations/deu_DEU.js b/src/hmi/qml/Core/translations/deu_DEU.js
index b1f9730..56674fc 100644
--- a/src/hmi/qml/Core/translations/deu_DEU.js
+++ b/src/hmi/qml/Core/translations/deu_DEU.js
@@ -26,95 +26,39 @@
 *
 * @licence end@
 */
-//MainMenu
-translations["MainMenu"]="MAIN MENU";
 translations["Navigation"]="NAVI";
 translations["Mapview"]="MAP";
 translations["Poi"]="POI";
 translations["Configuration"]="CONFIG";
 translations["Trip"]="TRIP";
 
-//NavigationSearch
-translations["NavigationSearch"]="SEARCH";
-translations["SearchMode"]="SEARCH MODE";
-translations["History"]="HISTORY";
-
-//NavigationSearchAddress
-translations["NavigationSearchAddress"]="SEARCH BY ADDRESS";
 translations["Country"]="COUNTRY";
 translations["City"]="CITY";
 translations["Street"]="STREET";
 translations["Number"]="NUMBER";
 
-//NavigationSearchCoordinates
-translations["NavigationSearchCoordinates"]="SEARCH BY COORDINATES";
-translations["Latitude"]="LATITUDE";
-translations["Longitude"]="LONGITUDE";
-
-//NavigationSearchFreeText
-translations["NavigationSearchFreeText"]="SEARCH BY FREE TEXT";
-translations["Text"]="TEXT";
-
-//NavigationSearchHistory
-translations["NavigationSearchHistory"]="HISTORY OF LAST LOCATIONS"
-
-//NavigationSettings
-translations["NavigationSettings"]="SETTINGS";
-translations["Simulation"]="SIMULATION";
-translations["Speed"]="SPEED";
-translations["Preference"]="PREFERENCE";
-translations["LanguageAndUnits"]="LANG&UNITS";
-translations["Mode"]="MODE";
-translations["OnMapView"]="ON MAP VIEW";
-
-//NavigationSettingsPreferences
-translations["NavigationSettingsPreferences"]="PREFERENCES";
-translations["CostModel"]="COST MODEL";
-translations["Shortest"]="SHORTEST";
-translations["Fastest"]="FASTEST";
 translations["RoutingPreferences"]="ROUTING PREFERENCES";
 translations["Ferries"]="FERRIES";
 translations["TollRoads"]="TOLL ROADS";
 translations["MotorWays"]="MOTORWAYS";
-
-//NavigationSettingsLanguageAndUnits
-translations["NavigationSettingsLanguageAndUnits"]="LANGUAGE AND UNITS";
+translations["CostModel"]="COST MODEL";
+translations["Shortest"]="SHORTEST";
+translations["Fastest"]="FASTEST";
 translations["Language"]="LANGUAGE";
 translations["Units"]="UNITS";
+translations["Showroom"]="SHOWROOM";
+translations["Autoguidance"]="AUTOGUIDE";
+translations["Simulation"]="SIMULATION";
 
-//NavigationRoute
-translations["NavigationRoute"]="ROUTE";
-translations["EnteredLocation"]="ENTERED LOCATION";
-translations["Position"]="POSITION";
-translations["Destination"]="DESTINATION";
-translations["Route"]="ROUTE";
-translations["GoTo"]="GO TO";
-
-//NavigationCalculatedRoute
-translations["NavigationCalculatedRoute"]="GUIDANCE";
 translations["RouteDistance"]="DISTANCE";
 translations["RouteTime"]="TIME";
 translations["Guidance"]="GUIDANCE";
 translations["DisplayRoute"]="DISPLAY";
-translations["OnMap"]="ON MAP";
-translations["InAList"]="IN A LIST";
 translations["StatusTitle"]="STATUS";
 translations["CalculatedRouteInProgress"]="CALCULATION IN PROGRESS";
 translations["CalculatedRouteFailed"]="CALCULATION FAILED";
 translations["CalculatedRouteSuccess"]="ROUTE AVAILABLE";
 
-//NavigationRouteDescription
-translations["NavigationRouteDescription"]="MANEUVER LIST";
-
-//CameraSettings
-translations["CameraSettings"]="CAMERA SETTINGS";
-
-//Entry
-translations["Entry"]="ENTRY";
-
-//NavigationBrowseMap
-translations["NavigationBrowseMap"]="BROWSE MAP";
-translations["NavigationCurrentStreet"]="CURRENT STREET";
 translations["FSAWarning"]="Refill";
 translations["NoGuidance"]="No guidance";
 translations["NoManeuver"]="No maneuver";
@@ -134,11 +78,6 @@ translations["Join"]="Jo";
 translations["Day"]="Da";
 translations["Night"]="Ni";
 
-//NavigationManeuversList
-translations["NavigationManeuversList"]="MANEUVER LIST";
-
-//TripComputer
-translations["TripComputer"]="TRIP COMPUTER";
 translations["AvgSpeed"]="AVG SPEED";
 translations["AvgFuel"]="AVG FUEL";
 translations["Distance"]="DISTANCE";
@@ -147,25 +86,13 @@ translations["TankDistance"]="TANK DISTANCE";
 translations["PredictiveTankDistance"]="PREDICTIVE\nTANK DISTANCE";
 translations["Reset"]="RESET";
 
-//POI
-translations["POI"]="POINTS OF INTEREST";
-translations["SearchResult"]="SEARCH RESULT";
-translations["SelectedStation"]="SELECTED STATION";
 translations["Selected"]="SELECTED";
-translations["SearchForPOI"]="SEARCH";
-translations["Reroute"]="REROUTE";
-translations["DisplayPOI"]="DISPLAY";
 
-//Common texts
-translations["Ok"]="OK";
 translations["On"]="ON";
 translations["Off"]="OFF";
 translations["Back"]="BACK";
-translations["Menu"]="MENU";
 translations["Cancel"]="CANCEL";
 translations["Quit"]="QUIT";
 
-translations["Showroom"]="SHOWROOM";
-translations["Autoguidance"]="AUTOGUIDE";
 
 translations["Element"]="NAME";
diff --git a/src/hmi/qml/Core/translations/eng_USA.js b/src/hmi/qml/Core/translations/eng_USA.js
index cb0e874..643bba5 100644
--- a/src/hmi/qml/Core/translations/eng_USA.js
+++ b/src/hmi/qml/Core/translations/eng_USA.js
@@ -26,95 +26,39 @@
 *
 * @licence end@
 */
-//MainMenu
-translations["MainMenu"]="MAIN MENU";
 translations["Navigation"]="NAVI";
 translations["Mapview"]="MAP";
 translations["Poi"]="POI";
 translations["Configuration"]="CONFIG";
 translations["Trip"]="TRIP";
 
-//NavigationSearch
-translations["NavigationSearch"]="SEARCH";
-translations["SearchMode"]="SEARCH MODE";
-translations["History"]="HISTORY";
-
-//NavigationSearchAddress
-translations["NavigationSearchAddress"]="SEARCH BY ADDRESS";
 translations["Country"]="COUNTRY";
 translations["City"]="CITY";
 translations["Street"]="STREET";
 translations["Number"]="NUMBER";
 
-//NavigationSearchCoordinates
-translations["NavigationSearchCoordinates"]="SEARCH BY COORDINATES";
-translations["Latitude"]="LATITUDE";
-translations["Longitude"]="LONGITUDE";
-
-//NavigationSearchFreeText
-translations["NavigationSearchFreeText"]="SEARCH BY FREE TEXT";
-translations["Text"]="TEXT";
-
-//NavigationSearchHistory
-translations["NavigationSearchHistory"]="HISTORY OF LAST LOCATIONS"
-
-//NavigationSettings
-translations["NavigationSettings"]="SETTINGS";
-translations["Simulation"]="SIMULATION";
-translations["Speed"]="SPEED";
-translations["Preference"]="PREFERENCE";
-translations["LanguageAndUnits"]="LANG&UNITS";
-translations["Mode"]="MODE";
-translations["OnMapView"]="ON MAP VIEW";
-
-//NavigationSettingsPreferences
-translations["NavigationSettingsPreferences"]="PREFERENCES";
-translations["CostModel"]="COST MODEL";
-translations["Shortest"]="SHORTEST";
-translations["Fastest"]="FASTEST";
 translations["RoutingPreferences"]="ROUTING PREFERENCES";
 translations["Ferries"]="FERRIES";
 translations["TollRoads"]="TOLL ROADS";
 translations["MotorWays"]="MOTORWAYS";
-
-//NavigationSettingsLanguageAndUnits
-translations["NavigationSettingsLanguageAndUnits"]="LANGUAGE AND UNITS";
+translations["CostModel"]="COST MODEL";
+translations["Shortest"]="SHORTEST";
+translations["Fastest"]="FASTEST";
 translations["Language"]="LANGUAGE";
 translations["Units"]="UNITS";
+translations["Showroom"]="SHOWROOM";
+translations["Autoguidance"]="AUTOGUIDE";
+translations["Simulation"]="SIMULATION";
 
-//NavigationRoute
-translations["NavigationRoute"]="ROUTE";
-translations["EnteredLocation"]="ENTERED LOCATION";
-translations["Position"]="POSITION";
-translations["Destination"]="DESTINATION";
-translations["Route"]="ROUTE";
-translations["GoTo"]="GO TO";
-
-//NavigationCalculatedRoute
-translations["NavigationCalculatedRoute"]="GUIDANCE";
 translations["RouteDistance"]="DISTANCE";
 translations["RouteTime"]="TIME";
 translations["Guidance"]="GUIDANCE";
 translations["DisplayRoute"]="DISPLAY";
-translations["OnMap"]="ON MAP";
-translations["InAList"]="IN A LIST";
 translations["StatusTitle"]="STATUS";
 translations["CalculatedRouteInProgress"]="CALCULATION IN PROGRESS";
 translations["CalculatedRouteFailed"]="CALCULATION FAILED";
 translations["CalculatedRouteSuccess"]="ROUTE AVAILABLE";
 
-//NavigationRouteDescription
-translations["NavigationRouteDescription"]="MANEUVER LIST";
-
-//CameraSettings
-translations["CameraSettings"]="CAMERA SETTINGS";
-
-//Entry
-translations["Entry"]="ENTRY";
-
-//NavigationBrowseMap
-translations["NavigationBrowseMap"]="BROWSE MAP";
-translations["NavigationCurrentStreet"]="CURRENT STREET";
 translations["FSAWarning"]="Refill";
 translations["NoGuidance"]="No guidance";
 translations["NoManeuver"]="No maneuver";
@@ -134,11 +78,6 @@ translations["Join"]="Jo";
 translations["Day"]="Da";
 translations["Night"]="Ni";
 
-//NavigationManeuversList
-translations["NavigationManeuversList"]="MANEUVER LIST";
-
-//TripComputer
-translations["TripComputer"]="TRIP COMPUTER";
 translations["AvgSpeed"]="AVG SPEED";
 translations["AvgFuel"]="AVG FUEL";
 translations["Distance"]="DISTANCE";
@@ -147,25 +86,13 @@ translations["TankDistance"]="TANK DISTANCE";
 translations["PredictiveTankDistance"]="PREDICTIVE\nTANK DISTANCE";
 translations["Reset"]="RESET";
 
-//POI
-translations["POI"]="POINTS OF INTEREST";
-translations["SearchResult"]="SEARCH RESULT";
-translations["SelectedStation"]="SELECTED STATION";
 translations["Selected"]="SELECTED";
-translations["SearchForPOI"]="SEARCH";
-translations["Reroute"]="REROUTE";
-translations["DisplayPOI"]="DISPLAY";
 
-//Common texts
-translations["Ok"]="OK";
 translations["On"]="ON";
 translations["Off"]="OFF";
 translations["Back"]="BACK";
-translations["Menu"]="MENU";
 translations["Cancel"]="CANCEL";
 translations["Quit"]="QUIT";
 
-translations["Showroom"]="SHOWROOM";
-translations["Autoguidance"]="AUTOGUIDE";
 
 translations["Element"]="NAME";
diff --git a/src/hmi/qml/Core/translations/fra_FRA.js b/src/hmi/qml/Core/translations/fra_FRA.js
index 6bc3176..480da8c 100644
--- a/src/hmi/qml/Core/translations/fra_FRA.js
+++ b/src/hmi/qml/Core/translations/fra_FRA.js
@@ -26,95 +26,39 @@
 *
 * @licence end@
 */
-//MainMenu
-translations["MainMenu"]="MENU PRINCIPAL";
 translations["Navigation"]="NAVI";
 translations["Mapview"]="MAP";
 translations["Poi"]="POI";
 translations["Configuration"]="CONFIG";
 translations["Trip"]="TRIP";
 
-//NavigationSearch
-translations["NavigationSearch"]="CHERCHER UN LIEU";
-translations["SearchMode"]="RECHERCHER";
-translations["History"]="HISTORIQUE";
-
-//NavigationSearchAddress
-translations["NavigationSearchAddress"]="SAISIR UNE ADRESSE";
 translations["Country"]="PAYS";
 translations["City"]="VILLE";
 translations["Street"]="RUE";
 translations["Number"]="NUMERO";
 
-//NavigationSearchCoordinates
-translations["NavigationSearchCoordinates"]="SAISIR DES COORDONNEES GPS";
-translations["Latitude"]="LATITUDE";
-translations["Longitude"]="LONGITUDE";
-
-//NavigationSearchFreeText
-translations["NavigationSearchFreeText"]="SAISIR UN MOT";
-translations["Text"]="TEXTE";
-
-//NavigationSearchHistory
-translations["NavigationSearchHistory"]="DERNIERES DESTINATIONS"
-
-//NavigationSettings
-translations["NavigationSettings"]="CONFIGURATION";
-translations["Simulation"]="SIMULATION";
-translations["Speed"]="VITESSE";
-translations["Preference"]="PREFERENCE";
-translations["LanguageAndUnits"]="LANG&UNITES";
-translations["Mode"]="MODE";
-translations["OnMapView"]="ON MAP VIEW";
-
-//NavigationSettingsPreferences
-translations["NavigationSettingsPreferences"]="PREFERENCES";
-translations["CostModel"]="COST MODEL";
-translations["Shortest"]="SHORTEST";
-translations["Fastest"]="FASTEST";
 translations["RoutingPreferences"]="ROUTING PREFERENCES";
 translations["Ferries"]="FERRIES";
 translations["TollRoads"]="TOLL ROADS";
 translations["MotorWays"]="MOTORWAYS";
-
-//NavigationSettingsLanguageAndUnits
-translations["NavigationSettingsLanguageAndUnits"]="LANGUE ET UNITES";
+translations["CostModel"]="COST MODEL";
+translations["Shortest"]="SHORTEST";
+translations["Fastest"]="FASTEST";
 translations["Language"]="LANGAGE";
 translations["Units"]="UNITES";
+translations["Showroom"]="SHOWROOM";
+translations["Autoguidance"]="AUTOGUIDE";
+translations["Simulation"]="SIMULATION";
 
-//NavigationRoute
-translations["NavigationRoute"]="ITINERAIRE";
-translations["EnteredLocation"]="SELECTION SAISIE";
-translations["Position"]="POSITION";
-translations["Destination"]="DESTINATION";
-translations["Route"]="ROUTE";
-translations["GoTo"]="GO TO";
-
-//NavigationCalculatedRoute
-translations["NavigationCalculatedRoute"]="GUIDAGE";
 translations["RouteDistance"]="DISTANCE";
 translations["RouteTime"]="DUREE";
 translations["Guidance"]="GUIDAGE";
 translations["DisplayRoute"]="AFFICHER";
-translations["OnMap"]="CARTE";
-translations["InAList"]="LISTE";
 translations["StatusTitle"]="STATUS";
 translations["CalculatedRouteInProgress"]="CALCULATION IN PROGRESS";
 translations["CalculatedRouteFailed"]="CALCULATION FAILED";
 translations["CalculatedRouteSuccess"]="ROUTE AVAILABLE";
 
-//NavigationRouteDescription
-translations["NavigationRouteDescription"]="LISTE DES MANOEUVRES";
-
-//CameraSettings
-translations["CameraSettings"]="REGLAGE DE LA CAMERA";
-
-//Entry
-translations["Entry"]="SAISIE";
-
-//NavigationBrowseMap
-translations["NavigationBrowseMap"]="EXPLORER LA CARTE";
-translations["NavigationCurrentStreet"]="RUE ACTUELLE";
 translations["FSAWarning"]="Refill";
 translations["NoGuidance"]="No guidance";
 translations["NoManeuver"]="No maneuver";
@@ -134,12 +78,6 @@ translations["Join"]="Jo";
 translations["Day"]="Da";
 translations["Night"]="Ni";
 
-
-//NavigationManeuversList
-translations["NavigationManeuversList"]="LISTE DES MANEUVRES";
-
-//TripComputer
-translations["TripComputer"]="ORDINATEUR DE BORD";
 translations["AvgSpeed"]="VITESSE MOYENNE";
 translations["AvgFuel"]="CONSO MOYENNE";
 translations["Distance"]="DISTANCE";
@@ -148,25 +86,13 @@ translations["TankDistance"]="AUTONOMIE";
 translations["PredictiveTankDistance"]="AUTONOMIE\nPREDICTIVE";
 translations["Reset"]="RAZ";
 
-//POI
-translations["POI"]="POINTS D'INTERET";
-translations["SearchResult"]="RESULTATS";
-translations["SelectedStation"]="STATION CHOISIE";
 translations["Selected"]="SELECTION";
-translations["SearchForPOI"]="CHERCHER";
-translations["Reroute"]="REROUTER";
-translations["DisplayPOI"]="AFFICHER";
 
-//Common texts
-translations["Ok"]="OK";
 translations["On"]="ON";
 translations["Off"]="OFF";
 translations["Back"]="RETOUR";
-translations["Menu"]="MENU";
 translations["Cancel"]="ANNUL";
 translations["Quit"]="QUITTER";
 
-translations["Showroom"]="SHOWROOM";
-translations["Autoguidance"]="AUTOGUIDE";
 
 translations["Element"]="NAME";
diff --git a/src/hmi/qml/Core/translations/jpn_JPN.js b/src/hmi/qml/Core/translations/jpn_JPN.js
index 021c64f..39b8855 100644
--- a/src/hmi/qml/Core/translations/jpn_JPN.js
+++ b/src/hmi/qml/Core/translations/jpn_JPN.js
@@ -26,104 +26,48 @@
 *
 * @licence end@
 */
-//MainMenu
-translations["MainMenu"]="FSA　メニュー";
-translations["Navigation"]="NAVI";
-translations["Mapview"]="MAP";
-translations["Poi"]="POI";
-translations["Configuration"]="CONFIG";
+translations["Navigation"]="ナビ";
+translations["Mapview"]="地図";
+translations["Poi"]="地点";
+translations["Configuration"]="設定";
 translations["Trip"]="TRIP";
 
-//NavigationSearch
-translations["NavigationSearch"]="検索";
-translations["SearchMode"]="検索の方法";
-translations["History"]="ヒストリ";
-
-//NavigationSearchAddress
-translations["NavigationSearchAddress"]="SEARCH BY ADDRESS";
 translations["Country"]="国";
 translations["City"]="町";
 translations["Street"]="道";
 translations["Number"]="番号";
 
-//NavigationSearchCoordinates
-translations["NavigationSearchCoordinates"]="SEARCH BY COORDINATES";
-translations["Latitude"]="緯度";
-translations["Longitude"]="軽度";
-
-//NavigationSearchFreeText
-translations["NavigationSearchFreeText"]="SEARCH BY FREE TEXT";
-translations["Text"]="TEXT";
-
-//NavigationSearchHistory
-translations["NavigationSearchHistory"]="目的地のヒストリ"
-
-//NavigationSettings
-translations["NavigationSettings"]="設定";
-translations["Simulation"]="SIMULATION";
-translations["Speed"]="SPEED";
-translations["Preference"]="PREFERENCE";
-translations["LanguageAndUnits"]="LANG&UNITS";
-translations["Mode"]="MODE";
-translations["OnMapView"]="ON MAP VIEW";
-
-//NavigationSettingsPreferences
-translations["NavigationSettingsPreferences"]="PREFERENCES";
-translations["CostModel"]="COST MODEL";
-translations["Shortest"]="SHORTEST";
-translations["Fastest"]="FASTEST";
 translations["RoutingPreferences"]="ROUTING PREFERENCES";
 translations["Ferries"]="FERRIES";
 translations["TollRoads"]="TOLL ROADS";
 translations["MotorWays"]="MOTORWAYS";
-
-//NavigationSettingsLanguageAndUnits
-translations["NavigationSettingsLanguageAndUnits"]="言語とユニット";
+translations["CostModel"]="COST MODEL";
+translations["Shortest"]="SHORTEST";
+translations["Fastest"]="FASTEST";
 translations["Language"]="言語";
 translations["Units"]="ユニット";
+translations["Showroom"]="ショールーム";
+translations["Autoguidance"]="AUTOGUIDE";
+translations["Simulation"]="SIMULATION";
 
-//NavigationRoute
-translations["NavigationRoute"]="ROUTE";
-translations["EnteredLocation"]="ENTERED LOCATION";
-translations["Position"]="POSITION";
-translations["Destination"]="目的地";
-translations["Route"]="ROUTE";
-translations["GoTo"]="GO TO";
-
-//NavigationCalculatedRoute
-translations["NavigationCalculatedRoute"]="GUIDANCE";
-translations["RouteDistance"]="DISTANCE";
-translations["RouteTime"]="TIME";
-translations["Guidance"]="GUIDANCE";
-translations["DisplayRoute"]="DISPLAY";
-translations["OnMap"]="ON MAP";
-translations["InAList"]="IN A LIST";
-translations["StatusTitle"]="STATUS";
+translations["RouteDistance"]="距離";
+translations["RouteTime"]="時間";
+translations["Guidance"]="ガイダンス";
+translations["DisplayRoute"]="ルート";
+translations["StatusTitle"]="ステータス";
 translations["CalculatedRouteInProgress"]="CALCULATION IN PROGRESS";
 translations["CalculatedRouteFailed"]="CALCULATION FAILED";
 translations["CalculatedRouteSuccess"]="ROUTE AVAILABLE";
 
-//NavigationRouteDescription
-translations["NavigationRouteDescription"]="MANEUVER LIST";
-
-//CameraSettings
-translations["CameraSettings"]="CAMERA SETTINGS";
-
-//Entry
-translations["Entry"]="文字入力";
-
-//NavigationBrowseMap
-translations["NavigationBrowseMap"]="地図を調べる";
-translations["NavigationCurrentStreet"]="現在地";
 translations["FSAWarning"]="Refill";
 translations["NoGuidance"]="No guidance";
 translations["NoManeuver"]="No maneuver";
 
 //CameraSettings
-translations["North"]="北緯";
-translations["South"]="南緯";
-translations["East"]="東経";
-translations["West"]="西経";
+translations["North"]="北";
+translations["South"]="南";
+translations["East"]="東";
+translations["West"]="西";
 translations["CameraTilt"]="Tilt";
 translations["CameraHeight"]="Height";
 translations["CameraDistance"]="Dist";
@@ -134,11 +78,6 @@ translations["Join"]="Jo";
 translations["Day"]="Da";
 translations["Night"]="Ni";
 
-//NavigationManeuversList
-translations["NavigationManeuversList"]="操作表示";
-
-//TripComputer
-translations["TripComputer"]="TRIP COMPUTER";
 translations["AvgSpeed"]="AVG SPEED";
 translations["AvgFuel"]="AVG FUEL";
 translations["Distance"]="距離";
@@ -147,26 +86,14 @@ translations["TankDistance"]="TANK DISTANCE";
 translations["PredictiveTankDistance"]="PREDICTIVE\nTANK DISTANCE";
 translations["Reset"]="RESET";
 
-//POI
-translations["POI"]="POINTS OF INTEREST";
-translations["SearchResult"]="結果表";
-translations["SelectedStation"]="SELECTED STATION";
 translations["Selected"]="SELECTED";
-translations["SearchForPOI"]="検索";
-translations["Reroute"]="REROUTE";
-translations["DisplayPOI"]="表示";
 
-//Common texts
-translations["Ok"]="OK";
 translations["On"]="ON";
 translations["Off"]="OFF";
 translations["Back"]="BACK";
-translations["Menu"]="MENU";
 translations["Cancel"]="キャンセル";
 translations["Quit"]="QUIT";
 
-translations["Showroom"]="SHOWROOM";
-translations["Autoguidance"]="AUTOGUIDE";
 
 translations["Element"]="NAME";