From c41c2d5ee4bac40b337186bdb24d3af21c7ada98 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Wed, 21 Feb 2024 22:23:21 +0100 Subject: [PATCH] Codechange: rename number abbreviations to currency abbreviations --- src/lang/afrikaans.txt | 2 +- src/lang/arabic_egypt.txt | 2 +- src/lang/basque.txt | 2 +- src/lang/belarusian.txt | 2 +- src/lang/brazilian_portuguese.txt | 2 +- src/lang/bulgarian.txt | 2 +- src/lang/catalan.txt | 2 +- src/lang/chuvash.txt | 2 +- src/lang/croatian.txt | 2 +- src/lang/czech.txt | 2 +- src/lang/danish.txt | 2 +- src/lang/dutch.txt | 2 +- src/lang/english.txt | 2 +- src/lang/english_AU.txt | 2 +- src/lang/english_US.txt | 2 +- src/lang/esperanto.txt | 2 +- src/lang/estonian.txt | 2 +- src/lang/faroese.txt | 2 +- src/lang/finnish.txt | 2 +- src/lang/french.txt | 2 +- src/lang/frisian.txt | 2 +- src/lang/gaelic.txt | 2 +- src/lang/galician.txt | 2 +- src/lang/german.txt | 2 +- src/lang/greek.txt | 2 +- src/lang/hebrew.txt | 2 +- src/lang/hindi.txt | 2 +- src/lang/hungarian.txt | 2 +- src/lang/icelandic.txt | 2 +- src/lang/ido.txt | 2 +- src/lang/indonesian.txt | 2 +- src/lang/irish.txt | 2 +- src/lang/italian.txt | 2 +- src/lang/japanese.txt | 2 +- src/lang/korean.txt | 2 +- src/lang/latin.txt | 2 +- src/lang/latvian.txt | 2 +- src/lang/lithuanian.txt | 2 +- src/lang/luxembourgish.txt | 2 +- src/lang/macedonian.txt | 2 +- src/lang/malay.txt | 2 +- src/lang/maltese.txt | 2 +- src/lang/marathi.txt | 2 +- src/lang/norwegian_bokmal.txt | 2 +- src/lang/norwegian_nynorsk.txt | 2 +- src/lang/persian.txt | 2 +- src/lang/polish.txt | 2 +- src/lang/portuguese.txt | 2 +- src/lang/romanian.txt | 2 +- src/lang/russian.txt | 2 +- src/lang/serbian.txt | 2 +- src/lang/simplified_chinese.txt | 2 +- src/lang/slovak.txt | 2 +- src/lang/slovenian.txt | 2 +- src/lang/spanish.txt | 2 +- src/lang/spanish_MX.txt | 2 +- src/lang/swedish.txt | 2 +- src/lang/tamil.txt | 2 +- src/lang/thai.txt | 2 +- src/lang/traditional_chinese.txt | 2 +- src/lang/turkish.txt | 2 +- src/lang/ukrainian.txt | 2 +- src/lang/urdu.txt | 2 +- src/lang/vietnamese.txt | 2 +- src/lang/welsh.txt | 2 +- src/language.h | 4 ++-- src/settings_type.h | 2 +- src/strgen/strgen.cpp | 8 ++++---- src/strgen/strgen_base.cpp | 2 +- src/strings.cpp | 22 +++++++++++----------- src/table/settings/gui_settings.ini | 2 +- 71 files changed, 85 insertions(+), 85 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 1f1611ccfe..35e5308fbd 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0436 ##grflangid 0x1b diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 322c1fca5f..50270388f3 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -4,7 +4,7 @@ ##plural 1 ##textdir rtl ##numberformat 00٬000٬000٬000٬000٬000٬000 -##numberabbreviations 3=00٬000٬000٬000٬000٬000{NBSP}k|6=00٬000٬000٬000٬000{NBSP}m|9=00٬000٬000٬000{NBSP}bn|12=00٬000٬000{NBSP}tn|15=00٬000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00٬000٬000٬000٬000٬000{NBSP}k|6=00٬000٬000٬000٬000{NBSP}m|9=00٬000٬000٬000{NBSP}bn|12=00٬000٬000{NBSP}tn|15=00٬000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep ٫ ##winlangid 0x0c01 ##grflangid 0x14 diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 6e043bb335..b7b719e3c4 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x042d ##grflangid 0x21 diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 7bc53d3167..2c0383632a 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -4,7 +4,7 @@ ##plural 6 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 -##numberabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0423 ##grflangid 0x10 diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 5f5d132fdb..2da5af432f 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -4,7 +4,7 @@ ##plural 2 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0416 ##grflangid 0x37 diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 5eabd61649..392f0a5d8f 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0402 ##grflangid 0x18 diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index e4ea64d036..9488297a48 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}G|12=00.000.000{NBSP}T|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}G|12=00.000.000{NBSP}T|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0403 ##grflangid 0x22 diff --git a/src/lang/chuvash.txt b/src/lang/chuvash.txt index a61104b9b2..e23cb6ddaa 100644 --- a/src/lang/chuvash.txt +++ b/src/lang/chuvash.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 -##numberabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0419 ##grflangid 0x0b diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index b194846d05..d172d2f790 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -4,7 +4,7 @@ ##plural 6 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x041a ##grflangid 0x38 diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 0f5f2d022f..d8ccc20fa3 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -4,7 +4,7 @@ ##plural 10 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 -##numberabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}tis.|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}mil.|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}mld.|12=00{NBSP}000{NBSP}000{NBSP}bil.|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}tis.|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}mil.|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}mld.|12=00{NBSP}000{NBSP}000{NBSP}bil.|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0405 ##grflangid 0x15 diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 2004e44335..86fe5fd359 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0406 ##grflangid 0x2d diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 164ba40fc6..afc8d67df1 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}mj|9=00.000.000.000{NBSP}md|12=00.000.000{NBSP}bn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}mj|9=00.000.000.000{NBSP}md|12=00.000.000{NBSP}bn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0413 ##grflangid 0x1f diff --git a/src/lang/english.txt b/src/lang/english.txt index f406e61b8e..5ae18ae16e 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0809 ##grflangid 0x01 diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 516331950a..259806a7c7 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0c09 ##grflangid 0x3d diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index e8b12df2fa..16e627a3a4 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}K|6=00,000,000,000,000{NBSP}M|9=00,000,000,000{NBSP}B|12=00,000,000{NBSP}T|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}K|6=00,000,000,000,000{NBSP}M|9=00,000,000,000{NBSP}B|12=00,000,000{NBSP}T|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0409 ##grflangid 0x00 diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index bb8c6ad415..74438ccede 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0000 ##grflangid 0x05 diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 16fc5879ea..fa6c31b9c6 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0425 ##grflangid 0x34 diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 1a4efe46e9..dd9a553a99 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0438 ##grflangid 0x12 diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 8c2dcf12fa..b240737253 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 -##numberabbreviations 6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}milj.|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}mrd.|12=00{NBSP}000{NBSP}000{NBSP} t|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}milj.|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}mrd.|12=00{NBSP}000{NBSP}000{NBSP} t|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x040b ##grflangid 0x35 diff --git a/src/lang/french.txt b/src/lang/french.txt index d6cc68ac0f..d025c74dca 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -4,7 +4,7 @@ ##plural 2 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 -##numberabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}Mio|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}Mrd|12=00{NBSP}000{NBSP}000{NBSP}kMrd|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}Mio|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}Mrd|12=00{NBSP}000{NBSP}000{NBSP}kMrd|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x040c ##grflangid 0x03 diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index 8fce6607c5..7444b42def 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0462 ##grflangid 0x32 diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index c7073d858b..b2095630c2 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -4,7 +4,7 @@ ##plural 13 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x083c ##grflangid 0x13 diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 2c7656a157..44ba985127 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}MM|12=00.000.000{NBSP}bn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}MM|12=00.000.000{NBSP}bn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0456 ##grflangid 0x31 diff --git a/src/lang/german.txt b/src/lang/german.txt index eb9a4a8882..9c1e8e0b54 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}Tsd.|6=00.000.000.000.000{NBSP}Mio.|9=00.000.000.000{NBSP}Mrd.|12=00.000.000{NBSP}Bio.|15=00.000{NBSP}Brd.|18=00{NBSP}Trill. +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}Tsd.|6=00.000.000.000.000{NBSP}Mio.|9=00.000.000.000{NBSP}Mrd.|12=00.000.000{NBSP}Bio.|15=00.000{NBSP}Brd.|18=00{NBSP}Trill. ##decimalsep , ##winlangid 0x0407 ##grflangid 0x02 diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 4e0139cc5b..70ed399fd2 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -4,7 +4,7 @@ ##plural 2 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0408 ##grflangid 0x1e diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index baaf2e2403..c4fc7761a6 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir rtl ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x040d ##grflangid 0x61 diff --git a/src/lang/hindi.txt b/src/lang/hindi.txt index ac4fd6e953..675ec3384a 100644 --- a/src/lang/hindi.txt +++ b/src/lang/hindi.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0439 ##grflangid 0x17 diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index d50f1cfb06..dede29c91f 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -4,7 +4,7 @@ ##plural 2 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}e|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}mrd|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}e|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}mrd|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x040e ##grflangid 0x24 diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index d2365c318d..230ce74c9c 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x040f ##grflangid 0x29 diff --git a/src/lang/ido.txt b/src/lang/ido.txt index c6b9852f27..f457d6a8df 100644 --- a/src/lang/ido.txt +++ b/src/lang/ido.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0000 ##grflangid 0x06 diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index f77fc0b1ee..3b6ed06c61 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -4,7 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0421 ##grflangid 0x5a diff --git a/src/lang/irish.txt b/src/lang/irish.txt index a871c1e219..25cc97c094 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -4,7 +4,7 @@ ##plural 4 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x083c ##grflangid 0x08 diff --git a/src/lang/italian.txt b/src/lang/italian.txt index aedd5e5d2b..ca99fe02e9 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0410 ##grflangid 0x27 diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index f6045fda91..6f361a5f84 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -4,7 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 0000京0000兆0000億0000万0000 -##numberabbreviations 4=0000京0000兆0000億0000万|8=0000京0000兆0000億|12=0000京0000兆|16=0000京 +##currencyabbreviations 4=0000京0000兆0000億0000万|8=0000京0000兆0000億|12=0000京0000兆|16=0000京 ##decimalsep . ##winlangid 0x0411 ##grflangid 0x39 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 1984e7aeda..4f718ad8a7 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -4,7 +4,7 @@ ##plural 11 ##textdir ltr ##numberformat 0000경0000조0000억0000만0000 -##numberabbreviations 4=0000경0000조0000억0000만|8=0000경0000조0000억|12=0000경0000조|16=0000경 +##currencyabbreviations 4=0000경0000조0000억0000만|8=0000경0000조0000억|12=0000경0000조|16=0000경 ##decimalsep . ##winlangid 0x0412 ##grflangid 0x3a diff --git a/src/lang/latin.txt b/src/lang/latin.txt index b37f487ae0..58f9b5ec3e 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 -##numberabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0476 ##grflangid 0x66 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index a88841e696..fe2d763e9f 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -4,7 +4,7 @@ ##plural 3 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}tk.|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}mljrd.|12=00.000.000{NBSP}tonna|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}tk.|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}mljrd.|12=00.000.000{NBSP}tonna|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0426 ##grflangid 0x2a diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 5c4274895c..e16ba2cd04 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -4,7 +4,7 @@ ##plural 5 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0427 ##grflangid 0x2b diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index c571c33b2f..79481197b1 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}d|6=00.000.000.000.000{NBSP}Mio|9=00.000.000.000{NBSP}Mrd|12=00.000.000{NBSP}Bio|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}d|6=00.000.000.000.000{NBSP}Mio|9=00.000.000.000{NBSP}Mrd|12=00.000.000{NBSP}Bio|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x046e ##grflangid 0x23 diff --git a/src/lang/macedonian.txt b/src/lang/macedonian.txt index 622d97dfa0..896ca341aa 100644 --- a/src/lang/macedonian.txt +++ b/src/lang/macedonian.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x042f ##grflangid 0x26 diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 4c50275c35..9eb443aa04 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x043a ##grflangid 0x3c diff --git a/src/lang/maltese.txt b/src/lang/maltese.txt index 87f3eaeed4..9cb470cf52 100644 --- a/src/lang/maltese.txt +++ b/src/lang/maltese.txt @@ -4,7 +4,7 @@ ##plural 12 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x043a ##grflangid 0x09 diff --git a/src/lang/marathi.txt b/src/lang/marathi.txt index 00886ecc5b..6cb5e4bafe 100644 --- a/src/lang/marathi.txt +++ b/src/lang/marathi.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x044e ##grflangid 0x11 diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 2349678162..4442b329e9 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 -##numberabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0414 ##grflangid 0x2f diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 712a870747..4230a44cd0 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 -##numberabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0814 ##grflangid 0x0e diff --git a/src/lang/persian.txt b/src/lang/persian.txt index 4c413b5d27..18329a6bd8 100644 --- a/src/lang/persian.txt +++ b/src/lang/persian.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir rtl ##numberformat 00٬000٬000٬000٬000٬000٬000 -##numberabbreviations 3=00٬000٬000٬000٬000٬000{NBSP}k|6=00٬000٬000٬000٬000{NBSP}m|9=00٬000٬000٬000{NBSP}bn|12=00٬000٬000{NBSP}tn|15=00٬000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00٬000٬000٬000٬000٬000{NBSP}k|6=00٬000٬000٬000٬000{NBSP}m|9=00٬000٬000٬000{NBSP}bn|12=00٬000٬000{NBSP}tn|15=00٬000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep ٫ ##winlangid 0x0429 ##grflangid 0x62 diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 3af3662f72..fc432bb516 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -4,7 +4,7 @@ ##plural 7 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}G|12=00.000.000{NBSP}T|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}G|12=00.000.000{NBSP}T|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0415 ##grflangid 0x30 diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 8be0e3f973..a764564299 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0816 ##grflangid 0x36 diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 82a2de1bc7..08382077c2 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -4,7 +4,7 @@ ##plural 14 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}mii|6=00.000.000.000.000{NBSP}mil.|9=00.000.000.000{NBSP}mld.|12=00.000.000{NBSP}bil.|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}mii|6=00.000.000.000.000{NBSP}mil.|9=00.000.000.000{NBSP}mld.|12=00.000.000{NBSP}bil.|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0418 ##grflangid 0x28 diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 3d941179d2..618756677e 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -4,7 +4,7 @@ ##plural 6 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 -##numberabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}тыс.|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}млн|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}млрд.|12=00{NBSP}000{NBSP}000{NBSP}трлн.|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}тыс.|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}млн|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}млрд.|12=00{NBSP}000{NBSP}000{NBSP}трлн.|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0419 ##grflangid 0x07 diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index d4d6b407b6..ebd33e2148 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -4,7 +4,7 @@ ##plural 6 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x7c1a ##grflangid 0x0d diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 4de4662239..cf4e697fd6 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -4,7 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 0000京0000兆0000亿0000万0000 -##numberabbreviations 4=0000京0000兆0000亿0000万|8=0000京0000兆0000亿|12=0000京0000兆|16=0000京 +##currencyabbreviations 4=0000京0000兆0000亿0000万|8=0000京0000兆0000亿|12=0000京0000兆|16=0000京 ##decimalsep . ##winlangid 0x0804 ##grflangid 0x56 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 70f6fe9813..10f54ae60d 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -4,7 +4,7 @@ ##plural 10 ##textdir ltr ##numberformat 00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000 -##numberabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}k|6=00{NBSP}000{NBSP}000{NBSP}000{NBSP}000{NBSP}m|9=00{NBSP}000{NBSP}000{NBSP}000{NBSP}bn|12=00{NBSP}000{NBSP}000{NBSP}tn|15=00{NBSP}000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x041b ##grflangid 0x16 diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 88e44627e0..ece63c778c 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -4,7 +4,7 @@ ##plural 8 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0424 ##grflangid 0x2c diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 9ae5587f98..510a7e09a1 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}kM|12=00.000.000{NBSP}MM|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}M|9=00.000.000.000{NBSP}kM|12=00.000.000{NBSP}MM|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0c0a ##grflangid 0x04 diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index ba18c5b8ac..23a3d52629 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x080a ##grflangid 0x55 diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index b9ecb07404..53ad0815c1 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}t|6=00.000.000.000.000{NBSP}mn|9=00.000.000.000{NBSP}md|12=00.000.000{NBSP}bn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}t|6=00.000.000.000.000{NBSP}mn|9=00.000.000.000{NBSP}md|12=00.000.000{NBSP}bn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x081d ##grflangid 0x2e diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index ebb518ece8..5417ae62ea 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0449 ##grflangid 0x0a diff --git a/src/lang/thai.txt b/src/lang/thai.txt index dbcf74c716..b1628c19eb 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -4,7 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x041e ##grflangid 0x42 diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index e8c6dbd60c..b9d60f8e6d 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -4,7 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 0000京0000兆0000億0000万0000 -##numberabbreviations 4=0000京0000兆0000億0000万|8=0000京0000兆0000億|12=0000京0000兆|16=0000京 +##currencyabbreviations 4=0000京0000兆0000億0000万|8=0000京0000兆0000億|12=0000京0000兆|16=0000京 ##decimalsep . ##winlangid 0x0404 ##grflangid 0x0c diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 38a92aab22..f24f705558 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -4,7 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}mlyn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}mlyn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x041f ##grflangid 0x3e diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 5c916bbd62..109b4cc087 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -4,7 +4,7 @@ ##plural 6 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}тис.|6=00.000.000.000.000{NBSP}млн|9=00.000.000.000{NBSP}млрд|12=00.000.000{NBSP}трлн|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}тис.|6=00.000.000.000.000{NBSP}млн|9=00.000.000.000{NBSP}млрд|12=00.000.000{NBSP}трлн|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x0422 ##grflangid 0x33 diff --git a/src/lang/urdu.txt b/src/lang/urdu.txt index 8776261f5c..4e059599cf 100644 --- a/src/lang/urdu.txt +++ b/src/lang/urdu.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir rtl ##numberformat 00٬000٬000٬000٬000٬000٬000 -##numberabbreviations 3=00٬000٬000٬000٬000٬000{NBSP}k|6=00٬000٬000٬000٬000{NBSP}m|9=00٬000٬000٬000{NBSP}bn|12=00٬000٬000{NBSP}tn|15=00٬000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00٬000٬000٬000٬000٬000{NBSP}k|6=00٬000٬000٬000٬000{NBSP}m|9=00٬000٬000٬000{NBSP}bn|12=00٬000٬000{NBSP}tn|15=00٬000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep ٫ ##winlangid 0x0420 ##grflangid 0x5c diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 89e1560085..ca0cde47e3 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -4,7 +4,7 @@ ##plural 1 ##textdir ltr ##numberformat 00.000.000.000.000.000.000 -##numberabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00.000.000.000.000.000{NBSP}k|6=00.000.000.000.000{NBSP}m|9=00.000.000.000{NBSP}bn|12=00.000.000{NBSP}tn|15=00.000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep , ##winlangid 0x042a ##grflangid 0x54 diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index ae09af706f..177bf412f0 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -4,7 +4,7 @@ ##plural 0 ##textdir ltr ##numberformat 00,000,000,000,000,000,000 -##numberabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi +##currencyabbreviations 3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi ##decimalsep . ##winlangid 0x0452 ##grflangid 0x0f diff --git a/src/language.h b/src/language.h index 3664113194..d9dabffdce 100644 --- a/src/language.h +++ b/src/language.h @@ -33,8 +33,8 @@ struct LanguagePackHeader { /** The raw formatting string for numbers. */ char number_format[64]; - /** The raw formatting string for number abbreviations. */ - char number_abbreviations[256]; + /** The raw formatting string for currency abbreviations. */ + char currency_abbreviations[256]; /** Decimal separator */ char digit_decimal_separator[8]; uint16_t missing; ///< number of missing strings. diff --git a/src/settings_type.h b/src/settings_type.h index 0d70c5b939..c1318556ec 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -223,7 +223,7 @@ struct GUISettings { bool scale_bevels; ///< bevels are scaled with GUI scale. std::string number_format; ///< formatting string for numbers (like "thousands" grouping) - std::string number_abbreviations; ///< mapping to number formats for different powers of ten/thresholds + std::string currency_abbreviations; ///< mapping to currency number formats for different powers of ten/thresholds std::string digit_decimal_separator; ///< decimal separator /** diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp index 60d2afa5be..e018cc2d1f 100644 --- a/src/strgen/strgen.cpp +++ b/src/strgen/strgen.cpp @@ -129,14 +129,14 @@ void FileStringReader::HandlePragma(char *str) if (result.has_value()) FatalError("Invalid number format: {}", *result); strecpy(_lang.number_format, str, lastof(_lang.number_format)); - } else if (!memcmp(str, "numberabbreviations ", 20)) { - str += 20; + } else if (!memcmp(str, "currencyabbreviations ", 22)) { + str += 22; NumberAbbreviations abbreviations; auto result = ParseNumberAbbreviations(abbreviations, str); - if (result.has_value()) FatalError("Invalid number abbreviations: {}", *result); + if (result.has_value()) FatalError("Invalid currency abbreviations: {}", *result); - strecpy(_lang.number_abbreviations, str, lastof(_lang.number_abbreviations)); + strecpy(_lang.currency_abbreviations, str, lastof(_lang.currency_abbreviations)); } else if (!memcmp(str, "decimalsep ", 11)) { str += 11; strecpy(_lang.digit_decimal_separator, strcmp(str, "{NBSP}") == 0 ? NBSP : str, lastof(_lang.digit_decimal_separator)); diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp index 4b08d05099..a01590e23f 100644 --- a/src/strgen/strgen_base.cpp +++ b/src/strgen/strgen_base.cpp @@ -757,7 +757,7 @@ void StringReader::ParseFile() /* For each new file we parse, reset the genders, and language codes. */ MemSetT(&_lang, 0); strecpy(_lang.number_format, "00,000,000,000,000,000,000", lastof(_lang.number_format)); - strecpy(_lang.number_abbreviations, "3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi", lastof(_lang.number_abbreviations)); + strecpy(_lang.currency_abbreviations, "3=00,000,000,000,000,000{NBSP}k|6=00,000,000,000,000{NBSP}m|9=00,000,000,000{NBSP}bn|12=00,000,000{NBSP}tn|15=00,000{NBSP}Qa|18=00{NBSP}Qi", lastof(_lang.currency_abbreviations)); strecpy(_lang.digit_decimal_separator, ".", lastof(_lang.digit_decimal_separator)); _cur_line = 1; diff --git a/src/strings.cpp b/src/strings.cpp index 9f34191a68..f178e58088 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -56,7 +56,7 @@ const LanguageMetadata *_current_language = nullptr; ///< The currently loaded l TextDirection _current_text_dir; ///< Text direction of the currently selected language. static NumberFormatSeparators _number_format_separators; -static NumberAbbreviations _number_abbreviations; +static NumberAbbreviations _currency_abbreviations; #ifdef WITH_ICU_I18N std::unique_ptr _current_collator; ///< Collator for the language currently in use. @@ -397,14 +397,14 @@ void InitializeNumberFormats() } if (!loaded_number_format) ParseNumberFormatSeparators(_number_format_separators, _current_language->number_format); - bool loaded_number_abbreviations = false; - if (!_settings_client.gui.number_abbreviations.empty()) { - auto res = ParseNumberAbbreviations(_number_abbreviations, _settings_client.gui.number_abbreviations); - if (res.has_value()) UserError("The setting 'number_abbreviations' under 'gui' is invalid: {}", *res); - loaded_number_abbreviations = !res.has_value(); + bool loaded_currency_abbreviations = false; + if (!_settings_client.gui.currency_abbreviations.empty()) { + auto res = ParseNumberAbbreviations(_currency_abbreviations, _settings_client.gui.currency_abbreviations); + if (res.has_value()) UserError("The setting 'currency_abbreviations' under 'gui' is invalid: {}", *res); + loaded_currency_abbreviations = !res.has_value(); } - if (!loaded_number_abbreviations) ParseNumberAbbreviations(_number_abbreviations, _current_language->number_abbreviations); - _number_abbreviations.emplace_back(1, _number_format_separators); + if (!loaded_currency_abbreviations) ParseNumberAbbreviations(_currency_abbreviations, _current_language->currency_abbreviations); + _currency_abbreviations.emplace_back(1, _number_format_separators); } /** @@ -536,11 +536,11 @@ static void FormatGenericCurrency(StringBuilder &builder, const CurrencySpec *sp /* For huge numbers, compact the number. */ if (compact) { - auto it = _number_abbreviations.begin(); + auto it = _currency_abbreviations.begin(); for (;;) { int64_t threshold = it->threshold; ++it; - if (it == _number_abbreviations.end()) break; + if (it == _currency_abbreviations.end()) break; int64_t divisor = it->threshold; threshold -= divisor / 2; @@ -1895,7 +1895,7 @@ bool LanguagePackHeader::IsValid() const StrValid(this->own_name, lastof(this->own_name)) && StrValid(this->isocode, lastof(this->isocode)) && StrValid(this->number_format, lastof(this->number_format)) && - StrValid(this->number_abbreviations, lastof(this->number_abbreviations)) && + StrValid(this->currency_abbreviations, lastof(this->currency_abbreviations)) && StrValid(this->digit_decimal_separator, lastof(this->digit_decimal_separator)); } diff --git a/src/table/settings/gui_settings.ini b/src/table/settings/gui_settings.ini index 46e8e4c831..bd2adc2033 100644 --- a/src/table/settings/gui_settings.ini +++ b/src/table/settings/gui_settings.ini @@ -915,7 +915,7 @@ post_cb = [](auto) { InitializeNumberFormats(); MarkWholeScreenDirty(); } startup = true [SDTC_SSTR] -var = gui.number_abbreviations +var = gui.currency_abbreviations flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC type = SLE_STRQ def = nullptr