From f33a28792bf5ba2766080f3b29b24f1b46e242fb Mon Sep 17 00:00:00 2001
From: gazer <makhotkin_viktor@bk.ru>
Date: Mon, 25 Jan 2016 21:28:49 +0300
Subject: [PATCH 1/2] improve eng and ru button names

---
 views/res/i18n/en.ini | 90 ++++++++++++++++++++++---------------------
 views/res/i18n/ru.ini | 54 +++++++++++++++++++++-----
 2 files changed, 92 insertions(+), 52 deletions(-)

diff --git a/views/res/i18n/en.ini b/views/res/i18n/en.ini
index fa46ef4..33b81a8 100644
--- a/views/res/i18n/en.ini
+++ b/views/res/i18n/en.ini
@@ -1,17 +1,19 @@
 EXIT=Exit
-MENU_FILE=&FILE
+MENU_FILE=&File
 MENU_FILE_NEW=&New
-MENU_FILE_NEW_SOURCE_FILE=New Source File
-MENU_FILE_NEW_PROJECT=New Project
-MENU_FILE_NEW_WORKSPACE=New Workspace
+MENU_FILE_NEW_SOURCE_FILE=File
+MENU_FILE_NEW_PROJECT=Project...
+MENU_FILE_NEW_WORKSPACE=Workspace...
 MENU_FILE_OPEN=&Open file...
-MENU_FILE_OPEN_WORKSPACE=Open Project or Workspace...
+MENU_FILE_OPEN_WORKSPACE=Open project or workspace...
 MENU_FILE_OPEN_RECENT=Open recent
 MENU_FILE_SAVE=&Save file
 MENU_FILE_SAVE_AS=&Save file as...
-MENU_FILE_SAVE_ALL=&Save All
+MENU_FILE_SAVE_ALL=&Save all
+MENU_FILE_WORKSPACE_CLOSE=Close workspace
 MENU_FILE_EXIT=E&xit
-MENU_EDIT=&EDIT
+
+MENU_EDIT=&Edit
 MENU_EDIT_COPY=&Copy
 MENU_EDIT_PASTE=&Paste
 MENU_EDIT_CUT=Cu&t
@@ -23,54 +25,58 @@ MENU_EDIT_TOGGLE_LINE_COMMENT=Toggle line comment
 MENU_EDIT_TOGGLE_BLOCK_COMMENT=Toggle block comment
 MENU_EDIT_ADVANCED=Advanced...
 MENU_EDIT_PREFERENCES=&Preferences
-MENU_BUILD_CONFIGURATIONS=Build configurations
-MENU_BUILD=&BUILD
-MENU_BUILD_WORKSPACE_BUILD=Build Workspace
-MENU_BUILD_WORKSPACE_REBUILD=Rebuild Workspace
-MENU_BUILD_WORKSPACE_CLEAN=Clean Workspace
-MENU_BUILD_PROJECT_BUILD=Build Project
-MENU_BUILD_PROJECT_REBUILD=Rebuild Project
-MENU_BUILD_PROJECT_CLEAN=Clean Project
-MENU_PROJECT=&PROJECT
+
+MENU_PROJECT=&Project
 MENU_PROJECT_CONFIGURATIONS=Project configurations
-MENU_PROJECT_SET_AS_STARTUP=Set as Startup Project
-MENU_PROJECT_SETTINGS=Project Settings
-MENU_PROJECT_REFRESH=Refresh Workspace Items
-MENU_PROJECT_UPDATE_DEPENDENCIES=Upgrade Dependencies
-MENU_DEBUG=&DEBUG
-MENU_DEBUG_START_DEBUGGING=Start Debugging
-MENU_DEBUG_START_NO_DEBUGGING=Start Without Debugging
-MENU_DEBUG_CONTINUE=Continue Debugging
+MENU_PROJECT_SET_AS_STARTUP=Set as startup project
+MENU_PROJECT_SETTINGS=Project settings
+MENU_PROJECT_REFRESH=Refresh workspace items
+MENU_PROJECT_UPDATE_DEPENDENCIES=Upgrade dependencies
+
+MENU_NAVIGATE=&Navigate
+GO_TO_DEFINITION=Go to definition
+SHOW_COMPLETIONS=Get autocompletions
+
+FIND_TEXT=Find...
+
+MENU_BUILD_CONFIGURATIONS=Build configurations
+MENU_BUILD=&Build
+MENU_BUILD_WORKSPACE_BUILD=Build workspace
+MENU_BUILD_WORKSPACE_REBUILD=Rebuild workspace
+MENU_BUILD_WORKSPACE_CLEAN=Clean workspace
+MENU_BUILD_PROJECT_BUILD=Build project
+MENU_BUILD_PROJECT_REBUILD=Rebuild project
+MENU_BUILD_PROJECT_CLEAN=Clean project
+
+MENU_DEBUG=&Debug
+MENU_DEBUG_START_DEBUGGING=Start debugging
+MENU_DEBUG_START_NO_DEBUGGING=Start without debugging
+MENU_DEBUG_CONTINUE=Continue debugging
 MENU_DEBUG_STOP=Stop
 MENU_DEBUG_PAUSE=Pause
 MENU_DEBUG_RESTART=Restart
