strings in AlarmViewer plugin externalized; added/updated russian translation in...
authorVictor Kirhenshtein <victor@netxms.org>
Sun, 27 Nov 2011 23:10:40 +0000 (23:10 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Sun, 27 Nov 2011 23:10:40 +0000 (23:10 +0000)
20 files changed:
.gitattributes
src/java/netxms-eclipse/AlarmViewer/.settings/org.eclipse.core.resources.prefs [new file with mode: 0644]
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/Activator.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/AlarmComparator.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/AlarmListLabelProvider.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/AlarmNotifier.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/Messages.java [new file with mode: 0644]
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/Startup.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/actions/AcknowledgeAlarm.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/actions/OpenAlarmBrowser.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/actions/TerminateAlarm.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/messages.properties [new file with mode: 0644]
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/objecttabs/AlarmTab.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/views/AlarmBrowser.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/widgets/AlarmList.java
src/java/netxms-eclipse/ImageLibrary/src/org/netxms/ui/eclipse/imagelibrary/messages_ru.properties [new file with mode: 0644]
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_ru.properties [new file with mode: 0644]
src/java/netxms-eclipse/core/OSGI-INF/l10n/bundle_ru.properties [new file with mode: 0644]
src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/messages_ru.properties
src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/library/messages_ru.properties

index 199ba9c..ff4b78a 100644 (file)
@@ -626,6 +626,7 @@ src/java/netxms-eclipse/AgentManager/src/org/netxms/ui/eclipse/agentmanager/widg
 src/java/netxms-eclipse/AgentManager/src/org/netxms/ui/eclipse/agentmanager/widgets/internal/AgentConfigTextAttributeProvider.java -text
 src/java/netxms-eclipse/AgentManager/src/org/netxms/ui/eclipse/agentmanager/widgets/internal/KeywordRule.java -text
 src/java/netxms-eclipse/AgentManager/src/org/netxms/ui/eclipse/agentmanager/widgets/internal/SingleTokenScanner.java -text
+src/java/netxms-eclipse/AlarmViewer/.settings/org.eclipse.core.resources.prefs -text
 src/java/netxms-eclipse/AlarmViewer/META-INF/MANIFEST.MF -text
 src/java/netxms-eclipse/AlarmViewer/build.properties -text
 src/java/netxms-eclipse/AlarmViewer/icons/acknowledged.png -text
@@ -638,10 +639,12 @@ src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/AlarmC
 src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/AlarmListFilter.java -text
 src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/AlarmListLabelProvider.java -text
 src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/AlarmNotifier.java -text
+src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/Messages.java -text
 src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/Startup.java -text
 src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/actions/AcknowledgeAlarm.java -text
 src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/actions/OpenAlarmBrowser.java -text
 src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/actions/TerminateAlarm.java -text
+src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/messages.properties -text
 src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/objecttabs/AlarmTab.java -text
 src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/views/AlarmBrowser.java -text
 src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/widgets/AlarmList.java -text
@@ -873,6 +876,7 @@ src/java/netxms-eclipse/ImageLibrary/src/org/netxms/ui/eclipse/imagelibrary/acti
 src/java/netxms-eclipse/ImageLibrary/src/org/netxms/ui/eclipse/imagelibrary/dialogs/ImagePropertiesDialog.java -text
 src/java/netxms-eclipse/ImageLibrary/src/org/netxms/ui/eclipse/imagelibrary/dialogs/ImageSelectionDialog.java -text
 src/java/netxms-eclipse/ImageLibrary/src/org/netxms/ui/eclipse/imagelibrary/messages.properties -text
+src/java/netxms-eclipse/ImageLibrary/src/org/netxms/ui/eclipse/imagelibrary/messages_ru.properties -text
 src/java/netxms-eclipse/ImageLibrary/src/org/netxms/ui/eclipse/imagelibrary/shared/ImageProvider.java -text
 src/java/netxms-eclipse/ImageLibrary/src/org/netxms/ui/eclipse/imagelibrary/shared/ImageUpdateListener.java -text
 src/java/netxms-eclipse/ImageLibrary/src/org/netxms/ui/eclipse/imagelibrary/views/ImageLibrary.java -text
@@ -904,6 +908,7 @@ src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/dialogs/he
 src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/dialogs/helpers/OrderingColumnEditingSupport.java -text
 src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/dialogs/helpers/OrderingListLabelProvider.java -text
 src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages.properties -text
+src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_ru.properties -text
 src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/views/LogViewer.java -text
 src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/views/helpers/LogLabelProvider.java -text
 src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/widgets/FilterBuilder.java -text
@@ -1425,6 +1430,7 @@ src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/views/
 src/java/netxms-eclipse/core/.settings/org.eclipse.jdt.core.prefs -text
 src/java/netxms-eclipse/core/META-INF/MANIFEST.MF -text
 src/java/netxms-eclipse/core/OSGI-INF/l10n/bundle.properties -text
+src/java/netxms-eclipse/core/OSGI-INF/l10n/bundle_ru.properties -text
 src/java/netxms-eclipse/core/build.properties -text
 src/java/netxms-eclipse/core/icons/alt_about.gif -text
 src/java/netxms-eclipse/core/icons/alt_launcher.icns -text
diff --git a/src/java/netxms-eclipse/AlarmViewer/.settings/org.eclipse.core.resources.prefs b/src/java/netxms-eclipse/AlarmViewer/.settings/org.eclipse.core.resources.prefs
new file mode 100644 (file)
index 0000000..2712cdc
--- /dev/null
@@ -0,0 +1,3 @@
+#Mon Nov 28 00:53:13 EET 2011\r
+eclipse.preferences.version=1\r
+encoding//src/org/netxms/ui/eclipse/alarmviewer/messages.properties=ISO-8859-1\r
index 30c3cc7..161544e 100644 (file)
@@ -31,7 +31,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin\r
 {\r
        // The plug-in ID\r
-       public static final String PLUGIN_ID = "org.netxms.ui.eclipse.alarmviewer";\r
+       public static final String PLUGIN_ID = "org.netxms.ui.eclipse.alarmviewer"; //$NON-NLS-1$\r
 \r
        // The shared instance\r
        private static Activator plugin;\r
@@ -54,7 +54,7 @@ public class Activator extends AbstractUIPlugin
                \r
                // Register icon for our jobs\r
                IProgressService service = PlatformUI.getWorkbench().getProgressService();\r
-          service.registerIconForFamily(getImageDescriptor("icons/alarm_browser.png"), AlarmList.JOB_FAMILY);\r
+          service.registerIconForFamily(getImageDescriptor("icons/alarm_browser.png"), AlarmList.JOB_FAMILY); //$NON-NLS-1$\r
        }\r
        \r
        /*\r
index 4b4ef0f..aede063 100644 (file)
@@ -48,7 +48,7 @@ public class AlarmComparator extends ViewerComparator
                        return 0;\r
                \r
                int rc;\r
-               switch((Integer)sortColumn.getData("ID"))\r
+               switch((Integer)sortColumn.getData("ID")) //$NON-NLS-1$\r
                {\r
                        case AlarmList.COLUMN_SEVERITY:\r
                                rc = compareNumbers(((Alarm)e1).getCurrentSeverity(), ((Alarm)e2).getCurrentSeverity());\r
@@ -59,8 +59,8 @@ public class AlarmComparator extends ViewerComparator
                        case AlarmList.COLUMN_SOURCE:\r
                                GenericObject obj1 = ((NXCSession)ConsoleSharedData.getSession()).findObjectById(((Alarm)e1).getSourceObjectId());\r
                                GenericObject obj2 = ((NXCSession)ConsoleSharedData.getSession()).findObjectById(((Alarm)e2).getSourceObjectId());\r
-                               String name1 = (obj1 != null) ? obj1.getObjectName() : "<unknown>";\r
-                               String name2 = (obj2 != null) ? obj2.getObjectName() : "<unknown>";\r
+                               String name1 = (obj1 != null) ? obj1.getObjectName() : Messages.AlarmComparator_Unknown;\r
+                               String name2 = (obj2 != null) ? obj2.getObjectName() : Messages.AlarmComparator_Unknown;\r
                                rc = name1.compareToIgnoreCase(name2);\r
                                break;\r
                        case AlarmList.COLUMN_MESSAGE:\r
index 0713463..51e0b78 100644 (file)
@@ -39,7 +39,7 @@ import org.netxms.ui.eclipse.shared.ConsoleSharedData;
 public class AlarmListLabelProvider implements ITableLabelProvider\r
 {\r
        // Constants\r
-       private static final String[] stateText = { "Outstanding", "Acknowledged", "Terminated" };\r
+       private static final String[] stateText = { Messages.AlarmListLabelProvider_AlarmState_Outstanding, Messages.AlarmListLabelProvider_AlarmState_Acknowledged, Messages.AlarmListLabelProvider_AlarmState_Terminated };\r
        \r
        // Severity images\r
        private Image[] severityImages = new Image[5];\r
@@ -58,9 +58,9 @@ public class AlarmListLabelProvider implements ITableLabelProvider
                severityImages[Severity.MAJOR] = StatusDisplayInfo.getStatusImage(Severity.MAJOR);\r
                severityImages[Severity.CRITICAL] = StatusDisplayInfo.getStatusImage(Severity.CRITICAL);\r
 \r
-               stateImages[0] = Activator.getImageDescriptor("icons/outstanding.png").createImage();\r
-               stateImages[1] = Activator.getImageDescriptor("icons/acknowledged.png").createImage();\r
-               stateImages[2] = Activator.getImageDescriptor("icons/terminated.png").createImage();\r
+               stateImages[0] = Activator.getImageDescriptor("icons/outstanding.png").createImage(); //$NON-NLS-1$\r
+               stateImages[1] = Activator.getImageDescriptor("icons/acknowledged.png").createImage(); //$NON-NLS-1$\r
+               stateImages[2] = Activator.getImageDescriptor("icons/terminated.png").createImage(); //$NON-NLS-1$\r
        }\r
 \r
        /* (non-Javadoc)\r
index f76ddd5..697101b 100644 (file)
@@ -86,7 +86,7 @@ public class AlarmNotifier
                final TrayItem trayIcon = ConsoleSharedData.getTrayIcon();\r
                if (trayIcon != null)\r
                {\r
-                       new UIJob("Create alarm popup") {\r
+                       new UIJob("Create alarm popup") { //$NON-NLS-1$\r
                                @Override\r
                                public IStatus runInUIThread(IProgressMonitor monitor)\r
                                {\r
@@ -117,8 +117,8 @@ public class AlarmNotifier
                                        if (window != null)\r
                                        {\r
                                                final ToolTip tip = new ToolTip(window.getShell(), SWT.BALLOON | severityFlag);\r
-                                               tip.setText("NetXMS Alarm (" + StatusDisplayInfo.getStatusText(alarm.getCurrentSeverity()) + ")");\r
-                                               tip.setMessage(((object != null) ? object.getObjectName() : Long.toString(alarm.getSourceObjectId())) + ": " + alarm.getMessage());\r
+                                               tip.setText(Messages.AlarmNotifier_ToolTip_Header + StatusDisplayInfo.getStatusText(alarm.getCurrentSeverity()) + ")"); //$NON-NLS-2$\r
+                                               tip.setMessage(((object != null) ? object.getObjectName() : Long.toString(alarm.getSourceObjectId())) + ": " + alarm.getMessage()); //$NON-NLS-1$\r
                                                tip.setAutoHide(true);\r
                                                trayIcon.setToolTip(tip);\r
                                                tip.setVisible(true);\r
diff --git a/src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/Messages.java b/src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/Messages.java
new file mode 100644 (file)
index 0000000..54683fb
--- /dev/null
@@ -0,0 +1,40 @@
+package org.netxms.ui.eclipse.alarmviewer;\r
+\r
+import org.eclipse.osgi.util.NLS;\r
+\r
+public class Messages extends NLS\r
+{\r
+       private static final String BUNDLE_NAME = "org.netxms.ui.eclipse.alarmviewer.messages"; //$NON-NLS-1$\r
+       public static String AcknowledgeAlarm_ErrorMessage;\r
+       public static String AcknowledgeAlarm_JobName;\r
+       public static String AcknowledgeAlarm_TaskName;\r
+       public static String AlarmComparator_Unknown;\r
+       public static String AlarmList_ColumnCount;\r
+       public static String AlarmList_ColumnCreated;\r
+       public static String AlarmList_ColumnLastChange;\r
+       public static String AlarmList_ColumnMessage;\r
+       public static String AlarmList_ColumnSeverity;\r
+       public static String AlarmList_ColumnSource;\r
+       public static String AlarmList_ColumnState;\r
+       public static String AlarmList_SyncJobError;\r
+       public static String AlarmList_SyncJobName;\r
+       public static String AlarmListLabelProvider_AlarmState_Acknowledged;\r
+       public static String AlarmListLabelProvider_AlarmState_Outstanding;\r
+       public static String AlarmListLabelProvider_AlarmState_Terminated;\r
+       public static String AlarmNotifier_ToolTip_Header;\r
+       public static String OpenAlarmBrowser_Error;\r
+       public static String OpenAlarmBrowser_ErrorOpeningView;\r
+       public static String Startup_JobName;\r
+       public static String TerminateAlarm_ErrorMessage;\r
+       public static String TerminateAlarm_JobTitle;\r
+       public static String TerminateAlarm_TaskName;\r
+       static\r
+       {\r
+               // initialize resource bundle\r
+               NLS.initializeMessages(BUNDLE_NAME, Messages.class);\r
+       }\r
+\r
+       private Messages()\r
+       {\r
+       }\r
+}\r
index a2be15b..889ca6e 100644 (file)
@@ -38,7 +38,7 @@ public class Startup implements IStartup
        public void earlyStartup()\r
        {\r
                // wait for connect\r
-               Job job = new Job("Set alarm listener for tray popups") {\r
+               Job job = new Job(Messages.Startup_JobName) { \r
                        @Override\r
                        protected IStatus run(IProgressMonitor monitor)\r
                        {\r
index d5c993e..0d12dd3 100644 (file)
@@ -32,6 +32,7 @@ import org.netxms.client.NXCException;
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.events.Alarm;\r
 import org.netxms.ui.eclipse.alarmviewer.Activator;\r
+import org.netxms.ui.eclipse.alarmviewer.Messages;\r
 import org.netxms.ui.eclipse.alarmviewer.widgets.AlarmList;\r
 import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
@@ -52,7 +53,7 @@ public class AcknowledgeAlarm implements IObjectActionDelegate
                 */\r
                AcknowledgeJob(Object selection[])\r
                {\r
-                       super("Acknowledge alarms");\r
+                       super(Messages.AcknowledgeAlarm_JobName);\r
                        setUser(true);\r
                        this.selection = selection;\r
                }\r
@@ -62,7 +63,7 @@ public class AcknowledgeAlarm implements IObjectActionDelegate
                {\r
                        IStatus status;\r
                        \r
-                       monitor.beginTask("Acknowledging alarms...", selection.length);\r
+                       monitor.beginTask(Messages.AcknowledgeAlarm_TaskName, selection.length);\r
                        try\r
                        {\r
                                for(int i = 0; (i < selection.length) && !monitor.isCanceled(); i++)\r
@@ -78,7 +79,7 @@ public class AcknowledgeAlarm implements IObjectActionDelegate
                        {\r
                                status = new Status(Status.ERROR, Activator.PLUGIN_ID, \r
                                                    (e instanceof NXCException) ? ((NXCException)e).getErrorCode() : 0,\r
-                                                   "Cannot acknowledge alarm: " + e.getMessage(), e);\r
+                                                   Messages.AcknowledgeAlarm_ErrorMessage + e.getMessage(), e);\r
                        }\r
                        return status;\r
                }\r
index c19cf36..68b4ff3 100644 (file)
@@ -24,6 +24,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.ui.IWorkbenchWindow;\r
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;\r
 import org.eclipse.ui.PartInitException;\r
+import org.netxms.ui.eclipse.alarmviewer.Messages;\r
 import org.netxms.ui.eclipse.alarmviewer.views.AlarmBrowser;\r
 \r
 public class OpenAlarmBrowser implements IWorkbenchWindowActionDelegate\r
@@ -61,7 +62,7 @@ public class OpenAlarmBrowser implements IWorkbenchWindowActionDelegate
                        } \r
                        catch (PartInitException e) \r
                        {\r
-                               MessageDialog.openError(window.getShell(), "Error", "Error opening view: " + e.getMessage());\r
+                               MessageDialog.openError(window.getShell(), Messages.OpenAlarmBrowser_Error, Messages.OpenAlarmBrowser_ErrorOpeningView + e.getMessage());\r
                        }\r
                }\r
        }\r
