]>
Commit | Line | Data |
---|---|---|
12788f63 MT |
1 | commit 42c5011242e48f846111237552d3bf3ca18c4885 |
2 | Author: Ulrich Drepper <drepper@gmail.com> | |
3 | Date: Fri Dec 23 09:51:10 2011 -0500 | |
4 | ||
5 | Various fixes to fi_FI | |
6 | ||
7 | 2011-12-23 Ulrich Drepper <drepper@gmail.com> | |
8 | ||
9 | [BZ #12962] | |
10 | * locales/fi_FI: Various fixups. | |
11 | Patch by Marko Myllynen <myllynen@redhat.com>. | |
12 | ||
13 | diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI | |
14 | index acc9ce6..f51700c 100644 | |
15 | --- a/localedata/locales/fi_FI | |
16 | +++ b/localedata/locales/fi_FI | |
17 | @@ -1,4 +1,4 @@ | |
18 | -escape_char / | |
19 | +escape_char / | |
20 | comment_char % | |
21 | ||
22 | % Finnish language locale for Finland | |
23 | @@ -45,10 +45,10 @@ category "fi_FI:2000";LC_NUMERIC | |
24 | category "fi_FI:2000";LC_MONETARY | |
25 | category "fi_FI:2000";LC_MESSAGES | |
26 | category "fi_FI:2000";LC_PAPER | |
27 | +category "fi_FI:2000";LC_MEASUREMENT | |
28 | category "fi_FI:2000";LC_NAME | |
29 | category "fi_FI:2000";LC_ADDRESS | |
30 | category "fi_FI:2000";LC_TELEPHONE | |
31 | - | |
32 | END LC_IDENTIFICATION | |
33 | ||
34 | LC_COLLATE | |
35 | @@ -125,7 +125,6 @@ reorder-after <U0044> | |
36 | <U0110> <d>;<OBL>;<CAP>;IGNORE | |
37 | ||
38 | reorder-end | |
39 | - | |
40 | END LC_COLLATE | |
41 | ||
42 | LC_CTYPE | |
43 | @@ -146,12 +145,10 @@ positive_sign "" | |
44 | negative_sign "<U002D>" | |
45 | int_frac_digits 2 | |
46 | frac_digits 2 | |
47 | -% int_curr_symbol precedes | |
48 | -% curr_symbol succeeds | |
49 | p_cs_precedes 0 | |
50 | -p_sep_by_space 2 | |
51 | +p_sep_by_space 1 | |
52 | n_cs_precedes 0 | |
53 | -n_sep_by_space 2 | |
54 | +n_sep_by_space 1 | |
55 | p_sign_posn 1 | |
56 | n_sign_posn 1 | |
57 | END LC_MONETARY | |
58 | @@ -173,18 +170,18 @@ day "<U0073><U0075><U006E><U006E><U0075><U006E><U0074><U0061><U0069>";/ | |
59 | "<U0074><U006F><U0072><U0073><U0074><U0061><U0069>";/ | |
60 | "<U0070><U0065><U0072><U006A><U0061><U006E><U0074><U0061><U0069>";/ | |
61 | "<U006C><U0061><U0075><U0061><U006E><U0074><U0061><U0069>" | |
62 | -abmon "<U0074><U0061><U006D><U006D><U0069><U00A0>";/ | |
63 | - "<U0068><U0065><U006C><U006D><U0069><U00A0>";/ | |
64 | +abmon "<U0074><U0061><U006D><U006D><U0069>";/ | |
65 | + "<U0068><U0065><U006C><U006D><U0069>";/ | |
66 | "<U006D><U0061><U0061><U006C><U0069><U0073>";/ | |
67 | - "<U0068><U0075><U0068><U0074><U0069><U00A0>";/ | |
68 | - "<U0074><U006F><U0075><U006B><U006F><U00A0>";/ | |
69 | - "<U006B><U0065><U0073><U00E4><U00A0><U00A0>";/ | |
70 | - "<U0068><U0065><U0069><U006E><U00E4><U00A0>";/ | |
71 | - "<U0065><U006C><U006F><U00A0><U00A0><U00A0>";/ | |
72 | - "<U0073><U0079><U0079><U0073><U00A0><U00A0>";/ | |
73 | - "<U006C><U006F><U006B><U0061><U00A0><U00A0>";/ | |
74 | + "<U0068><U0075><U0068><U0074><U0069>";/ | |
75 | + "<U0074><U006F><U0075><U006B><U006F>";/ | |
76 | + "<U006B><U0065><U0073><U00E4>";/ | |
77 | + "<U0068><U0065><U0069><U006E><U00E4>";/ | |
78 | + "<U0065><U006C><U006F>";/ | |
79 | + "<U0073><U0079><U0079><U0073>";/ | |
80 | + "<U006C><U006F><U006B><U0061>";/ | |
81 | "<U006D><U0061><U0072><U0072><U0061><U0073>";/ | |
82 | - "<U006A><U006F><U0075><U006C><U0075><U00A0>" | |
83 | + "<U006A><U006F><U0075><U006C><U0075>" | |
84 | mon "<U0074><U0061><U006D><U006D><U0069><U006B><U0075><U0075>";/ | |
85 | "<U0068><U0065><U006C><U006D><U0069><U006B><U0075><U0075>";/ | |
86 | "<U006D><U0061><U0061><U006C><U0069><U0073><U006B><U0075><U0075>";/ | |
87 | @@ -207,13 +204,14 @@ t_fmt_ampm "" | |
88 | date_fmt "<U0025><U0061><U0020><U0025><U002D><U0064><U002E><U0025>/ | |
89 | <U002D><U006D><U002E><U0025><U0059><U0020><U0025><U0048><U002E><U0025>/ | |
90 | <U004D><U002E><U0025><U0053><U0020><U0025><U007A>" | |
91 | +week 7;19971130;4 | |
92 | first_weekday 2 % Monday | |
93 | first_workday 2 % Monday | |
94 | END LC_TIME | |
95 | ||
96 | LC_MESSAGES | |
97 | -yesexpr "<U005E><U005B><U004B><U006B><U004A><U006A><U0059><U0079><U005D><U002E><U002A>" | |
98 | -noexpr "<U005E><U005B><U004E><U006E><U0045><U0065><U005D><U002E><U002A>" | |
99 | +yesexpr "<U005E><U005B><U004B><U006B><U0059><U0079><U005D><U002E><U002A>" | |
100 | +noexpr "<U005E><U005B><U0045><U0065><U004E><U006E><U005D><U002E><U002A>" | |
101 | END LC_MESSAGES | |
102 | ||
103 | LC_PAPER | |
104 | @@ -222,6 +220,7 @@ width 210 | |
105 | END LC_PAPER | |
106 | ||
107 | LC_TELEPHONE | |
108 | +tel_dom_fmt "<U0028><U0025><U0041><U0029><U0020><U0025><U006C>" | |
109 | tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ | |
110 | <U006C>" | |
111 | int_prefix "<U0033><U0035><U0038>" | |
112 | @@ -235,15 +234,25 @@ END LC_MEASUREMENT | |
113 | LC_NAME | |
114 | name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/ | |
115 | <U0025><U006D><U0025><U0074><U0025><U0066>" | |
116 | +% Finnish equivalents for Mr/Mrs/Miss/Ms are herra/rouva/rouva/neiti | |
117 | +% but they are practically never used, thus we don't define them here. | |
118 | END LC_NAME | |
119 | ||
120 | LC_ADDRESS | |
121 | -postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/ | |
122 | -<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/ | |
123 | -<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/ | |
124 | -<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/ | |
125 | +postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0064><U0025><U004E>/ | |
126 | +<U0025><U0062><U0025><U004E><U0025><U0061><U0025><U004E><U0025><U0073>/ | |
127 | +<U0020><U0025><U0068><U0025><U0074><U0025><U0065><U0025><U0074><U0025>/ | |
128 | +<U0072><U0025><U004E><U0025><U007A><U0020><U0025><U0054><U0025>/ | |
129 | <U004E><U0025><U0063><U0025><U004E>" | |
130 | country_ab2 "<U0046><U0049>" | |
131 | country_ab3 "<U0046><U0049><U004E>" | |
132 | country_num 246 | |
133 | +country_name "<U0053><U0075><U006F><U006D><U0069>" | |
134 | +country_post "<U0046><U0049>" | |
135 | +country_car "<U0046><U0049><U004E>" | |
136 | +country_isbn 952 | |
137 | +lang_name "<U0073><U0075><U006F><U006D><U0069>" | |
138 | +lang_ab "<U0066><U0069>" | |
139 | +lang_term "<U0066><U0069><U006E>" | |
140 | +lang_lib "<U0066><U0069><U006E>" | |
141 | END LC_ADDRESS |