-MENU_DEBUG_STEP_INTO=Step Into
-MENU_DEBUG_STEP_OVER=Step Over
-MENU_DEBUG_STEP_OUT=Step Out
-
+MENU_DEBUG_STEP_INTO=Step into
+MENU_DEBUG_STEP_OVER=Step over
+MENU_DEBUG_STEP_OUT=Step out
 MENU_DEBUG_BREAKPOINT_TOGGLE=Toggle breakpoint
 MENU_DEBUG_BREAKPOINT_ENABLE=Enable breakpoint
 MENU_DEBUG_BREAKPOINT_DISABLE=Disable breakpoint
 
-MENU_VIEW=&VIEW
+MENU_WINDOW=&Window
+MENU_WINDOW_PREFERENCES=&Preferences
+MENU_WINDOW_CLOSE_ALL_DOCUMENTS=Close all documents
+
+MENU_HELP=&Help
+MENU_HELP_VIEW_HELP=&View help
+MENU_HELP_ABOUT=&About
+
+MENU_VIEW=&View
 MENU_VIEW_LANGUAGE=Interface &Language
 MENU_VIEW_LANGUAGE_EN=English
 MENU_VIEW_LANGUAGE_RU=Русский
 MENU_VIEW_THEME=&Theme
 MENU_VIEW_THEME_DEFAULT=&Default
 MENU_VIEW_THEME_CUSTOM1=&Custom 1
-MENU_WINDOW=&WINDOW
-MENU_WINDOW_PREFERENCES=&Preferences
-MENU_WINDOW_CLOSE_ALL_DOCUMENTS=Close All Documents
-MENU_HELP=&HELP
-MENU_HELP_VIEW_HELP=&View help
-MENU_HELP_ABOUT=&About
-MENU_NAVIGATE=NAVIGATE
-
-GO_TO_DEFINITION=Go To Definition
-SHOW_COMPLETIONS=Get Autocompletions
-FIND_TEXT=Find text
-
 
 TAB_LONG_LIST=Long list
 TAB_BUTTONS=Buttons
@@ -78,11 +84,9 @@ TAB_ANIMATION=Animation
 TAB_TABLE_LAYOUT=Table layout
 TAB_EDITORS=Editors
 
-
 MENU_PROJECT_FOLDER_ADD_ITEM=Add...
 MENU_PROJECT_FOLDER_OPEN_ITEM=Open
 MENU_PROJECT_FOLDER_REMOVE_ITEM=Remove
 MENU_PROJECT_FOLDER_RENAME_ITEM=Rename...
 MENU_PROJECT_FOLDER_REFRESH=Refresh
 
-MENU_FILE_WORKSPACE_CLOSE=Close Workspace
diff --git a/views/res/i18n/ru.ini b/views/res/i18n/ru.ini
index 4598b3b..3d3edae 100644
--- a/views/res/i18n/ru.ini
+++ b/views/res/i18n/ru.ini
@@ -1,17 +1,59 @@
 EXIT=Выход
 MENU_FILE=&Файл
-MENU_FILE_OPEN=&Открыть
-MENU_FILE_OPEN_RECENT=Открыть из последних
-MENU_FILE_SAVE=&Сохранить
+MENU_FILE_NEW=&Новый
+MENU_FILE_NEW_SOURCE_FILE=Файл
+MENU_FILE_NEW_PROJECT=Проект...
+MENU_FILE_NEW_WORKSPACE=Workspace...
+MENU_FILE_OPEN=&Открыть файл
+MENU_FILE_OPEN_WORKSPACE=Открыть проект или workspace...
+MENU_FILE_OPEN_RECENT=Открыть недавние
+MENU_FILE_SAVE=&Сохранить файл
+MENU_FILE_SAVE_AS=&Сохранить файл как...
+MENU_FILE_SAVE_ALL=&Сохранить все
+MENU_FILE_WORKSPACE_CLOSE=Закрыть workspace
 MENU_FILE_EXIT=Вы&ход
+
 MENU_EDIT=&Правка
 MENU_EDIT_COPY=&Копировать
 MENU_EDIT_PASTE=&Вставить
 MENU_EDIT_CUT=Вырезать
 MENU_EDIT_UNDO=&Отмена
 MENU_EDIT_REDO=&Повторить
+MENU_EDIT_INDENT=Увеличить отступ
+MENU_EDIT_UNINDENT=Уменьшить отступ
+MENU_EDIT_TOGGLE_LINE_COMMENT=Закомментировать строку
+MENU_EDIT_TOGGLE_BLOCK_COMMENT=Закомментировать блок
+MENU_EDIT_ADVANCED=Продвинутые...
 MENU_EDIT_PREFERENCES=&Настройки
