updated: [360be65] po/ru.po: In russian translation, there are some hotkey conficts in menu.

[Patrick Winnertz]

The following commit has been merged in the mc-4.6 branch:
commit 360be65d2ba16b4776c1e7521417a0e0f4af9097
Author: Patrick Winnertz <winnie at 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  <aborodin at vmail.ru>
+
+	* ru.po: Fix conflicting shortcuts in the russian translation.
+
 2008-06-30  David Martin  <dmartina at 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