From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 4 Oct 2022 14:15:47 +0000 (+0300)
Subject: Fix recent changes for Ukrainian language
X-Git-Tag: emacs-29.0.90~1856^2~29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0ee4c68f1725675b0a974bcdb8193749e437822;p=emacs.git

Fix recent changes for Ukrainian language

* etc/HELLO:
* lisp/language/cyrillic.el ("Ukrainian"): Fix greetings and
remove redundant Ukrainian entry in cyrillic.el.
---

diff --git a/etc/HELLO b/etc/HELLO
index 7ddaed44b91..b05c09da3c0 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -114,7 +114,7 @@ Tibetan (བོད་སྐད་)	བཀྲ་ཤིས་བདེ་ལེག
 Tigrigna (ትግርኛ)	ሰላማት
 Tirhuta (𑒞𑒱𑒩𑒯𑒳𑒞𑒰)	𑒣𑓂𑒩𑒢𑒰𑒧 / 𑒮𑒲𑒞𑒰𑒩𑒰𑒧
 Turkish (Türkçe)	Merhaba
-Ukrainian (українська)	Вітаю
+Ukrainian (українська)	Вітаю / Добрий день! / Привіт
 Vietnamese (tiếng Việt)	Chào bạn
 Wancho (𞋒𞋀𞋉𞋃𞋕)    	𞋂𞋈𞋛
 
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 753e99e9d48..a9017062cc6 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -137,9 +137,9 @@ Support for Russian using koi8-r and the russian-computer input method.")
 	       (coding-priority koi8-u)
 	       (nonascii-translation . koi8-u)
 	       (input-method . "ukrainian-computer")
-	       (sample-text . "Ukrainian (Українська)  Доброго дня!")
+	       (sample-text . "Ukrainian (Українська)	Вітаю / Добрий день! / Привіт")
 	       (documentation
-		. "Support for Ukrainian with KOI8-U character set."))
+		. "Support for Ukrainian with koi8-u character set."))
  '("Cyrillic"))
 
 ;;; ALTERNATIVNYJ stuff
@@ -256,14 +256,6 @@ Support for Russian using koi8-r and the russian-computer input method.")
 \(The name Belarusian replaced Byelorussian in the early 1990s.)"))
  '("Cyrillic"))
 
-(set-language-info-alist
- "Ukrainian" '((coding-system koi8-u)
-	       (coding-priority koi8-u)
-	       (input-method . "ukrainian-computer")
-	       (documentation
-		. "Support for Ukrainian with koi8-u character set."))
- '("Cyrillic"))
-
 (provide 'cyrillic)
 
 ;;; cyrillic.el ends here