+
+MENU_PROJECT=&Проект
 MENU_PROJECT_CONFIGURATIONS=Конфигурации проекта
+MENU_PROJECT_SETTINGS=Свойства проекта
+MENU_PROJECT_UPDATE_DEPENDENCIES=Обновить зависимости
+
+MENU_NAVIGATE=&Навигация
+GO_TO_DEFINITION=Перейти к определению
+
+FIND_TEXT=Найти...
+
+MENU_BUILD=&Сборка
+MENU_BUILD_WORKSPACE_BUILD=Собрать workspace
+MENU_BUILD_WORKSPACE_REBUILD=Пересобрать workspace
+MENU_BUILD_WORKSPACE_CLEAN=Очистить workspace
+MENU_BUILD_PROJECT_BUILD=Собрать проект
+MENU_BUILD_PROJECT_REBUILD=Пересобрать проект
+MENU_BUILD_PROJECT_CLEAN=Очистить проект
+
+MENU_DEBUG=&Отладка
+
+MENU_WINDOW=&Окно
+MENU_WINDOW_PREFERENCES=&Настройки
+MENU_WINDOW_CLOSE_ALL_DOCUMENTS=Закрыть все документы
+
+MENU_HELP=&Справка
+MENU_HELP_VIEW_HELP=&Просмотр справки
+MENU_HELP_ABOUT=&О программе
+
 MENU_VIEW=&Вид
 MENU_VIEW_LANGUAGE=&Язык интерфейса
 MENU_VIEW_LANGUAGE_EN=English
@@ -19,11 +61,6 @@ MENU_VIEW_LANGUAGE_RU=Русский
 MENU_VIEW_THEME=&Тема
 MENU_VIEW_THEME_DEFAULT=Стандартная
 MENU_VIEW_THEME_CUSTOM1=Пример 1
-MENU_WINDOW=&Окно
-MENU_WINDOW_PREFERENCES=&Настройки
-MENU_HELP=&Справка
-MENU_HELP_VIEW_HELP=&Просмотр справки
-MENU_HELP_ABOUT=&О программе
 
 TAB_LONG_LIST=Длинный список
 TAB_BUTTONS=Кнопки
@@ -31,4 +68,3 @@ TAB_ANIMATION=Анимация
 TAB_TABLE_LAYOUT=Табличный layout
 TAB_EDITORS=Редакторы
 
-

From 60e2072b06e9890da43eacd7164cbec539527fd1 Mon Sep 17 00:00:00 2001
From: gazer <makhotkin_viktor@bk.ru>
Date: Mon, 25 Jan 2016 23:56:38 +0300
Subject: [PATCH 2/2] fix

---
 views/res/i18n/en.ini | 8 ++++----
 views/res/i18n/ru.ini | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/views/res/i18n/en.ini b/views/res/i18n/en.ini
index 33b81a8..a5402c8 100644
--- a/views/res/i18n/en.ini
+++ b/views/res/i18n/en.ini
@@ -1,9 +1,9 @@
 EXIT=Exit
 MENU_FILE=&File
-MENU_FILE_NEW=&New
-MENU_FILE_NEW_SOURCE_FILE=File
-MENU_FILE_NEW_PROJECT=Project...
-MENU_FILE_NEW_WORKSPACE=Workspace...
+MENU_FILE_NEW=&Create
+MENU_FILE_NEW_SOURCE_FILE=New file
+MENU_FILE_NEW_PROJECT=New project
+MENU_FILE_NEW_WORKSPACE=New workspace
 MENU_FILE_OPEN=&Open file...
 MENU_FILE_OPEN_WORKSPACE=Open project or workspace...
 MENU_FILE_OPEN_RECENT=Open recent
diff --git a/views/res/i18n/ru.ini b/views/res/i18n/ru.ini
index 3d3edae..4c4c4e1 100644
--- a/views/res/i18n/ru.ini
+++ b/views/res/i18n/ru.ini
@@ -1,9 +1,9 @@
 EXIT=Выход
 MENU_FILE=&Файл
-MENU_FILE_NEW=&Новый
-MENU_FILE_NEW_SOURCE_FILE=Файл
-MENU_FILE_NEW_PROJECT=Проект...
-MENU_FILE_NEW_WORKSPACE=Workspace...
+MENU_FILE_NEW=&Создать
+MENU_FILE_NEW_SOURCE_FILE=Новый файл
+MENU_FILE_NEW_PROJECT=Новый проект
+MENU_FILE_NEW_WORKSPACE=Новый workspace
 MENU_FILE_OPEN=&Открыть файл
 MENU_FILE_OPEN_WORKSPACE=Открыть проект или workspace...
 MENU_FILE_OPEN_RECENT=Открыть недавние