Merged revision(s) 43795-43797 #7496d3c856-#7496d3c856 from trunk:

Components, MacroScript: improved resourcestrings
........
Components, MacroScript: enabled i18n; added Russian translation
........
Components, MacroScript: improved layout; now using default cursor
........

git-svn-id: branches/fixes_1_2@43803 -

.gitattributes

@@ -2458,6 +2458,8 @@ components/macroscript/emsideoptions.lfm svneol=native#text/pascal
 components/macroscript/emsideoptions.pas svneol=native#text/pascal
 components/macroscript/emsselftest.pas svneol=native#text/pascal
 components/macroscript/emsstrings.pas svneol=native#text/pascal
+components/macroscript/languages/emsstrings.po svneol=native#text/plain
+components/macroscript/languages/emsstrings.ru.po svneol=native#text/plain
 components/macroscript/registerems.pas svneol=native#text/pascal
 components/macroscript/test/TestMacroScript.lpi svneol=native#text/plain
 components/macroscript/test/TestMacroScript.lpr svneol=native#text/plain

components/macroscript/editormacroscript.lpk

@@ -50,6 +50,10 @@ Extends the Editors macro recorder and player. Macros can be written in pascal s
         <UnitName Value="emsstrings"/>
       </Item6>
     </Files>
+    <i18n>
+      <EnableI18N Value="True"/>
+      <OutDir Value="languages"/>
+    </i18n>
     <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="4">
       <Item1>

components/macroscript/emsideoptions.lfm

@@ -1,5 +1,4 @@
 object EMSIdeOptionsFrame: TEMSIdeOptionsFrame
-  Cursor = crDrag
   Left = 0
   Height = 240
   Top = 0
@@ -11,7 +10,7 @@ object EMSIdeOptionsFrame: TEMSIdeOptionsFrame
   DesignTop = 156
   object lblStatus: TLabel
     Left = 6
-    Height = 17
+    Height = 13
     Top = 6
     Width = 308
     Align = alTop
@@ -25,9 +24,10 @@ object EMSIdeOptionsFrame: TEMSIdeOptionsFrame
     AnchorSideTop.Control = lblStatus
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 25
-    Top = 29
-    Width = 75
+    Height = 23
+    Top = 25
+    Width = 82
+    AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'btnActivate'
     OnClick = btnActivateClick

components/macroscript/emsstrings.pas

@@ -7,19 +7,19 @@ interface
 resourcestring
   EmsSelfTestErrCaption = 'Error in EditorMacroScript';
   EmsSelfTestFailed = 'The package EditorMacroScript (pascalscript macros)' +
-    ' has detected a problem and was de-activated. %0:s' +
-    'The package failed its selftest with the message:%0:s "%1:s"';
+    ' has detected a problem and was deactivated.%0:s' +
+    'The package failed its selftest with the message:%0:s"%1:s"';
   EmsSelfTestFailedLastTime = 'The package EditorMacroScript (pascalscript macros)' +
-    ' has detected a problem and was de-activated. %0:s' +
-    'The package selftest was not completed during the last start of the IDE"';
+    ' has detected a problem and was deactivated.%0:s' +
+    'The package selftest was not completed during the last start of the IDE.';
   EMSStatusTitle = 'Status';
   EMSEditorMacroTitle = 'Editor Macro Script';
   EMSBtnTestAgain = 'Test again';
-  EMSNotSupported = 'Scripting not active. Not supported on this platform or CPU';
-  EMSNotActive = 'Scripting not active. Selftest failed';
-  EMSActive = 'Scripting active';
+  EMSNotSupported = 'Scripting not active. Not supported on this platform or CPU.';
+  EMSNotActive = 'Scripting not active. Selftest failed.';
+  EMSActive = 'Scripting active.';
   EMSPending = 'Scripting not active. Selftest will run next time the IDE is '
-    +'started';
+    +'started.';
 
 implementation
 

components/macroscript/languages/emsstrings.po

@@ -0,0 +1,43 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: emsstrings.emsactive
+msgid "Scripting active."
+msgstr ""
+
+#: emsstrings.emsbtntestagain
+msgid "Test again"
+msgstr ""
+
+#: emsstrings.emseditormacrotitle
+msgid "Editor Macro Script"
+msgstr ""
+
+#: emsstrings.emsnotactive
+msgid "Scripting not active. Selftest failed."
+msgstr ""
+
+#: emsstrings.emsnotsupported
+msgid "Scripting not active. Not supported on this platform or CPU."
+msgstr ""
+
+#: emsstrings.emspending
+msgid "Scripting not active. Selftest will run next time the IDE is started."
+msgstr ""
+
+#: emsstrings.emsselftesterrcaption
+msgid "Error in EditorMacroScript"
+msgstr ""
+
+#: emsstrings.emsselftestfailed
+msgid "The package EditorMacroScript (pascalscript macros) has detected a problem and was deactivated.%0:sThe package failed its selftest with the message:%0:s\"%1:s\""
+msgstr ""
+
+#: emsstrings.emsselftestfailedlasttime
+msgid "The package EditorMacroScript (pascalscript macros) has detected a problem and was deactivated.%0:sThe package selftest was not completed during the last start of the IDE."
+msgstr ""
+
+#: emsstrings.emsstatustitle
+msgid "Status"
+msgstr ""
+

components/macroscript/languages/emsstrings.ru.po

@@ -0,0 +1,51 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Maxim Ganetsky <maxkill@mail.ru>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: emsstrings.emsactive
+msgid "Scripting active."
+msgstr "Сценарии включены."
+
+#: emsstrings.emsbtntestagain
+msgid "Test again"
+msgstr "Проверить снова"
+
+#: emsstrings.emseditormacrotitle
+msgid "Editor Macro Script"
+msgstr "Сценарии редактора"
+
+#: emsstrings.emsnotactive
+msgid "Scripting not active. Selftest failed."
+msgstr "Сценарии отключены. Не прошло самотестирование."
+
+#: emsstrings.emsnotsupported
+msgid "Scripting not active. Not supported on this platform or CPU."
+msgstr "Сценарии отключены. Они не поддерживаются на данной платформе."
+
+#: emsstrings.emspending
+msgid "Scripting not active. Selftest will run next time the IDE is started."
+msgstr "Сценарии отключены. При следующем запуске IDE будет выполнено самотестирование."
+
+#: emsstrings.emsselftesterrcaption
+msgid "Error in EditorMacroScript"
+msgstr "Ошибка пакета EditorMacroScript"
+
+#: emsstrings.emsselftestfailed
+msgid "The package EditorMacroScript (pascalscript macros) has detected a problem and was deactivated.%0:sThe package failed its selftest with the message:%0:s\"%1:s\""
+msgstr "Пакет EditorMacroScript (сценарии PascalScript) обнаружил проблему и отключился.%0:sПакет не прошёл самотестирование с сообщением:%0:s\"%1:s\""
+
+#: emsstrings.emsselftestfailedlasttime
+msgid "The package EditorMacroScript (pascalscript macros) has detected a problem and was deactivated.%0:sThe package selftest was not completed during the last start of the IDE."
+msgstr "Пакет EditorMacroScript (сценарии PascalScript) обнаружил проблему и отключился.%0:sПри последнем запуске IDE самотестирование пакета не было завершено."
+
+#: emsstrings.emsstatustitle
+msgid "Status"
+msgstr "Состояние"
+