From 6429bf3307e3beb654c9425d8faec8e3ba2ced77 Mon Sep 17 00:00:00 2001
From: sndev <sndev>
Date: Thu, 16 Mar 2006 12:53:40 +0000
Subject: [PATCH] some russian translation.

SVN revision: 21338
---
 po/ru.po                           | 137 +++++++++++++++++++++++++++++++++++++
 src/bin/e_desklock.c               |   9 ++-
 src/bin/e_int_config_keybindings.c |  14 ++--
 3 files changed, 152 insertions(+), 8 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 04d685c..66dfd5e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1069,6 +1069,143 @@ msgstr ""
 msgid "Configuration Upgraded"
 msgstr "Настройки Изменились"
 
+#: src/bin/e_int_config_keybindings.c:340 src/bin/e_configure.c:76
+#, fuzzy
+msgid "Key Binding Settings"
+msgstr "Настройки Горячих Клавиш"
+
+#: src/bin/e_int_config_keybindings.c:9
+msgid "Assign Key Binding..."
+msgstr "Присвоить..."
+
+#: src/bin/e_int_config_keybindings.c:11
+msgid "Action"
+msgstr "Действие"
+
+#: src/bin/e_int_config_keybindings.c:12
+msgid "<None>"
+msgstr "<Пусто>"
+
+#: src/bin/e_int_config_keybindings.c:13
+msgid "Please press key sequence,<br>or <hilight>Escape</hilight> to abort"
+msgstr "Пожалуйста нажмите последовательность клавиш,<br>или <hilight>Escape</hilight> для выхода"
+
+#: src/bin/e_int_config_keybindings.c:85
+msgid "Flip Desktop Left"
+msgstr "Переключить Рабочий Стол На Лево"
+
+#: src/bin/e_int_config_keybindings.c:86
+msgid "Flip Desktop Right"
+msgstr "Переключить Рабочий Стол На Право"
+
+#: src/bin/e_int_config_keybindings.c:87
+msgid "Flip Desktop Up"
+msgstr "Переключить Рабочий Стол Вверх"
+
+#: src/bin/e_int_config_keybindings.c:88
+msgid "Flip Desktop Down"
+msgstr "Переключить Рабочий Стол Вниз"
+
+#: src/bin/e_int_config_keybindings.c:89
+
+#: src/bin/e_int_config_keybindings.c:90
+
+#: src/bin/e_int_config_keybindings.c:91
+msgid "Switch To Left Desktop"
+msgstr "Переключить На Следующий Рабочий Стол С Лева"
+
+#: src/bin/e_int_config_keybindings.c:92
+msgid "Switch To Right Desktop"
+msgstr "Переключить На Следующий Рабочий Стол С Права"
+
+#: src/bin/e_int_config_keybindings.c:93
+msgid "Flip Desktop Linearly..."
+msgstr "Переключить Рабочий Стол Линейно..."
+
+#: src/bin/e_int_config_keybindings.c:94
+msgid "Switch To Desktop 0"
+msgstr "Переключить на Рабочий Стол 0"
+
+#: src/bin/e_int_config_keybindings.c:95
+msgid "Switch To Desktop 1"
+msgstr "Переключить на Рабочий Стол 1"
+
+#: src/bin/e_int_config_keybindings.c:96
+msgid "Switch To Desktop 2"
+msgstr "Переключить на Рабочий Стол 2"
+
+#: src/bin/e_int_config_keybindings.c:97
+msgid "Switch To Desktop 3"
+msgstr "Переключить на Рабочий Стол 3"
+
+#: src/bin/e_int_config_keybindings.c:98
+msgid "Switch To Desktop 4"
+msgstr "Переключить на Рабочий Стол 4"
+
+#: src/bin/e_int_config_keybindings.c:99
+msgid "Switch To Desktop 5"
+msgstr "Переключить на Рабочий Стол 6"
+
+#: src/bin/e_int_config_keybindings.c:100
+msgid "Switch To Desktop 6"
+msgstr "Переключить на Рабочий Стол 6"
+
+#: src/bin/e_int_config_keybindings.c:101
+msgid "Switch To Desktop 7"
+msgstr "Переключить на Рабочий Стол 7"
+
+#: src/bin/e_int_config_keybindings.c:102
+msgid "Switch To Desktop 8"
+msgstr "Переключить на Рабочий Стол 8"
+
+#: src/bin/e_int_config_keybindings.c:103
+msgid "Switch To Desktop 9"
+msgstr "Переключить на Рабочий Стол 9"
+
+#: src/bin/e_int_config_keybindings.c:104
+msgid "Switch To Desktop 10"
+msgstr "Переключить на Рабочий Стол 10"
+
+#: src/bin/e_int_config_keybindings.c:105
+msgid "Switch To Desktop 11"
+msgstr "Переключить на Рабочий Стол 11"
+
+#: src/bin/e_int_config_keybindings.c:106
+msgid "Switch To Desktop..."
+msgstr "Переключить на Рабочий Стол..."
+
+#: src/bin/e_int_config_keybindings.c:134
+msgid "Show Main Menu"
+msgstr "Показать Основное Меню"
+
+#: src/bin/e_int_config_keybindings.c:135
+msgid "Show Favorites Menu"
+msgstr "Показать Меню \"Любимые Приложения\""
+
+#: src/bin/e_int_config_keybindings.c:136
+msgid "Show Clients Menu"
+msgstr "Показать Клиентское Меню"
+
+#: src/bin/e_int_config_keybindings.c:138
+msgid "Show Menu..."
+msgstr "Показать Меню..."
+
+#: src/bin/e_int_config_keybindings.c:139
+msgid "Desktop Lock"
+msgstr "Закрыть Рабочий Стол"
+
+#: src/bin/e_int_config_keybindings.c:145
+msgid "Toggle Edit Mode"
+msgstr "Включить Режим Редактирования"
+
+#: src/bin/e_int_config_keybindings.c:148
+msgid "Window List - Next Window"
+msgstr "Список Окон - Следующее Окно"
+
+#: src/bin/e_int_config_keybindings.c:150
+msgid "Window List - Previous Window"
+msgstr "Список Окон - Предыдущее Окно"
+
 #: src/bin/e_int_config_menus.c:39 src/bin/e_int_config_menus.c:92
 #: src/bin/e_int_config_menus.c:145 src/bin/e_configure.c:73
 #, fuzzy
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index ac761e5..d7cd302 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -305,7 +305,10 @@ _e_desklock_cb_key_down(void *data, int type, void *event)
    else if (!strcmp(ev->keysymbol, "KP_Enter"))
      {
 	// here we have to go to auth
-	if (!strcmp(edd->passwd, e_config->desklock_personal_passwd))
+	if ((e_config->desklock_personal_passwd) &&
+	    (!strcmp(edd->passwd == NULL ? "" : edd->passwd,
+		     e_config->desklock_personal_passwd == NULL ? "" :
+			    e_config->desklock_personal_passwd)))
 	  {
 	     e_desklock_hide();
 	     return 1;
@@ -320,7 +323,9 @@ _e_desklock_cb_key_down(void *data, int type, void *event)
      {
 	// here we have to go to auth
 	if ((e_config->desklock_personal_passwd) &&
-	    (!strcmp(edd->passwd, e_config->desklock_personal_passwd)))
+	    (!strcmp(edd->passwd == NULL ? "" : edd->passwd,
+		     e_config->desklock_personal_passwd == NULL ? "" :
+			    e_config->desklock_personal_passwd)))
 	  {
 	     e_desklock_hide();
 	     return 1;
diff --git a/src/bin/e_int_config_keybindings.c b/src/bin/e_int_config_keybindings.c
index fb46b3b..075937b 100644
--- a/src/bin/e_int_config_keybindings.c
+++ b/src/bin/e_int_config_keybindings.c
@@ -97,8 +97,8 @@ const ACTION actions_predefined_names[ ] = {
 						    EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
   {"Switch To Right Desktop", "desk_linear_flip_by", "1", _DEFAULT_ACTION,
 						    EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
-  {"Flip Desktop Linearly", "desk_linear_flip_by", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
-  
+  {"Flip Desktop Linearly...", "desk_linear_flip_by", NULL, _NONDEFAULT_ACTION,
+							    EDIT_RESTRICT_ACTION },
   {"Switch To Desktop 0", "desk_linear_flip_to", "0", _DEFAULT_ACTION,
 						    EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
   {"Switch To Desktop 1", "desk_linear_flip_to", "1", _DEFAULT_ACTION,
@@ -123,11 +123,13 @@ const ACTION actions_predefined_names[ ] = {
 						    EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
   {"Switch To Desktop 11", "desk_linear_flip_to", "11", _DEFAULT_ACTION,
 						    EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
-  {"Switch To Desktop", "desk_linear_flip_to", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
+  {"Switch To Desktop...", "desk_linear_flip_to", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
 
   {"Run Command", "exebuf", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
-  {"Exit \'E\'", "exit", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
-  {"Restart \'E\'", "restart", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
+  {"Exit Enlightenment", "exit", NULL,
+				 _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
+  {"Restart Enlightenment", "restart", NULL,
+				    _DEFAULT_ACTION, EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
 
   {"Show Main Menu", "menu_show", "main", _DEFAULT_ACTION,
 					  EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
@@ -135,7 +137,7 @@ const ACTION actions_predefined_names[ ] = {
 					  EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
   {"Show Clients Menu", "menu_show", "clients", _DEFAULT_ACTION,
 					  EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
-  {"Menu Show", "menu_show", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
+  {"Show Menu...", "menu_show", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
 
   {"Desktop Lock", "desk_lock", NULL, _DEFAULT_ACTION, 
 				      EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS },
-- 
2.7.4