From deb6b5a6c9c0a8e6f2ed14486941b36e81149304 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <sergey.cherevko@softline.com>
Date: Tue, 3 Sep 2024 14:17:52 +0300
Subject: [PATCH] Fixed Russian translation

---
 SOURCES/0001-Fixed-Russian-translation.patch | 236 +++++++++++++++++++
 SPECS/xkeyboard-config.spec                  |   9 +-
 2 files changed, 244 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0001-Fixed-Russian-translation.patch

diff --git a/SOURCES/0001-Fixed-Russian-translation.patch b/SOURCES/0001-Fixed-Russian-translation.patch
new file mode 100644
index 0000000..0386a0d
--- /dev/null
+++ b/SOURCES/0001-Fixed-Russian-translation.patch
@@ -0,0 +1,236 @@
+From da5227c10039586236bb92ce58a1336ffda83827 Mon Sep 17 00:00:00 2001
+From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
+Date: Tue, 3 Sep 2024 14:11:58 +0300
+Subject: [PATCH] Fixed Russian translation
+
+---
+ po/ru.po        | 24 ++++++++++++------------
+ rules/base.xml  | 16 ++++++++--------
+ rules/evdev.xml | 16 ++++++++--------
+ 3 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/po/ru.po b/po/ru.po
+index fab96bc..c823543 100644
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -3813,8 +3813,8 @@ msgid "Key to choose the 2nd level"
+ msgstr "Клавиша для выбора 2-го ряда"
+ 
+ #: rules/base.xml:6610 rules/base.xml:6702 rules/base.xml:7238
+-msgid "The \"&lt; &gt;\" key"
+-msgstr "Клавиша «&lt; &gt;»"
++msgid "The \"lt gt\" key"
++msgstr "Клавиша «< >»"
+ 
+ #: rules/base.xml:6619 rules/base.extras.xml:1370
+ msgid "Key to choose the 3rd level"
+@@ -3862,10 +3862,10 @@ msgstr ""
+ 
+ #: rules/base.xml:6720
+ msgid ""
+-"The \"&lt; &gt;\" key; acts as onetime lock when pressed together with "
++"The \"lt gt\" key; acts as onetime lock when pressed together with "
+ "another 3rd level chooser"
+ msgstr ""
+-"Клавиша «&lt; &gt;» действует как разовая блокировка при нажатии с другим "
++"Клавиша «< >» действует как разовая блокировка при нажатии с другим "
+ "выборщиком 3-го ряда"
+ 
+ #: rules/base.xml:6728
+@@ -4183,8 +4183,8 @@ msgid "3rd level of Caps Lock"
+ msgstr "3-й ряд Caps Lock"
+ 
+ #: rules/base.xml:7244
+-msgid "3rd level of the \"&lt; &gt;\" key"
+-msgstr "3-й ряд «&lt; &gt;»"
++msgid "3rd level of the \"lt gt\" key"
++msgstr "3-й ряд «< >»"
+ 
+ #: rules/base.xml:7250
+ msgid "Pause"
+@@ -4218,8 +4218,8 @@ msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+ msgstr "Shift не отменяет Num Lock, а выбирает 3-ий ряд"
+ 
+ #: rules/base.xml:7298
+-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+-msgstr "Специальные клавиши (Ctrl+Alt+&lt;клавиша&gt;) обрабатываются сервером"
++msgid "Special keys (Ctrl+Alt+key) handled in a server"
++msgstr "Специальные клавиши (Ctrl+Alt+<key>) обрабатываются сервером"
+ 
+ #: rules/base.xml:7304
+ msgid "Apple Aluminium emulates Pause, PrtSc, Scroll Lock"
+@@ -4292,8 +4292,8 @@ msgid "Key to choose 5th level"
+ msgstr "Клавиша для выбора 5-го ряда"
+ 
+ #: rules/base.xml:7407
+-msgid "The \"&lt; &gt;\" key chooses 5th level"
+-msgstr "«&lt; &gt;» выбирает 5-й ряд"
++msgid "The \"lt gt\" key chooses 5th level"
++msgstr "«< >» выбирает 5-й ряд"
+ 
+ #: rules/base.xml:7413
+ msgid "Right Alt chooses 5th level"
+@@ -4305,10 +4305,10 @@ msgstr "Меню выбирает 5-й ряд"
+ 
+ #: rules/base.xml:7425
+ msgid ""
+-"The \"&lt; &gt;\" key chooses 5th level and acts as a one-time lock if "
++"The \"lt gt\" key chooses 5th level and acts as a one-time lock if "
+ "pressed with another 5th level chooser"
+ msgstr ""
+-"Клавиша «&lt; &gt;» выбирает 5-й ряд и действует как разовая блокировка при "
++"Клавиша «< >» выбирает 5-й ряд и действует как разовая блокировка при "
+ "нажатии с другим выборщиком 5-го ряда"
+ 
+ #: rules/base.xml:7431
+diff --git a/rules/base.xml b/rules/base.xml
+index 62f4416..f28bd07 100644
+--- a/rules/base.xml
++++ b/rules/base.xml
+@@ -6607,7 +6607,7 @@
+       <option>
+         <configItem>
+           <name>lv2:lsgt_switch</name>
+-          <description>The "&lt; &gt;" key</description>
++          <description>The "lt gt" key</description>
+         </configItem>
+       </option>
+     </group>
+@@ -6699,7 +6699,7 @@
+       <option>
+         <configItem>
+           <name>lv3:lsgt_switch</name>
+-          <description>The "&lt; &gt;" key</description>
++          <description>The "lt gt" key</description>
+         </configItem>
+       </option>
+       <option>
+@@ -6717,7 +6717,7 @@
+       <option>
+         <configItem>
+           <name>lv3:lsgt_switch_latch</name>
+-          <description>The "&lt; &gt;" key; acts as onetime lock when pressed together with another 3rd level chooser</description>
++          <description>The "lt gt" key; acts as onetime lock when pressed together with another 3rd level chooser</description>
+         </configItem>
+       </option>
+     </group>
+@@ -7235,13 +7235,13 @@
+       <option>
+         <configItem>
+           <name>compose:102</name>
+-          <description>The "&lt; &gt;" key</description>
++          <description>The "lt gt" key</description>
+         </configItem>
+       </option>
+       <option>
+         <configItem>
+           <name>compose:102-altgr</name>
+-          <description>3rd level of the "&lt; &gt;" key</description>
++          <description>3rd level of the "lt gt" key</description>
+         </configItem>
+       </option>
+       <option>
+@@ -7295,7 +7295,7 @@
+       <option>
+         <configItem>
+           <name>srvrkeys:none</name>
+-          <description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server</description>
++          <description>Special keys (Ctrl+Alt+key) handled in a server</description>
+         </configItem>
+       </option>
+       <option>
+@@ -7404,7 +7404,7 @@
+       <option>
+         <configItem>
+           <name>lv5:lsgt_switch</name>
+-          <description>The "&lt; &gt;" key chooses 5th level</description>
++          <description>The "lt gt" key chooses 5th level</description>
+         </configItem>
+       </option>
+       <option>
+@@ -7422,7 +7422,7 @@
+       <option>
+         <configItem>
+           <name>lv5:lsgt_switch_lock</name>
+-          <description>The "&lt; &gt;" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser</description>
++          <description>The "lt gt" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser</description>
+         </configItem>
+       </option>
+       <option>
+diff --git a/rules/evdev.xml b/rules/evdev.xml
+index 62f4416..f28bd07 100644
+--- a/rules/evdev.xml
++++ b/rules/evdev.xml
+@@ -6607,7 +6607,7 @@
+       <option>
+         <configItem>
+           <name>lv2:lsgt_switch</name>
+-          <description>The "&lt; &gt;" key</description>
++          <description>The "lt gt" key</description>
+         </configItem>
+       </option>
+     </group>
+@@ -6699,7 +6699,7 @@
+       <option>
+         <configItem>
+           <name>lv3:lsgt_switch</name>
+-          <description>The "&lt; &gt;" key</description>
++          <description>The "lt gt" key</description>
+         </configItem>
+       </option>
+       <option>
+@@ -6717,7 +6717,7 @@
+       <option>
+         <configItem>
+           <name>lv3:lsgt_switch_latch</name>
+-          <description>The "&lt; &gt;" key; acts as onetime lock when pressed together with another 3rd level chooser</description>
++          <description>The "lt gt" key; acts as onetime lock when pressed together with another 3rd level chooser</description>
+         </configItem>
+       </option>
+     </group>
+@@ -7235,13 +7235,13 @@
+       <option>
+         <configItem>
+           <name>compose:102</name>
+-          <description>The "&lt; &gt;" key</description>
++          <description>The "lt gt" key</description>
+         </configItem>
+       </option>
+       <option>
+         <configItem>
+           <name>compose:102-altgr</name>
+-          <description>3rd level of the "&lt; &gt;" key</description>
++          <description>3rd level of the "lt gt" key</description>
+         </configItem>
+       </option>
+       <option>
+@@ -7295,7 +7295,7 @@
+       <option>
+         <configItem>
+           <name>srvrkeys:none</name>
+-          <description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server</description>
++          <description>Special keys (Ctrl+Alt+key) handled in a server</description>
+         </configItem>
+       </option>
+       <option>
+@@ -7404,7 +7404,7 @@
+       <option>
+         <configItem>
+           <name>lv5:lsgt_switch</name>
+-          <description>The "&lt; &gt;" key chooses 5th level</description>
++          <description>The "lt gt" key chooses 5th level</description>
+         </configItem>
+       </option>
+       <option>
+@@ -7422,7 +7422,7 @@
+       <option>
+         <configItem>
+           <name>lv5:lsgt_switch_lock</name>
+-          <description>The "&lt; &gt;" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser</description>
++          <description>The "lt gt" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser</description>
+         </configItem>
+       </option>
+       <option>
+-- 
+2.43.5
+
diff --git a/SPECS/xkeyboard-config.spec b/SPECS/xkeyboard-config.spec
index 12c3ac6..82812c0 100644
--- a/SPECS/xkeyboard-config.spec
+++ b/SPECS/xkeyboard-config.spec
@@ -7,7 +7,7 @@
 Summary:    X Keyboard Extension configuration data
 Name:       xkeyboard-config
 Version:    2.33
-Release:    2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:    2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}.inferit
 License:    MIT
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 
@@ -19,6 +19,9 @@ Source2:    commitid
 Source0:    http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
 %endif
 
+# MSVSphere
+Patch1000:  0001-Fixed-Russian-translation.patch
+
 BuildArch:  noarch
 
 BuildRequires:  gettext gettext-devel
@@ -78,6 +81,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Mon Sep 02 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 2.33-2.inferit
+- Fixed Russian translation
+- Rebuilt for MSVSphere 9.4
+
 * Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2.33-2
 - Rebuilt for MSVSphere 9.1.