[INTL]

- Replace hard-coded unit strings ('Metric' and 'Imperial') by resource strings.
- Add the required resource strings to all supported languages.
- Translators: Please translate these strings.

svn path=/trunk/; revision=47298

diff --git a/reactos/dll/cpl/intl/lang/bg-BG.rc b/reactos/dll/cpl/intl/lang/bg-BG.rc
index 1e6af62..75d62f3 100644 (file)
--- a/reactos/dll/cpl/intl/lang/bg-BG.rc
+++ b/reactos/dll/cpl/intl/lang/bg-BG.rc
@@ -188,6 +188,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Íàãëàñÿâàíå íà ìåñòíèòå íàñòðîéêè"
     IDS_SPAIN "Spanish (Spain)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/cs-CZ.rc b/reactos/dll/cpl/intl/lang/cs-CZ.rc
index 4e00478..c72579d 100644 (file)
--- a/reactos/dll/cpl/intl/lang/cs-CZ.rc
+++ b/reactos/dll/cpl/intl/lang/cs-CZ.rc
@@ -193,6 +193,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Pøizpùsobit místní nastavení"
     IDS_SPAIN "\8apanìl\9atina (\8apanìlsko)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/de-DE.rc b/reactos/dll/cpl/intl/lang/de-DE.rc
index 9096529..07c47b2 100644 (file)
--- a/reactos/dll/cpl/intl/lang/de-DE.rc
+++ b/reactos/dll/cpl/intl/lang/de-DE.rc
@@ -187,6 +187,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Regionale Einstellungen bearbeiten"
     IDS_SPAIN "Spanisch (Spanien)"
+    IDS_METRIC "Metrisch"
+    IDS_IMPERIAL "US-Maße"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/en-US.rc b/reactos/dll/cpl/intl/lang/en-US.rc
index d04ab75..f9abb75 100644 (file)
--- a/reactos/dll/cpl/intl/lang/en-US.rc
+++ b/reactos/dll/cpl/intl/lang/en-US.rc
@@ -188,6 +188,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Customize Regional Options"
     IDS_SPAIN "Spanish (Spain)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/es-ES.rc b/reactos/dll/cpl/intl/lang/es-ES.rc
index e96c6c4..ee4b0d0 100644 (file)
--- a/reactos/dll/cpl/intl/lang/es-ES.rc
+++ b/reactos/dll/cpl/intl/lang/es-ES.rc
@@ -194,6 +194,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Personaliza opciones regionales"
     IDS_SPAIN "Español (España)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/fr-FR.rc b/reactos/dll/cpl/intl/lang/fr-FR.rc
index ffbb2a6..363e980 100644 (file)
--- a/reactos/dll/cpl/intl/lang/fr-FR.rc
+++ b/reactos/dll/cpl/intl/lang/fr-FR.rc
@@ -191,6 +191,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Personnaliser les options régionales"
     IDS_SPAIN "Espagnol (Espagne)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/it-IT.rc b/reactos/dll/cpl/intl/lang/it-IT.rc
index d4156f1..46217f3 100644 (file)
--- a/reactos/dll/cpl/intl/lang/it-IT.rc
+++ b/reactos/dll/cpl/intl/lang/it-IT.rc
@@ -190,6 +190,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Opzioni internazionali e della lingua"
     IDS_SPAIN "Spanish (Spain)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/no-NO.rc b/reactos/dll/cpl/intl/lang/no-NO.rc
index c2d0509..376f1bc 100644 (file)
--- a/reactos/dll/cpl/intl/lang/no-NO.rc
+++ b/reactos/dll/cpl/intl/lang/no-NO.rc
@@ -188,6 +188,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Innstillinger for region og språk"
     IDS_SPAIN "Spanisk (Spain)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/pl-PL.rc b/reactos/dll/cpl/intl/lang/pl-PL.rc
index b3ec268..a80e5db 100644 (file)
--- a/reactos/dll/cpl/intl/lang/pl-PL.rc
+++ b/reactos/dll/cpl/intl/lang/pl-PL.rc
@@ -195,6 +195,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Dostosuj Ustawienia regionalne"
     IDS_SPAIN "Hiszpañski (Hiszpania)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/ro-RO.rc b/reactos/dll/cpl/intl/lang/ro-RO.rc
index fc13dc9..366453b 100644 (file)
--- a/reactos/dll/cpl/intl/lang/ro-RO.rc
+++ b/reactos/dll/cpl/intl/lang/ro-RO.rc
@@ -1,4 +1,4 @@
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
 
