diff --git a/rosapps/applications/sysutils/systeminfo/lang/en-US.rc b/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
index a6e28ecaca0..503e6912aa4 100644
--- a/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
@@ -15,10 +15,10 @@ Parameter List:\n\
 	                   user context. Prompts for input if omitted.\n\n\
   /FO     format           Specifies the format in which the output\n\
 	                   is to be displayed.\n\
-	                   Valid values: \"TABLE\", \"LIST\", \"CSV\".\n\n\
-  /NH                      Specifies that the \"Column Header\" should\n\
+	                   Valid values: ""TABLE"", ""LIST"", ""CSV"".\n\n\
+  /NH                      Specifies that the ""Column Header"" should\n\
 	                   not be displayed in the output.\n\
-	                   Valid only for \"TABLE\" and \"CSV\" formats.\n\n\
+	                   Valid only for ""TABLE"" and ""CSV"" formats.\n\n\
   /?                       Displays this help/usage.\n\n\
 Examples:\n\
   SYSTEMINFO\n\
diff --git a/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc b/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
index ad365e1e6b5..13e3589c2fe 100644
--- a/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
@@ -20,10 +20,10 @@ Lista de Parametros:\n\
 	                      Pregunta por ella si es omitida.\n\n\
   /FO     formato             Especifica el formato en el que la salida\n\
 	                      será mostrada.\n\
-	                      Valores válidos: \"TABLE\", \"LIST\", \"CSV\".\n\n\
-  /NH                         Especifica que la \"Columna cabezera\" no será\n\
+	                      Valores válidos: ""TABLE"", ""LIST"", ""CSV"".\n\n\
+  /NH                         Especifica que la ""Columna cabezera"" no será\n\
 	                      mostrada en la salida.\n\
-	                      Válido sólo para formatos \"TABLE\" y \"CSV\" .\n\n\
+	                      Válido sólo para formatos ""TABLE"" y ""CSV"" .\n\n\
   /?                          Muestra esta ayuda.\n\n\
 Ejemplos:\n\
   SYSTEMINFO\n\
diff --git a/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc b/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
index e9880a6556c..fdf0b2cf8ac 100644
--- a/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
@@ -15,10 +15,10 @@ Parameter List:\n\
 	                   fourni. Le demande si ommis.\n\n\
   /FO     format           Spécifie le format dans lequel la sortie\n\
 	                   doit être affichée.\n\
-	                   Valeurs valides: \"TABLE\", \"LIST\", \"CSV\".\n\n\
-  /NH                      Spécifie que \"L'entête de colonne\" ne doit\n\
+	                   Valeurs valides: ""TABLE"", ""LIST"", ""CSV"".\n\n\
+  /NH                      Spécifie que ""L'entête de colonne"" ne doit\n\
 	                   pas être affiché dans la sortie.\n\
-	                   Valide uniquement pour les format \"TABLE\" et \"CSV\".\n\n\
+	                   Valide uniquement pour les format ""TABLE"" et ""CSV"".\n\n\
   /?                       Affiche cette aide.\n\n\
 Exemples:\n\
   SYSTEMINFO\n\
diff --git a/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc b/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
index b6e70933ff6..2f862a3a18f 100644
--- a/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
@@ -15,10 +15,10 @@ Parameter liste:\n\
 	                   bruker sammenheng. Prompts for input if omitted.\n\n\
   /FO     format           Spesifisere formatet som i utgående\n\
 	                   som skal vises.\n\
-	                   Gyldige verdier: \"TABLE\", \"LIST\", \"CSV\".\n\n\
-  /NH                      Spesifisere at \"Column Header\" skal\n\
+	                   Gyldige verdier: ""TABLE"", ""LIST"", ""CSV"".\n\n\
+  /NH                      Spesifisere at ""Column Header"" skal\n\
 	                   ikke vises i utgående.\n\
-	                   Gyldig for bare \"TABLE\" og \"CSV\" formater.\n\n\
+	                   Gyldig for bare ""TABLE"" og ""CSV"" formater.\n\n\
   /?                       Vis denne hjelp/bruk meldingen.\n\n\
 Eksempler:\n\
   SYSTEMINFO\n\
diff --git a/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc b/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
index 5540bc6e22f..69cd7543400 100644
--- a/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
@@ -22,10 +22,10 @@ Lista parametr
 	                   Program sam zapyta o has³o, jeœli nie jest podane.\n\n\
   /FO     format           Wyznacza format w którym wyœwietlone zostan¹\n\
 	                   informacje o systemie.\n\
