The following commit has been merged in the mc-4.6 branch:
commit 360be65d2ba16b4776c1e7521417a0e0f4af9097
Author: Patrick Winnertz <win...@debian.org>
Date: Thu Jan 29 07:34:27 2009 +0100
po/ru.po: In russian translation, there are some hotkey conficts in menu.
This is a cherry-pick of 1150007bff08f7f1000eaf0e668cf20d1e343e47 from
master.
It's unclear for me why Milestone 4.6.2 was set but this change wasn't
merged into mc-4.6.
Conflicts:
po/ChangeLog
diff --git a/po/ChangeLog b/po/ChangeLog
index dbd8923..4c2adce 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-10 Andrew Borodin <aboro...@vmail.ru>
+
+ * ru.po: Fix conflicting shortcuts in the russian translation.
+
2008-06-30 David Martin <dmart...@excite.com>
* es.po: Updated Spanish translation. Converted to UTF-8.
diff --git a/po/ru.po b/po/ru.po
index 271c6e4..5ee11d0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -423,7 +423,7 @@ msgid "&Insert file... F15"
msgstr "&�������� ����... F15"
msgid "Copy to &file... C-f"
-msgstr "&���������� � ����... C-f"
+msgstr "��&�������� � ����... C-f"
msgid "&User menu... F11"
msgstr "&���� ������������... F11"
@@ -513,7 +513,7 @@ msgid "Sor&t... M-t"
msgstr "&����������... M-t"
msgid "Paste o&utput of... M-u"
-msgstr "�������� ����� &�������... M-u"
+msgstr "�������� �&���� �������... M-u"
msgid "E&xternal Formatter F19"
msgstr "&�������������� F19"
@@ -540,7 +540,7 @@ msgid "Syntax &Highlighting..."
msgstr "&�������������� ����������..."
msgid "Save setu&p..."
-msgstr "&��������� ���������"
+msgstr "��&������� ���������"
msgid " File "
msgstr " ���� "
@@ -2165,7 +2165,7 @@ msgid "Vie&w file... "
msgstr "&�������� �����..."
msgid "&Filtered view M-!"
-msgstr "&�������� ������� M-!"
+msgstr "�������� ������&� M-!"
msgid "&Edit F4"
msgstr "&�������������� F4"
@@ -2264,7 +2264,7 @@ msgid "Edit edi&tor menu file"
msgstr "������ ���� �&��������"
msgid "Edit &syntax file"
-msgstr "���� ����������"
+msgstr "��&�� ����������"
msgid "&Configuration..."
msgstr "&������������..."
--
Midnight Commander Development
_______________________________________________
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