@@ -190,6 +190,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Particularizare opțiuni"
     IDS_SPAIN "Spaniolă (Spainia)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/ru-RU.rc b/reactos/dll/cpl/intl/lang/ru-RU.rc
index e9d3643..6c3b3d6 100644 (file)
--- a/reactos/dll/cpl/intl/lang/ru-RU.rc
+++ b/reactos/dll/cpl/intl/lang/ru-RU.rc
@@ -186,6 +186,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåãèîíàëüíûõ ïàðàìåòðîâ"
     IDS_SPAIN "Èñïàíñêèé (Èñïàíèÿ)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/sk-SK.rc b/reactos/dll/cpl/intl/lang/sk-SK.rc
index 8ddc3c2..665d484 100644 (file)
--- a/reactos/dll/cpl/intl/lang/sk-SK.rc
+++ b/reactos/dll/cpl/intl/lang/sk-SK.rc
@@ -194,6 +194,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Prispôsobi\9d miestne nastavenia"
     IDS_SPAIN "Spanish (Spain)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/uk-UA.rc b/reactos/dll/cpl/intl/lang/uk-UA.rc
index 0b0b71f..4224beb 100644 (file)
--- a/reactos/dll/cpl/intl/lang/uk-UA.rc
+++ b/reactos/dll/cpl/intl/lang/uk-UA.rc
@@ -197,6 +197,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåã³îíàëüíèõ ïàðàìåòð³â"
     IDS_SPAIN "²ñïàíñüêà (²ñïàí³ÿ)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/lang/zh-CN.rc b/reactos/dll/cpl/intl/lang/zh-CN.rc
index 02cd64a..1cb4181 100644 (file)
--- a/reactos/dll/cpl/intl/lang/zh-CN.rc
+++ b/reactos/dll/cpl/intl/lang/zh-CN.rc
@@ -194,6 +194,8 @@ STRINGTABLE
 BEGIN
     IDS_CUSTOMIZE_TITLE "×Ô¶¨ÒåÇøÓòÑ¡Ïî"
     IDS_SPAIN "Î÷°àÑÀÓï (Î÷°àÑÀ)"
+    IDS_METRIC "Metric"
+    IDS_IMPERIAL "Imperial"
 END
 
 STRINGTABLE

diff --git a/reactos/dll/cpl/intl/numbers.c b/reactos/dll/cpl/intl/numbers.c
index 1ca113d..75f609b 100644 (file)
--- a/reactos/dll/cpl/intl/numbers.c
+++ b/reactos/dll/cpl/intl/numbers.c
@@ -58,8 +58,6 @@ static LPTSTR lpLeadNumFmtSamples[MAX_LEAD_ZEROES_SAMPLES] =
     {_T(",7"), _T("0,7")};
 static LPTSTR lpListSepSamples[MAX_LIST_SEP_SAMPLES] =
     {_T(";")};
-static LPTSTR lpUnitsSysSamples[MAX_UNITS_SYS_SAMPLES] =
-    {_T("Metric"), _T("Imperial")};
 
 
 /* Init num decimal separator control box */
@@ -495,6 +493,7 @@ InitUnitsSysCB(HWND hwndDlg,
                LCID lcid)
 {
     TCHAR szUnitsSys[MAX_SAMPLES_STR_SIZE];
+    TCHAR szUnitName[128];
     INT nCBIndex;
 
     /* Get current system of units */
@@ -512,10 +511,12 @@ InitUnitsSysCB(HWND hwndDlg,
     /* Create list of standard system of units */
     for (nCBIndex = 0; nCBIndex < MAX_UNITS_SYS_SAMPLES; nCBIndex++)
     {
+        LoadString(hApplet, IDS_METRIC + nCBIndex, szUnitName, 128);
+
         SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSMEASSYS),
                     CB_ADDSTRING,
                     0,
-                    (LPARAM)lpUnitsSysSamples[nCBIndex]);
+                    (LPARAM)szUnitName);
     }
 
     /* Set current item to value from registry */

diff --git a/reactos/dll/cpl/intl/resource.h b/reactos/dll/cpl/intl/resource.h
index 8491517..1170775 100644 (file)
--- a/reactos/dll/cpl/intl/resource.h
+++ b/reactos/dll/cpl/intl/resource.h
@@ -74,5 +74,7 @@
 #define IDS_CPLDESCRIPTION                1001
 #define IDS_CUSTOMIZE_TITLE               1002
 #define IDS_SPAIN                         1003
+#define IDS_METRIC                        1004
+#define IDS_IMPERIAL                      1005
 
 /* EOF */