Skip to content

Commit 804f48e

Browse files
committed
Merge remote-tracking branch 'upstream/SLE-15-SP6' into huha-kyiv-master
2 parents 079c4ed + 8c09621 commit 804f48e

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

language/src/data/languages/language_uk_UA.ycp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
_("Ukrainian")
3737
],
3838
// 2. what time zone propose for this language
39-
"timezone" : "Europe/Kiev",
39+
"timezone" : "Europe/Kyiv",
4040
// 3. which keyboard layout propose for this language
4141
"keyboard" : "ukrainian",
4242
];

package/yast2-country.changes

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
-------------------------------------------------------------------
2+
Thu May 16 20:41:25 UTC 2024 - [email protected]
3+
4+
- Rename Europe/Kiev to Europe/Kyiv as per 2022b release of
5+
tz code and data by ICANN (bsc#1224387)
6+
- 5.0.3
7+
18
-------------------------------------------------------------------
29
Tue Oct 24 11:54:32 UTC 2023 - Martin Vidner <[email protected]>
310

package/yast2-country.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
Name: yast2-country
19-
Version: 5.0.2
19+
Version: 5.0.3
2020
Release: 0
2121
Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone)
2222
License: GPL-2.0-only

timezone/src/data/lang2tz.ycp

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ $[
6565

6666
"ru" : "Europe/Moscow",
6767
"ru_RU.KOI8-R" : "Europe/Moscow",
68-
"ru_UA" : "Europe/Kiev",
68+
"ru_UA" : "Europe/Kyiv",
6969

7070
"sr_YU" : "Europe/Belgrade",
7171

timezone/src/data/timezone_raw.ycp

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ $[
4747
// time zone
4848
"Europe/Kaliningrad" : _("Russia (Kaliningrad)"),
4949
// time zone
50-
"Europe/Kiev" : _("Ukraine (Kiev)"),
50+
"Europe/Kyiv" : _("Ukraine (Kyiv)"),
5151
"Europe/Lisbon" : _("Portugal"),
5252
"Europe/Ljubljana" : _("Slovenia"),
5353
"Europe/London" : _("United Kingdom"),

0 commit comments

Comments
 (0)