index e737160..35d9dfc 100644 (file)
@@ -32,6 +32,7 @@ import org.netxms.client.NXCException;
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.events.Alarm;\r
 import org.netxms.ui.eclipse.alarmviewer.Activator;\r
+import org.netxms.ui.eclipse.alarmviewer.Messages;\r
 import org.netxms.ui.eclipse.alarmviewer.widgets.AlarmList;\r
 import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
@@ -52,7 +53,7 @@ public class TerminateAlarm implements IObjectActionDelegate
                 */\r
                TerminateJob(Object selection[])\r
                {\r
-                       super("Terminate alarms");\r
+                       super(Messages.TerminateAlarm_JobTitle);\r
                        setUser(true);\r
                        this.selection = selection;\r
                }\r
@@ -62,7 +63,7 @@ public class TerminateAlarm implements IObjectActionDelegate
                {\r
                        IStatus status;\r
                        \r
-                       monitor.beginTask("Terminating alarms...", selection.length);\r
+                       monitor.beginTask(Messages.TerminateAlarm_TaskName, selection.length);\r
                        try\r
                        {\r
                                for(int i = 0; (i < selection.length) && !monitor.isCanceled(); i++)\r
@@ -78,7 +79,7 @@ public class TerminateAlarm implements IObjectActionDelegate
                        {\r
                                status = new Status(Status.ERROR, Activator.PLUGIN_ID, \r
                                                    (e instanceof NXCException) ? ((NXCException)e).getErrorCode() : 0,\r
-                                                   "Cannot terminate alarm: " + e.getMessage(), e);\r
+                                                   Messages.TerminateAlarm_ErrorMessage + e.getMessage(), e);\r
                        }\r
                        return status;\r
                }\r