-	                   Dostêpne formaty: \"TABLE\", \"LIST\", \"CSV\".\n\n\
-  /NH                      Blokuje wyœwietlanie kolumny \"Column Header\" w\n\
+	                   Dostêpne formaty: ""TABLE"", ""LIST"", ""CSV"".\n\n\
+  /NH                      Blokuje wyœwietlanie kolumny ""Column Header"" w\n\
 	                   informacjach systemowych.\n\
-	                   Dzia³a tylko z formatami \"TABLE\" i \"CSV\".\n\n\
+	                   Dzia³a tylko z formatami ""TABLE"" i ""CSV"".\n\n\
   /?                       Wyœwietla niniejszy tekst pomocy.\n\n\
 Przyk³ady:\n\
   SYSTEMINFO\n\
diff --git a/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc b/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
index de1b06334bf..abdb09d00c2 100644
--- a/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
@@ -19,10 +19,10 @@ Parameter List:\n\
 	                   user context. Prompts for input if omitted.\n\n\
   /FO     form t           Specifies the format in which the output\n\
 	                   is to be displayed.\n\
-	                   Valid values: \"TABLE\", \"LIST\", \"CSV\".\n\n\
-  /NH                      Specifies that the \"Column Header\" should\n\
+	                   Valid values: ""TABLE"", ""LIST"", ""CSV"".\n\n\
+  /NH                      Specifies that the ""Column Header"" should\n\
 	                   not be displayed in the output.\n\
-	                   Valid only for \"TABLE\" and \"CSV\" formats.\n\n\
+	                   Valid only for ""TABLE"" and ""CSV"" formats.\n\n\
   /?                       Displays this help/usage.\n\n\
 Examples:\n\
   SYSTEMINFO\n\
diff --git a/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc b/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
index 31370d7d43e..3dc62009d51 100644
--- a/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
@@ -23,10 +23,10 @@ IDS_USAGE, "SYSTEMINFO [/S 
 	                   Çàïðîøóº ââåäåííÿ ïàðîëÿ, ÿêùî â³í íå çàäàíèé.\n\n\
   /FO     ôîðìàò           Âèçíà÷ຠôîðìàò, â ÿêîìó â³äîáðàæàþòüñÿ\n\
 	                   âèõ³äí³ äàí³.\n\
-	                   Äîïóñòèì³ ôîðìàòè: \"TABLE\", \"LIST\", \"CSV\".\n\n\
+	                   Äîïóñòèì³ ôîðìàòè: ""TABLE"", ""LIST"", ""CSV"".\n\n\
   /NH                      Íå â³äîáðàæàòè çàãîëîâêè ñòîâïö³â\n\
 	                   âèõ³äíèõ äàíèõ.\n\
-	                   Äîïóñêàºòüñÿ äëÿ ôîðìàò³â \"TABLE\" and \"CSV\".\n\n\
+	                   Äîïóñêàºòüñÿ äëÿ ôîðìàò³â ""TABLE"" and ""CSV"".\n\n\
   /?                       Ïîêàçóº öþ äîâ³äêó.\n\n\
 Ïðèêëàäè:\n\
   SYSTEMINFO\n\
diff --git a/rosapps/applications/sysutils/systeminfo/systeminfo.c b/rosapps/applications/sysutils/systeminfo/systeminfo.c
index e7d8680fa9b..fac6e5f5e71 100644
--- a/rosapps/applications/sysutils/systeminfo/systeminfo.c
+++ b/rosapps/applications/sysutils/systeminfo/systeminfo.c
@@ -86,6 +86,7 @@ AllSysInfo(VOID)
 	TCHAR Buf[BUFFER_SIZE],Tmp[BUFFER_SIZE], Msg[BUFFER_SIZE];
 	MEMORYSTATUS memory;
 	unsigned int DIV = 1024;
+	TIME_ZONE_INFORMATION TimeZoneInfo;
 
 	GetSystemInfo(&SysInfo);
 
@@ -201,8 +202,8 @@ AllSysInfo(VOID)
 	//getting Processor(s)
 	if(GetOemStrings(IDS_PROCESSORS,Msg))
 	{
-		fprintf(stderr,Msg,(unsigned int)SysInfo.dwNumberOfProcessors);
 		unsigned int i;
+		fprintf(stderr,Msg,(unsigned int)SysInfo.dwNumberOfProcessors);
 		for(i = 0; i < (unsigned int)SysInfo.dwNumberOfProcessors; i++)
 		{
 			sprintf(Tmp,"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%u",i);
@@ -275,7 +276,6 @@ AllSysInfo(VOID)
 	}
 
 	//getting Time Zone
-	TIME_ZONE_INFORMATION TimeZoneInfo;
 	GetTimeZoneInformation(&TimeZoneInfo);
 	sprintf(Tmp,"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\%S",TimeZoneInfo.StandardName);
 	if (GetRegistryValue(HKEY_LOCAL_MACHINE,