https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5c8047e3d6597cfe280d540d7d45cc4bcd491ee
commit e5c8047e3d6597cfe280d540d7d45cc4bcd491ee Author: Carlo-Bramini <[email protected]> AuthorDate: Sun Nov 4 11:08:44 2018 +0100 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Mon Mar 18 01:34:06 2019 +0100 [CALC] Added "Minute of arc" and "Second of arc" to the "Angles" units. CORE-5939 --- base/applications/calc/convert.c | 14 +++++++++----- base/applications/calc/lang/bg-BG.rc | 2 ++ base/applications/calc/lang/cs-CZ.rc | 2 ++ base/applications/calc/lang/de-DE.rc | 2 ++ base/applications/calc/lang/el-GR.rc | 2 ++ base/applications/calc/lang/en-US.rc | 2 ++ base/applications/calc/lang/es-ES.rc | 2 ++ base/applications/calc/lang/fr-FR.rc | 2 ++ base/applications/calc/lang/he-IL.rc | 2 ++ base/applications/calc/lang/hu-HU.rc | 2 ++ base/applications/calc/lang/it-IT.rc | 2 ++ base/applications/calc/lang/ja-JP.rc | 2 ++ base/applications/calc/lang/ko-KR.rc | 2 ++ base/applications/calc/lang/nl-NL.rc | 2 ++ base/applications/calc/lang/no-NO.rc | 2 ++ base/applications/calc/lang/pl-PL.rc | 2 ++ base/applications/calc/lang/pt-BR.rc | 2 ++ base/applications/calc/lang/ro-RO.rc | 2 ++ base/applications/calc/lang/ru-RU.rc | 2 ++ base/applications/calc/lang/sk-SK.rc | 2 ++ base/applications/calc/lang/sq-AL.rc | 2 ++ base/applications/calc/lang/sv-SE.rc | 2 ++ base/applications/calc/lang/th-TH.rc | 2 ++ base/applications/calc/lang/tr-TR.rc | 2 ++ base/applications/calc/lang/uk-UA.rc | 2 ++ base/applications/calc/lang/zh-CN.rc | 2 ++ base/applications/calc/resource.h | 8 +++++--- 27 files changed, 64 insertions(+), 8 deletions(-) diff --git a/base/applications/calc/convert.c b/base/applications/calc/convert.c index c96f83d869..79ee4471fa 100644 --- a/base/applications/calc/convert.c +++ b/base/applications/calc/convert.c @@ -64,13 +64,17 @@ typedef struct { { 0, NULL, NULL }, /* - 1 gradian = 0.9 deg - 1 radian = 57.29577951308233 deg + 1 arcminute ....... = 1/60 deg + 1 arcsecond ....... = 1/3600 deg + 1 gradian ......... = 0.9 deg + 1 radian .......... = 57.29577951308233 deg */ static const conv_t conv_ANGLE[] = { - DECLARE_CONV_UNIT(ANGLE, DEGREES, "$", "$") - DECLARE_CONV_UNIT(ANGLE, GRADIANS, "$*0.9", "$/0.9") - DECLARE_CONV_UNIT(ANGLE, RADIANS, "$/P*180", "$*P/180") + DECLARE_CONV_UNIT(ANGLE, ARCMINUTES, "$/60", "$*60") + DECLARE_CONV_UNIT(ANGLE, ARCSECONDS, "$/3600", "$*3600") + DECLARE_CONV_UNIT(ANGLE, DEGREES, "$", "$") + DECLARE_CONV_UNIT(ANGLE, GRADIANS, "$*0.9", "$/0.9") + DECLARE_CONV_UNIT(ANGLE, RADIANS, "$/P*180", "$*P/180") DECLARE_CONV_END }; diff --git a/base/applications/calc/lang/bg-BG.rc b/base/applications/calc/lang/bg-BG.rc index 4fc9302f2f..f1a66438f2 100644 --- a/base/applications/calc/lang/bg-BG.rc +++ b/base/applications/calc/lang/bg-BG.rc @@ -435,6 +435,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Градуси" IDS_ANGLE_GRADIANS "Гради" IDS_ANGLE_RADIANS "Радиани" diff --git a/base/applications/calc/lang/cs-CZ.rc b/base/applications/calc/lang/cs-CZ.rc index a695785b57..9b95130c2a 100644 --- a/base/applications/calc/lang/cs-CZ.rc +++ b/base/applications/calc/lang/cs-CZ.rc @@ -434,6 +434,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Stupně" IDS_ANGLE_GRADIANS "Grady" IDS_ANGLE_RADIANS "Radiány" diff --git a/base/applications/calc/lang/de-DE.rc b/base/applications/calc/lang/de-DE.rc index 8361c2dcf9..a8abec1fcf 100644 --- a/base/applications/calc/lang/de-DE.rc +++ b/base/applications/calc/lang/de-DE.rc @@ -429,6 +429,8 @@ END /* Winkeltypen */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Grad" IDS_ANGLE_GRADIANS "Gon" IDS_ANGLE_RADIANS "Radiant" diff --git a/base/applications/calc/lang/el-GR.rc b/base/applications/calc/lang/el-GR.rc index 5e4f9ffcd8..7049495cf1 100644 --- a/base/applications/calc/lang/el-GR.rc +++ b/base/applications/calc/lang/el-GR.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Βαθμοί" IDS_ANGLE_GRADIANS "Ακτίνια" IDS_ANGLE_RADIANS "Μοίρες" diff --git a/base/applications/calc/lang/en-US.rc b/base/applications/calc/lang/en-US.rc index 4dfb564524..a4ba8c9aa5 100644 --- a/base/applications/calc/lang/en-US.rc +++ b/base/applications/calc/lang/en-US.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Degrees" IDS_ANGLE_GRADIANS "Gradians" IDS_ANGLE_RADIANS "Radians" diff --git a/base/applications/calc/lang/es-ES.rc b/base/applications/calc/lang/es-ES.rc index 7bc2ffec76..e53328d2bc 100644 --- a/base/applications/calc/lang/es-ES.rc +++ b/base/applications/calc/lang/es-ES.rc @@ -435,6 +435,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Grados" IDS_ANGLE_GRADIANS "Gradianes" IDS_ANGLE_RADIANS "Radianes" diff --git a/base/applications/calc/lang/fr-FR.rc b/base/applications/calc/lang/fr-FR.rc index d7a73f78d4..edf5d67230 100644 --- a/base/applications/calc/lang/fr-FR.rc +++ b/base/applications/calc/lang/fr-FR.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Degrés" IDS_ANGLE_GRADIANS "Grades" IDS_ANGLE_RADIANS "Radians" diff --git a/base/applications/calc/lang/he-IL.rc b/base/applications/calc/lang/he-IL.rc index 0db39f4f8c..56cccdca65 100644 --- a/base/applications/calc/lang/he-IL.rc +++ b/base/applications/calc/lang/he-IL.rc @@ -435,6 +435,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "מעלות" IDS_ANGLE_GRADIANS "גרדיאנים" IDS_ANGLE_RADIANS "רדיאנים" diff --git a/base/applications/calc/lang/hu-HU.rc b/base/applications/calc/lang/hu-HU.rc index ffc9c98919..be8e0706d7 100644 --- a/base/applications/calc/lang/hu-HU.rc +++ b/base/applications/calc/lang/hu-HU.rc @@ -437,6 +437,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Fok" IDS_ANGLE_GRADIANS "Gradián" IDS_ANGLE_RADIANS "Radián" diff --git a/base/applications/calc/lang/it-IT.rc b/base/applications/calc/lang/it-IT.rc index 6a235ac41d..756b678a82 100644 --- a/base/applications/calc/lang/it-IT.rc +++ b/base/applications/calc/lang/it-IT.rc @@ -429,6 +429,8 @@ END /* Tipi di angoli */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minuti d'arco" + IDS_ANGLE_ARCSECONDS "Secondi d'arco" IDS_ANGLE_DEGREES "Sessagesimali" IDS_ANGLE_GRADIANS "Centesimali (Gradienti)" IDS_ANGLE_RADIANS "Radianti" diff --git a/base/applications/calc/lang/ja-JP.rc b/base/applications/calc/lang/ja-JP.rc index d233cd1743..10d367d25a 100644 --- a/base/applications/calc/lang/ja-JP.rc +++ b/base/applications/calc/lang/ja-JP.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Degrees" IDS_ANGLE_GRADIANS "Gradians" IDS_ANGLE_RADIANS "Radians" diff --git a/base/applications/calc/lang/ko-KR.rc b/base/applications/calc/lang/ko-KR.rc index 6f89a52f3b..76fb37a132 100644 --- a/base/applications/calc/lang/ko-KR.rc +++ b/base/applications/calc/lang/ko-KR.rc @@ -431,6 +431,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Degrees" IDS_ANGLE_GRADIANS "Gradians" IDS_ANGLE_RADIANS "Radians" diff --git a/base/applications/calc/lang/nl-NL.rc b/base/applications/calc/lang/nl-NL.rc index 3fbc36f0e7..07e504780f 100644 --- a/base/applications/calc/lang/nl-NL.rc +++ b/base/applications/calc/lang/nl-NL.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Graden" IDS_ANGLE_GRADIANS "Gradiënten" IDS_ANGLE_RADIANS "Radialen" diff --git a/base/applications/calc/lang/no-NO.rc b/base/applications/calc/lang/no-NO.rc index 9330e67c9a..94e0be3954 100644 --- a/base/applications/calc/lang/no-NO.rc +++ b/base/applications/calc/lang/no-NO.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Grader" IDS_ANGLE_GRADIANS "Gradianer" IDS_ANGLE_RADIANS "Radianer" diff --git a/base/applications/calc/lang/pl-PL.rc b/base/applications/calc/lang/pl-PL.rc index e5eb69e7fe..24de8f13c5 100644 --- a/base/applications/calc/lang/pl-PL.rc +++ b/base/applications/calc/lang/pl-PL.rc @@ -438,6 +438,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Stopnie" IDS_ANGLE_GRADIANS "Gradiany" IDS_ANGLE_RADIANS "Radiany" diff --git a/base/applications/calc/lang/pt-BR.rc b/base/applications/calc/lang/pt-BR.rc index 58bfd7d248..e33b2ba467 100644 --- a/base/applications/calc/lang/pt-BR.rc +++ b/base/applications/calc/lang/pt-BR.rc @@ -431,6 +431,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Graus" IDS_ANGLE_GRADIANS "Grados" IDS_ANGLE_RADIANS "Radianos" diff --git a/base/applications/calc/lang/ro-RO.rc b/base/applications/calc/lang/ro-RO.rc index 2a86965ec2..1b1f3b847a 100644 --- a/base/applications/calc/lang/ro-RO.rc +++ b/base/applications/calc/lang/ro-RO.rc @@ -434,6 +434,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Grade" IDS_ANGLE_GRADIANS "Gradiani" IDS_ANGLE_RADIANS "Radiani" diff --git a/base/applications/calc/lang/ru-RU.rc b/base/applications/calc/lang/ru-RU.rc index 626d645f68..bd6c06b83b 100644 --- a/base/applications/calc/lang/ru-RU.rc +++ b/base/applications/calc/lang/ru-RU.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "градус" IDS_ANGLE_GRADIANS "град" IDS_ANGLE_RADIANS "радиан" diff --git a/base/applications/calc/lang/sk-SK.rc b/base/applications/calc/lang/sk-SK.rc index 175504dea6..8e323e4926 100644 --- a/base/applications/calc/lang/sk-SK.rc +++ b/base/applications/calc/lang/sk-SK.rc @@ -436,6 +436,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Stupne" IDS_ANGLE_GRADIANS "Grady" IDS_ANGLE_RADIANS "Radiány" diff --git a/base/applications/calc/lang/sq-AL.rc b/base/applications/calc/lang/sq-AL.rc index f7f896c468..a508299a57 100644 --- a/base/applications/calc/lang/sq-AL.rc +++ b/base/applications/calc/lang/sq-AL.rc @@ -433,6 +433,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Gradë" IDS_ANGLE_GRADIANS "Gradian" IDS_ANGLE_RADIANS "Radians" diff --git a/base/applications/calc/lang/sv-SE.rc b/base/applications/calc/lang/sv-SE.rc index f9363a3843..3a4de3cd8b 100644 --- a/base/applications/calc/lang/sv-SE.rc +++ b/base/applications/calc/lang/sv-SE.rc @@ -436,6 +436,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Grader" IDS_ANGLE_GRADIANS "Gradianer" IDS_ANGLE_RADIANS "Radianer" diff --git a/base/applications/calc/lang/th-TH.rc b/base/applications/calc/lang/th-TH.rc index 72901fd88e..ff97aabb99 100644 --- a/base/applications/calc/lang/th-TH.rc +++ b/base/applications/calc/lang/th-TH.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "องศา" IDS_ANGLE_GRADIANS "เกรเดียน" IDS_ANGLE_RADIANS "เรเดียน" diff --git a/base/applications/calc/lang/tr-TR.rc b/base/applications/calc/lang/tr-TR.rc index 8e3dd25a7d..9342751438 100644 --- a/base/applications/calc/lang/tr-TR.rc +++ b/base/applications/calc/lang/tr-TR.rc @@ -431,6 +431,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Derece" IDS_ANGLE_GRADIANS "Gradyan" IDS_ANGLE_RADIANS "Radyan" diff --git a/base/applications/calc/lang/uk-UA.rc b/base/applications/calc/lang/uk-UA.rc index 238a418816..bf5447b755 100644 --- a/base/applications/calc/lang/uk-UA.rc +++ b/base/applications/calc/lang/uk-UA.rc @@ -437,6 +437,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Градус" IDS_ANGLE_GRADIANS "Град" IDS_ANGLE_RADIANS "Радіан" diff --git a/base/applications/calc/lang/zh-CN.rc b/base/applications/calc/lang/zh-CN.rc index b98d84f625..f3d60132ba 100644 --- a/base/applications/calc/lang/zh-CN.rc +++ b/base/applications/calc/lang/zh-CN.rc @@ -431,6 +431,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "角度" IDS_ANGLE_GRADIANS "梯度" IDS_ANGLE_RADIANS "弧度" diff --git a/base/applications/calc/resource.h b/base/applications/calc/resource.h index d822f21596..7fb2c41aac 100644 --- a/base/applications/calc/resource.h +++ b/base/applications/calc/resource.h @@ -126,9 +126,11 @@ #define IDS_CONV_WEIGHT 2012 /* TYPES OF ANGLES */ -#define IDS_ANGLE_DEGREES 2100 -#define IDS_ANGLE_GRADIANS 2101 -#define IDS_ANGLE_RADIANS 2102 +#define IDS_ANGLE_ARCMINUTES 2100 +#define IDS_ANGLE_ARCSECONDS 2101 +#define IDS_ANGLE_DEGREES 2102 +#define IDS_ANGLE_GRADIANS 2103 +#define IDS_ANGLE_RADIANS 2104 /* TYPES OF AREAS */ #define IDS_AREA_ACRES 2200