diff --git a/src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/messages.properties b/src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/messages.properties
new file mode 100644 (file)
index 0000000..3a5b4be
--- /dev/null
@@ -0,0 +1,23 @@
+AcknowledgeAlarm_ErrorMessage=Cannot acknowledge alarm: \r
+AcknowledgeAlarm_JobName=Acknowledge alarms\r
+AcknowledgeAlarm_TaskName=Acknowledging alarms...\r
+AlarmComparator_Unknown=<unknown>\r
+AlarmList_ColumnCount=Count\r
+AlarmList_ColumnCreated=Created\r
+AlarmList_ColumnLastChange=Last Change\r
+AlarmList_ColumnMessage=Message\r
+AlarmList_ColumnSeverity=Severity\r
+AlarmList_ColumnSource=Source\r
+AlarmList_ColumnState=State\r
+AlarmList_SyncJobError=Cannot synchronize alarm list\r
+AlarmList_SyncJobName=Synchronize alarm list\r
+AlarmListLabelProvider_AlarmState_Acknowledged=Acknowledged\r
+AlarmListLabelProvider_AlarmState_Outstanding=Outstanding\r
+AlarmListLabelProvider_AlarmState_Terminated=Terminated\r
+AlarmNotifier_ToolTip_Header=NetXMS Alarm (\r
+OpenAlarmBrowser_Error=Error\r
+OpenAlarmBrowser_ErrorOpeningView=Error opening view: \r
+Startup_JobName=Set alarm listener for tray popups\r
+TerminateAlarm_ErrorMessage=Cannot terminate alarm: \r
+TerminateAlarm_JobTitle=Terminate alarms\r
+TerminateAlarm_TaskName=Terminating alarms...\r
index 2f9498b..3c319fa 100644 (file)
@@ -44,7 +44,7 @@ public class AlarmTab extends ObjectTab
        @Override\r
        protected void createTabContent(Composite parent)\r
        {\r
-               alarmList = new AlarmList(getViewPart(), parent, SWT.NONE, "AlarmTab");\r
+               alarmList = new AlarmList(getViewPart(), parent, SWT.NONE, "AlarmTab"); //$NON-NLS-1$\r
        }\r
 \r
        /* (non-Javadoc)\r
index 9268938..4ffcf7e 100644 (file)
@@ -32,7 +32,7 @@ import org.netxms.ui.eclipse.alarmviewer.widgets.AlarmList;
  */\r
 public class AlarmBrowser extends ViewPart\r
 {\r
-       public static final String ID = "org.netxms.ui.eclipse.alarmviewer.view.alarm_browser";\r
+       public static final String ID = "org.netxms.ui.eclipse.alarmviewer.view.alarm_browser"; //$NON-NLS-1$\r
        \r
        private AlarmList alarmView;\r
 \r
@@ -45,7 +45,7 @@ public class AlarmBrowser extends ViewPart
       FormLayout formLayout = new FormLayout();\r
                parent.setLayout(formLayout);\r
                \r
-               alarmView = new AlarmList(this, parent, SWT.NONE, "AlarmBrowser");\r
+               alarmView = new AlarmList(this, parent, SWT.NONE, "AlarmBrowser"); //$NON-NLS-1$\r
                FormData fd = new FormData();\r
                fd.left = new FormAttachment(0, 0);\r
                fd.top = new FormAttachment(0, 0);\r
index 56f8743..72fc390 100644 (file)
@@ -45,6 +45,7 @@ import org.netxms.ui.eclipse.alarmviewer.Activator;
 import org.netxms.ui.eclipse.alarmviewer.AlarmComparator;\r
 import org.netxms.ui.eclipse.alarmviewer.AlarmListFilter;\r
 import org.netxms.ui.eclipse.alarmviewer.AlarmListLabelProvider;\r
+import org.netxms.ui.eclipse.alarmviewer.Messages;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
 import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
@@ -55,7 +56,7 @@ import org.netxms.ui.eclipse.widgets.SortableTableViewer;
  */\r
 public class AlarmList extends Composite\r
 {\r
-       public static final String JOB_FAMILY = "AlarmViewJob";\r
+       public static final String JOB_FAMILY = "AlarmViewJob"; //$NON-NLS-1$\r
        \r
        // Columns\r
        public static final int COLUMN_SEVERITY = 0;\r
@@ -88,7 +89,7 @@ public class AlarmList extends Composite
                this.viewPart = viewPart;               \r
                \r
                // Setup table columns\r
-               final String[] names = { "Severity", "State", "Source", "Message", "Count", "Created", "Last Change" };\r
+               final String[] names = { Messages.AlarmList_ColumnSeverity, Messages.AlarmList_ColumnState, Messages.AlarmList_ColumnSource, Messages.AlarmList_ColumnMessage, Messages.AlarmList_ColumnCount, Messages.AlarmList_ColumnCreated, Messages.AlarmList_ColumnLastChange };\r
                final int[] widths = { 100, 100, 150, 300, 70, 100, 100 };\r
                alarmViewer = new SortableTableViewer(this, names, widths, 0, SWT.DOWN, SortableTableViewer.DEFAULT_STYLE);\r
                WidgetHelper.restoreTableViewerSettings(alarmViewer, Activator.getDefault().getDialogSettings(), configPrefix);\r
@@ -116,7 +117,7 @@ public class AlarmList extends Composite
                });\r
 \r
                // Request alarm list from server\r
-               new ConsoleJob("Synchronize alarm list", viewPart, Activator.PLUGIN_ID, JOB_FAMILY) {\r
+               new ConsoleJob(Messages.AlarmList_SyncJobName, viewPart, Activator.PLUGIN_ID, JOB_FAMILY) {\r
                        @Override\r
                        protected void runInternal(IProgressMonitor monitor) throws Exception\r
                        {\r
@@ -139,7 +140,7 @@ public class AlarmList extends Composite
                        @Override\r
                        protected String getErrorMessage()\r
                        {\r
-                               return "Cannot synchronize alarm list";\r
+                               return Messages.AlarmList_SyncJobError;\r
                        }\r
                }.start();\r
                \r
diff --git a/src/java/netxms-eclipse/ImageLibrary/src/org/netxms/ui/eclipse/imagelibrary/messages_ru.properties b/src/java/netxms-eclipse/ImageLibrary/src/org/netxms/ui/eclipse/imagelibrary/messages_ru.properties
new file mode 100644 (file)
index 0000000..ea29fdb
--- /dev/null
@@ -0,0 +1 @@
+ImageSelectionDialog.title=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435
\ No newline at end of file
diff --git a/src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_ru.properties b/src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_ru.properties
new file mode 100644 (file)
index 0000000..c1c8984
--- /dev/null
@@ -0,0 +1,2 @@
+LogViewer_AuditLog=\u0416\u0443\u0440\u043d\u0430\u043b \u0410\u0443\u0434\u0438\u0442\u0430\r
+LogViewer_EventLog=\u0416\u0443\u0440\u043d\u0430\u043b \u0421\u043e\u0431\u044b\u0442\u0438\u0439\r
diff --git a/src/java/netxms-eclipse/core/OSGI-INF/l10n/bundle_ru.properties b/src/java/netxms-eclipse/core/OSGI-INF/l10n/bundle_ru.properties
new file mode 100644 (file)
index 0000000..a5716ca
--- /dev/null
@@ -0,0 +1,9 @@
+#Properties file for org.netxms.ui.eclipse.console\r
+Bundle-Name = NetXMS Management Console\r
+perspective.default = aaaaDefault\r
+view.progress = Progress View\r
+product.name = NetXMS Management Console\r
+page.workbench = aaaWorkbench\r
+page.appearance = Appearance\r
+page.keys = Keys\r
+page.decorators = Label Decorators
\ No newline at end of file
index 78a057b..425ec24 100644 (file)
@@ -18,24 +18,24 @@ NXMCActionBarAdvisor.menu_configuration=&\u041d\u0430\u0441\u0442\u0440\u043e\u0
 NXMCActionBarAdvisor.menu_console=\u041a\u043e\u043d\u0441\u043e\u043b\u044c\r
 NXMCActionBarAdvisor.menu_file=&\u0424\u0430\u0439\u043b\r
 NXMCActionBarAdvisor.menu_help=&\u041f\u043e\u043c\u043e\u0449\u044c\r
-NXMCActionBarAdvisor.menu_monitor=&Monitor\r
-NXMCActionBarAdvisor.menu_tools=&Tools\r
-NXMCActionBarAdvisor.menu_view=&View\r
-NXMCActionBarAdvisor.progress=&Progress\r
+NXMCActionBarAdvisor.menu_monitor=&\u041c\u043e\u043d\u0438\u0442\u043e\u0440\r
+NXMCActionBarAdvisor.menu_tools=&\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u044b\r
+NXMCActionBarAdvisor.menu_view=&\u0412\u0438\u0434\r
+NXMCActionBarAdvisor.progress=\u041f&\u0440\u043e\u0433\u0440\u0435\u0441\u0441\r
 NXMCWorkbenchWindowAdvisor.cannot_change_passwd=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u043e\u043c\u0435\u043d\u044f\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c:\r
 NXMCWorkbenchWindowAdvisor.connected=\u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e\r
 NXMCWorkbenchWindowAdvisor.connectionError=\u041e\u0448\u0438\u0431\u043a\u0430 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f\r
 NXMCWorkbenchWindowAdvisor.exception=\u0418\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435\r
-NXMCWorkbenchWindowAdvisor.passwd_changed=Password changed successfully\r
+NXMCWorkbenchWindowAdvisor.passwd_changed=\u041f\u0430\u0440\u043e\u043b\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\r
 NXMCWorkbenchWindowAdvisor.title_error=\u041e\u0448\u0438\u0431\u043a\u0430\r
-NXMCWorkbenchWindowAdvisor.title_information=Information\r
-OpenServerConsole.Error=Error\r
-OpenServerConsole.JobTitle=Open server console\r
-OpenServerConsole.OpenErrorMessage=Cannot open server console\r
-OpenServerConsole.ViewErrorMessage=Error opening view\r
+NXMCWorkbenchWindowAdvisor.title_information=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f\r
+OpenServerConsole.Error=\u041e\u0448\u0438\u0431\u043a\u0430\r
+OpenServerConsole.JobTitle=\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c \u0441\u0435\u0440\u0432\u0435\u0440\u0430\r
+OpenServerConsole.OpenErrorMessage=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0442\u043a\u0440\u044b\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c \u0441\u0435\u0440\u0432\u0435\u0440\u0430\r
+OpenServerConsole.ViewErrorMessage=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f \u0432\u0438\u0434\u0430\r
 PasswordExpiredDialog.confirm_passwd=\u041d\u043e\u0432\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c (\u043f\u043e\u0432\u0442\u043e\u0440\u043d\u043e):\r
 PasswordExpiredDialog.new_passwd=\u041d\u043e\u0432\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c:\r
-PasswordExpiredDialog.passwd_expired=Your password was expired. Please change your password now.\r
+PasswordExpiredDialog.passwd_expired=\u0421\u0440\u043e\u043a \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044f \u0432\u0430\u0448\u0435\u0433\u043e \u043f\u0430\u0440\u043e\u043b\u044f \u0438\u0441\u0442\u0435\u043a. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430 \u0441\u043c\u0435\u043d\u0438\u0442\u0435 \u043f\u0430\u0440\u043e\u043b\u044c.\r
 PasswordExpiredDialog.title=\u0421\u043c\u0435\u043d\u0430 \u043f\u0430\u0440\u043e\u043b\u044f\r
-WorkbenchGeneralPrefs.show_heap=Show &heap status\r
-WorkbenchGeneralPrefs.show_heap=Show &tray icon\r
+WorkbenchGeneralPrefs.show_heap=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c &\u0441\u0442\u0430\u0442\u0443\u0441 \u043a\u0443\u0447\u0438\r
+WorkbenchGeneralPrefs.show_tray_icon=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c &\u0438\u043a\u043e\u043d\u043a\u0443 \u0432 \u0442\u0440\u0435\u0435\r
index 34a9817..f32a687 100644 (file)
@@ -1,12 +1,12 @@
-AbstractSelector_CopyToClipboard=&Copy to clipboard\r
-AbstractSelector_Select=Select...\r
-ConsoleJob_ErrorDialogTitle=Job failed\r
-FilterText_CloseFilter=Close filter\r
-FilterText_Filter=Filter:\r
-FilterText_FilterIsEmpty=Filter is empty\r
-RefreshAction_Name=Refresh\r
-WidgetHelper_Action_Copy=&Copy\r
-WidgetHelper_Action_Cut=C&ut\r
-WidgetHelper_Action_Delete=&Delete\r
-WidgetHelper_Action_Paste=&Paste\r
-WidgetHelper_Action_SelectAll=Select &all\r
+AbstractSelector_CopyToClipboard=&\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432 \u0431\u0443\u0444\u0435\u0440 \u043e\u0431\u043c\u0435\u043d\u0430\r
+AbstractSelector_Select=\u0412\u044b\u0431\u0440\u0430\u0442\u044c...\r
+ConsoleJob_ErrorDialogTitle=\u0421\u0431\u043e\u0439 \u0437\u0430\u0434\u0430\u0447\u0438\r
+FilterText_CloseFilter=\u0417\u0430\u043a\u0440\u044b\u0442\u044c \u0444\u0438\u043b\u044c\u0442\u0440\r
+FilterText_Filter=\u0424\u0438\u043b\u044c\u0442\u0440:\r
+FilterText_FilterIsEmpty=\u0424\u0438\u043b\u044c\u0442\u0440 \u043f\u0443\u0441\u0442\r
+RefreshAction_Name=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c\r
+WidgetHelper_Action_Copy=&\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c\r
+WidgetHelper_Action_Cut=&\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c\r
+WidgetHelper_Action_Delete=&\u0423\u0434\u0430\u043b\u0438\u0442\u044c\r
+WidgetHelper_Action_Paste=\u0412&\u0441\u0442\u0430\u0432\u0438\u0442\u044c\r
+WidgetHelper_Action_SelectAll=\u0412\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u0432&\u0441\u0435\r