Externalized strings
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 18 May 2016 17:10:53 +0000 (20:10 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 18 May 2016 17:10:53 +0000 (20:10 +0300)
32 files changed:
src/java/netxms-eclipse/LogViewer/META-INF/MANIFEST.MF
src/java/netxms-eclipse/LogViewer/OSGI-INF/l10n/bundle.properties
src/java/netxms-eclipse/LogViewer/plugin.xml
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/Messages.java
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/actions/ShowObjectEvents.java
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/actions/ShowObjectSnmpTrapLog.java
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/actions/ShowObjectSyslog.java
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages.properties
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_cs.properties
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_de.properties
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_es.properties
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_fr.properties
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_ru.properties
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_zh_CN.properties
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/widgets/EventConditionEditor.java
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/widgets/ObjectConditionEditor.java
webui/webapp/LogViewer/META-INF/MANIFEST.MF
webui/webapp/LogViewer/OSGI-INF/l10n/bundle.properties
webui/webapp/LogViewer/plugin.xml
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/Messages.java
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/actions/ShowObjectEvents.java
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/actions/ShowObjectSnmpTrapLog.java
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/actions/ShowObjectSyslog.java
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages.properties
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_cs.properties
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_de.properties
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_es.properties
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_fr.properties
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_ru.properties
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/messages_zh_CN.properties
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/widgets/EventConditionEditor.java
webui/webapp/LogViewer/src/org/netxms/ui/eclipse/logviewer/widgets/ObjectConditionEditor.java

index 07f1956..455a731 100644 (file)
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NetXMS Log Viewer
 Bundle-SymbolicName: org.netxms.ui.eclipse.logviewer;singleton:=true
-Bundle-Version: 2.0.7
+Bundle-Version: 2.0.8
 Bundle-Activator: org.netxms.ui.eclipse.logviewer.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui;bundle-version="3.8.2",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.ui.forms;bundle-version="3.5.200",
- org.netxms.ui.eclipse.clientlibrary;bundle-version="2.0.7",
- org.netxms.ui.eclipse.console;bundle-version="2.0.7",
- org.netxms.ui.eclipse.objectbrowser;bundle-version="2.0.3",
+ org.netxms.ui.eclipse.clientlibrary;bundle-version="2.0.10",
+ org.netxms.ui.eclipse.console;bundle-version="2.0.10",
+ org.netxms.ui.eclipse.objectbrowser;bundle-version="2.0.7",
  org.netxms.ui.eclipse.eventmanager;bundle-version="2.0.1",
- org.netxms.ui.eclipse.usermanager;bundle-version="2.0.4"
+ org.netxms.ui.eclipse.usermanager;bundle-version="2.0.8"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.logviewer.views,
index 6c109d3..e8df16d 100644 (file)
@@ -1,29 +1,29 @@
 #Properties file for org.netxms.ui.eclipse.logviewer
 view.name.LogViewer = Log Viewer
-command.description.AuditLog = Open Audit Log
-command.name.AuditLog = Audit Log
-command.description.EventLog = Open Event Log
-command.name.EventLog = Event Log
+command.description.AuditLog = Open audit Log
+command.name.AuditLog = Audit log
+command.description.EventLog = Open event Log
+command.name.EventLog = Event log
 command.description.Syslog = Open Syslog
 command.name.Syslog = Syslog
 command.description.LogFilter = Show Log Filter
-command.name.LogFilter = Show Filter
-command.description.TrapLog = Open SNMP Trap Log
-command.name.TrapLog = SNMP Trap Log
-command.description.AlarmLog = Open Alarm Log
-command.name.AlarmLog = Alarm Log
+command.name.LogFilter = Show filter
+command.description.TrapLog = Open SNMP trap log
+command.name.TrapLog = SNMP trap log
+command.description.AlarmLog = Open alarm log
+command.name.AlarmLog = Alarm log
 command.description.MoreData = Get more data
 command.name.MoreData = Get more data
 command.description.Query = Execute query
 command.name.Query = Execute query
 actionSet.label.LogViewer = Log Viewer
 action.label.Syslog = Syslog
-action.tooltip.Syslog = Open Syslog
-action.label.TrapLog = SNMP Trap Log
-action.tooltip.TrapLog = Open SNMP Trap Log
-action.label.EventLog = Event Log
-action.tooltip.EventLog = Open Event Log
-action.label.AuditLog = Audit Log
-action.tooltip.AuditLog = Open Audit Log
-action.label.AlarmLog = Alarm Log
-action.tooltip.AlarmLog = Open Alarm Log
\ No newline at end of file
+action.tooltip.Syslog = Open syslog
+action.label.TrapLog = SNMP trap log
+action.tooltip.TrapLog = Open SNMP trap log
+action.label.EventLog = Event log
+action.tooltip.EventLog = Open event log
+action.label.AuditLog = Audit log
+action.tooltip.AuditLog = Open audit log
+action.label.AlarmLog = Alarm log
+action.tooltip.AlarmLog = Open alarm log
\ No newline at end of file
index 7dbc062..036620d 100644 (file)
             locationURI="popup:org.eclipse.ui.popup.any?after=eventsAndLogs">
          <command
                commandId="org.netxms.ui.eclipse.logviewer.commands.eventHistory"
-               label="Event log"
+               label="%command.name.EventLog"
                style="push">
             <visibleWhen
                   checkEnabled="false">
          </command>
          <command
                commandId="org.netxms.ui.eclipse.logviewer.commands.objectSyslog"
-               label="Syslog"
+               label="%command.name.Syslog"
                style="push">
             <visibleWhen
                   checkEnabled="false">
          </command>
          <command
                commandId="org.netxms.ui.eclipse.logviewer.commands.objectTrapLog"
-               label="SNMP trap log"
+               label="%command.name.TrapLog"
                style="push">
             <visibleWhen
                   checkEnabled="false">
index dcc04a3..551acf4 100644 (file)
@@ -78,7 +78,16 @@ public class Messages extends NLS
        public static String SeverityConditionEditor_Below;
        public static String SeverityConditionEditor_Is;
        public static String SeverityConditionEditor_IsNot;
-       public static String TextConditionEditor_Like;
+       public static String ShowObjectEvents_CannotOpenLogViewer;
+   public static String ShowObjectEvents_Error;
+   public static String ShowObjectEvents_Time;
+   public static String ShowObjectSnmpTrapLog_Error;
+   public static String ShowObjectSnmpTrapLog_ErrorOpenLogViewer;
+   public static String ShowObjectSnmpTrapLog_Time;
+   public static String ShowObjectSyslog_Error;
+   public static String ShowObjectSyslog_ErrorOpenLogViewer;
+   public static String ShowObjectSyslog_Time;
+   public static String TextConditionEditor_Like;
        public static String TextConditionEditor_NotLike;
        public static String TimestampConditionEditor_After;
        public static String TimestampConditionEditor_And;
index 2b61c3c..969b346 100644 (file)
@@ -34,6 +34,7 @@ import org.netxms.client.log.LogFilter;
 import org.netxms.client.log.OrderingColumn;
 import org.netxms.client.objects.AbstractNode;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.logviewer.Messages;
 import org.netxms.ui.eclipse.logviewer.views.LogViewer;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
@@ -67,16 +68,16 @@ public class ShowObjectEvents extends AbstractHandler
          LogViewer view = (LogViewer)window.getActivePage().showView(LogViewer.ID, "EventLog", IWorkbenchPage.VIEW_ACTIVATE); //$NON-NLS-1$
 
          LogFilter filter = new LogFilter();
-         filter.setColumnFilter("event_source", cf);
+         filter.setColumnFilter("event_source", cf); //$NON-NLS-1$
          List<OrderingColumn> orderingColumns = new ArrayList<OrderingColumn>(1);
-         orderingColumns.add(new OrderingColumn("event_timestamp", "Time", true));
+         orderingColumns.add(new OrderingColumn("event_timestamp", Messages.get().ShowObjectEvents_Time, true)); //$NON-NLS-1$
          filter.setOrderingColumns(orderingColumns);
          
          view.queryWithFilter(filter);
       }
       catch(PartInitException e)
       {
-         MessageDialogHelper.openError(window.getShell(), "Error", String.format("Cannot open log viewer: %s", e.getMessage()));
+         MessageDialogHelper.openError(window.getShell(), Messages.get().ShowObjectEvents_Error, String.format(Messages.get().ShowObjectEvents_CannotOpenLogViewer, e.getMessage()));
       }
       
       return null;
index 71cc6bf..9403a2b 100644 (file)
@@ -34,6 +34,7 @@ import org.netxms.client.log.LogFilter;
 import org.netxms.client.log.OrderingColumn;
 import org.netxms.client.objects.AbstractNode;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.logviewer.Messages;
 import org.netxms.ui.eclipse.logviewer.views.LogViewer;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
@@ -67,16 +68,16 @@ public class ShowObjectSnmpTrapLog extends AbstractHandler
          LogViewer view = (LogViewer)window.getActivePage().showView(LogViewer.ID, "SnmpTrapLog", IWorkbenchPage.VIEW_ACTIVATE); //$NON-NLS-1$
 
          LogFilter filter = new LogFilter();
-         filter.setColumnFilter("object_id", cf);
+         filter.setColumnFilter("object_id", cf); //$NON-NLS-1$
          List<OrderingColumn> orderingColumns = new ArrayList<OrderingColumn>(1);
-         orderingColumns.add(new OrderingColumn("trap_timestamp", "Time", true));
+         orderingColumns.add(new OrderingColumn("trap_timestamp", Messages.get().ShowObjectSnmpTrapLog_Time, true)); //$NON-NLS-1$
          filter.setOrderingColumns(orderingColumns);
          
          view.queryWithFilter(filter);
       }
       catch(PartInitException e)
       {
-         MessageDialogHelper.openError(window.getShell(), "Error", String.format("Cannot open log viewer: %s", e.getMessage()));
+         MessageDialogHelper.openError(window.getShell(), Messages.get().ShowObjectSnmpTrapLog_Error, String.format(Messages.get().ShowObjectSnmpTrapLog_ErrorOpenLogViewer, e.getMessage()));
       }
       
       return null;
index f45ce08..c82133f 100644 (file)
@@ -34,6 +34,7 @@ import org.netxms.client.log.LogFilter;
 import org.netxms.client.log.OrderingColumn;
 import org.netxms.client.objects.AbstractNode;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.logviewer.Messages;
 import org.netxms.ui.eclipse.logviewer.views.LogViewer;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
@@ -67,16 +68,16 @@ public class ShowObjectSyslog extends AbstractHandler
          LogViewer view = (LogViewer)window.getActivePage().showView(LogViewer.ID, "syslog", IWorkbenchPage.VIEW_ACTIVATE); //$NON-NLS-1$
 
          LogFilter filter = new LogFilter();
-         filter.setColumnFilter("source_object_id", cf);
+         filter.setColumnFilter("source_object_id", cf); //$NON-NLS-1$
          List<OrderingColumn> orderingColumns = new ArrayList<OrderingColumn>(1);
-         orderingColumns.add(new OrderingColumn("msg_timestamp", "Time", true));
+         orderingColumns.add(new OrderingColumn("msg_timestamp", Messages.get().ShowObjectSyslog_Time, true)); //$NON-NLS-1$
          filter.setOrderingColumns(orderingColumns);
          
          view.queryWithFilter(filter);
       }
       catch(PartInitException e)
       {
-         MessageDialogHelper.openError(window.getShell(), "Error", String.format("Cannot open log viewer: %s", e.getMessage()));
+         MessageDialogHelper.openError(window.getShell(), Messages.get().ShowObjectSyslog_Error, String.format(Messages.get().ShowObjectSyslog_ErrorOpenLogViewer, e.getMessage()));
       }
       
       return null;
index b4f7254..54f4525 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index 8b13e5c..03fe600 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index b4f7254..54f4525 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index a74c93e..171c939 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index b4f7254..54f4525 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index 939e0d9..5871317 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=\u0412\u044b\u0448\u0435
 SeverityConditionEditor_Below=\u041d\u0438\u0436\u0435
 SeverityConditionEditor_Is=\u0420\u0430\u0432\u043d\u043e
 SeverityConditionEditor_IsNot=\u041d\u0415 \u0420\u0430\u0432\u043d\u043e
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u0442
 TextConditionEditor_NotLike=\u041d\u0415 \u0421\u043e\u0434\u0435\u0440\u0436\u0438\u0442
 TimestampConditionEditor_After=\u041f\u043e\u0441\u043b\u0435
index e53367a..73cadee 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index 1f0afb7..8af8382 100644 (file)
@@ -131,7 +131,7 @@ public class EventConditionEditor extends ConditionEditor
          else
          {
             objectName.setImage(StatusDisplayInfo.getStatusImage(Severity.UNKNOWN));
-            objectName.setText("[" + eventCode + "]");
+            objectName.setText("[" + eventCode + "]"); //$NON-NLS-1$ //$NON-NLS-2$
          }
       }
        }
index cb36640..2dd4254 100644 (file)
@@ -140,7 +140,7 @@ public class ObjectConditionEditor extends ConditionEditor
             }
             else
             {
-               objectName.setText("[" + objectId + "]");
+               objectName.setText("[" + objectId + "]"); //$NON-NLS-1$ //$NON-NLS-2$
             }
          }
       }
index 1f7a853..840c9bb 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NetXMS Log Viewer
 Bundle-SymbolicName: org.netxms.ui.eclipse.logviewer;singleton:=true
-Bundle-Version: 2.0.7
+Bundle-Version: 2.0.8
 Bundle-Activator: org.netxms.ui.eclipse.logviewer.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.rap.ui;bundle-version="2.3.2",
index 6c109d3..e8df16d 100644 (file)
@@ -1,29 +1,29 @@
 #Properties file for org.netxms.ui.eclipse.logviewer
 view.name.LogViewer = Log Viewer
-command.description.AuditLog = Open Audit Log
-command.name.AuditLog = Audit Log
-command.description.EventLog = Open Event Log
-command.name.EventLog = Event Log
+command.description.AuditLog = Open audit Log
+command.name.AuditLog = Audit log
+command.description.EventLog = Open event Log
+command.name.EventLog = Event log
 command.description.Syslog = Open Syslog
 command.name.Syslog = Syslog
 command.description.LogFilter = Show Log Filter
-command.name.LogFilter = Show Filter
-command.description.TrapLog = Open SNMP Trap Log
-command.name.TrapLog = SNMP Trap Log
-command.description.AlarmLog = Open Alarm Log
-command.name.AlarmLog = Alarm Log
+command.name.LogFilter = Show filter
+command.description.TrapLog = Open SNMP trap log
+command.name.TrapLog = SNMP trap log
+command.description.AlarmLog = Open alarm log
+command.name.AlarmLog = Alarm log
 command.description.MoreData = Get more data
 command.name.MoreData = Get more data
 command.description.Query = Execute query
 command.name.Query = Execute query
 actionSet.label.LogViewer = Log Viewer
 action.label.Syslog = Syslog
-action.tooltip.Syslog = Open Syslog
-action.label.TrapLog = SNMP Trap Log
-action.tooltip.TrapLog = Open SNMP Trap Log
-action.label.EventLog = Event Log
-action.tooltip.EventLog = Open Event Log
-action.label.AuditLog = Audit Log
-action.tooltip.AuditLog = Open Audit Log
-action.label.AlarmLog = Alarm Log
-action.tooltip.AlarmLog = Open Alarm Log
\ No newline at end of file
+action.tooltip.Syslog = Open syslog
+action.label.TrapLog = SNMP trap log
+action.tooltip.TrapLog = Open SNMP trap log
+action.label.EventLog = Event log
+action.tooltip.EventLog = Open event log
+action.label.AuditLog = Audit log
+action.tooltip.AuditLog = Open audit log
+action.label.AlarmLog = Alarm log
+action.tooltip.AlarmLog = Open alarm log
\ No newline at end of file
index 7dbc062..036620d 100644 (file)
             locationURI="popup:org.eclipse.ui.popup.any?after=eventsAndLogs">
          <command
                commandId="org.netxms.ui.eclipse.logviewer.commands.eventHistory"
-               label="Event log"
+               label="%command.name.EventLog"
                style="push">
             <visibleWhen
                   checkEnabled="false">
          </command>
          <command
                commandId="org.netxms.ui.eclipse.logviewer.commands.objectSyslog"
-               label="Syslog"
+               label="%command.name.Syslog"
                style="push">
             <visibleWhen
                   checkEnabled="false">
          </command>
          <command
                commandId="org.netxms.ui.eclipse.logviewer.commands.objectTrapLog"
-               label="SNMP trap log"
+               label="%command.name.TrapLog"
                style="push">
             <visibleWhen
                   checkEnabled="false">
index 0d6031f..2abec88 100644 (file)
@@ -81,7 +81,16 @@ public class Messages extends NLS
        public String SeverityConditionEditor_Below;
        public String SeverityConditionEditor_Is;
        public String SeverityConditionEditor_IsNot;
-       public String TextConditionEditor_Like;
+       public String ShowObjectEvents_CannotOpenLogViewer;
+   public String ShowObjectEvents_Error;
+   public String ShowObjectEvents_Time;
+   public String ShowObjectSnmpTrapLog_Error;
+   public String ShowObjectSnmpTrapLog_ErrorOpenLogViewer;
+   public String ShowObjectSnmpTrapLog_Time;
+   public String ShowObjectSyslog_Error;
+   public String ShowObjectSyslog_ErrorOpenLogViewer;
+   public String ShowObjectSyslog_Time;
+   public String TextConditionEditor_Like;
        public String TextConditionEditor_NotLike;
        public String TimestampConditionEditor_After;
        public String TimestampConditionEditor_And;
index 2b61c3c..969b346 100644 (file)
@@ -34,6 +34,7 @@ import org.netxms.client.log.LogFilter;
 import org.netxms.client.log.OrderingColumn;
 import org.netxms.client.objects.AbstractNode;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.logviewer.Messages;
 import org.netxms.ui.eclipse.logviewer.views.LogViewer;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
@@ -67,16 +68,16 @@ public class ShowObjectEvents extends AbstractHandler
          LogViewer view = (LogViewer)window.getActivePage().showView(LogViewer.ID, "EventLog", IWorkbenchPage.VIEW_ACTIVATE); //$NON-NLS-1$
 
          LogFilter filter = new LogFilter();
-         filter.setColumnFilter("event_source", cf);
+         filter.setColumnFilter("event_source", cf); //$NON-NLS-1$
          List<OrderingColumn> orderingColumns = new ArrayList<OrderingColumn>(1);
-         orderingColumns.add(new OrderingColumn("event_timestamp", "Time", true));
+         orderingColumns.add(new OrderingColumn("event_timestamp", Messages.get().ShowObjectEvents_Time, true)); //$NON-NLS-1$
          filter.setOrderingColumns(orderingColumns);
          
          view.queryWithFilter(filter);
       }
       catch(PartInitException e)
       {
-         MessageDialogHelper.openError(window.getShell(), "Error", String.format("Cannot open log viewer: %s", e.getMessage()));
+         MessageDialogHelper.openError(window.getShell(), Messages.get().ShowObjectEvents_Error, String.format(Messages.get().ShowObjectEvents_CannotOpenLogViewer, e.getMessage()));
       }
       
       return null;
index 71cc6bf..9403a2b 100644 (file)
@@ -34,6 +34,7 @@ import org.netxms.client.log.LogFilter;
 import org.netxms.client.log.OrderingColumn;
 import org.netxms.client.objects.AbstractNode;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.logviewer.Messages;
 import org.netxms.ui.eclipse.logviewer.views.LogViewer;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
@@ -67,16 +68,16 @@ public class ShowObjectSnmpTrapLog extends AbstractHandler
          LogViewer view = (LogViewer)window.getActivePage().showView(LogViewer.ID, "SnmpTrapLog", IWorkbenchPage.VIEW_ACTIVATE); //$NON-NLS-1$
 
          LogFilter filter = new LogFilter();
-         filter.setColumnFilter("object_id", cf);
+         filter.setColumnFilter("object_id", cf); //$NON-NLS-1$
          List<OrderingColumn> orderingColumns = new ArrayList<OrderingColumn>(1);
-         orderingColumns.add(new OrderingColumn("trap_timestamp", "Time", true));
+         orderingColumns.add(new OrderingColumn("trap_timestamp", Messages.get().ShowObjectSnmpTrapLog_Time, true)); //$NON-NLS-1$
          filter.setOrderingColumns(orderingColumns);
          
          view.queryWithFilter(filter);
       }
       catch(PartInitException e)
       {
-         MessageDialogHelper.openError(window.getShell(), "Error", String.format("Cannot open log viewer: %s", e.getMessage()));
+         MessageDialogHelper.openError(window.getShell(), Messages.get().ShowObjectSnmpTrapLog_Error, String.format(Messages.get().ShowObjectSnmpTrapLog_ErrorOpenLogViewer, e.getMessage()));
       }
       
       return null;
index f45ce08..c82133f 100644 (file)
@@ -34,6 +34,7 @@ import org.netxms.client.log.LogFilter;
 import org.netxms.client.log.OrderingColumn;
 import org.netxms.client.objects.AbstractNode;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.logviewer.Messages;
 import org.netxms.ui.eclipse.logviewer.views.LogViewer;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
@@ -67,16 +68,16 @@ public class ShowObjectSyslog extends AbstractHandler
          LogViewer view = (LogViewer)window.getActivePage().showView(LogViewer.ID, "syslog", IWorkbenchPage.VIEW_ACTIVATE); //$NON-NLS-1$
 
          LogFilter filter = new LogFilter();
-         filter.setColumnFilter("source_object_id", cf);
+         filter.setColumnFilter("source_object_id", cf); //$NON-NLS-1$
          List<OrderingColumn> orderingColumns = new ArrayList<OrderingColumn>(1);
-         orderingColumns.add(new OrderingColumn("msg_timestamp", "Time", true));
+         orderingColumns.add(new OrderingColumn("msg_timestamp", Messages.get().ShowObjectSyslog_Time, true)); //$NON-NLS-1$
          filter.setOrderingColumns(orderingColumns);
          
          view.queryWithFilter(filter);
       }
       catch(PartInitException e)
       {
-         MessageDialogHelper.openError(window.getShell(), "Error", String.format("Cannot open log viewer: %s", e.getMessage()));
+         MessageDialogHelper.openError(window.getShell(), Messages.get().ShowObjectSyslog_Error, String.format(Messages.get().ShowObjectSyslog_ErrorOpenLogViewer, e.getMessage()));
       }
       
       return null;
index b4f7254..54f4525 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index 8b13e5c..03fe600 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index b4f7254..54f4525 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index a74c93e..171c939 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index b4f7254..54f4525 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index 939e0d9..5871317 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=\u0412\u044b\u0448\u0435
 SeverityConditionEditor_Below=\u041d\u0438\u0436\u0435
 SeverityConditionEditor_Is=\u0420\u0430\u0432\u043d\u043e
 SeverityConditionEditor_IsNot=\u041d\u0415 \u0420\u0430\u0432\u043d\u043e
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u0442
 TextConditionEditor_NotLike=\u041d\u0415 \u0421\u043e\u0434\u0435\u0440\u0436\u0438\u0442
 TimestampConditionEditor_After=\u041f\u043e\u0441\u043b\u0435
index e53367a..73cadee 100644 (file)
@@ -73,6 +73,15 @@ SeverityConditionEditor_Above=ABOVE
 SeverityConditionEditor_Below=BELOW
 SeverityConditionEditor_Is=IS
 SeverityConditionEditor_IsNot=IS NOT
+ShowObjectEvents_CannotOpenLogViewer=Cannot open log viewer: %s
+ShowObjectEvents_Error=Error
+ShowObjectEvents_Time=Time
+ShowObjectSnmpTrapLog_Error=Error
+ShowObjectSnmpTrapLog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSnmpTrapLog_Time=Time
+ShowObjectSyslog_Error=Error
+ShowObjectSyslog_ErrorOpenLogViewer=Cannot open log viewer: %s
+ShowObjectSyslog_Time=Time
 TextConditionEditor_Like=LIKE
 TextConditionEditor_NotLike=NOT LIKE
 TimestampConditionEditor_After=AFTER
index 50ea967..1da6121 100644 (file)
@@ -131,7 +131,7 @@ public class EventConditionEditor extends ConditionEditor
          else
          {
             objectName.setImage(StatusDisplayInfo.getStatusImage(Severity.UNKNOWN));
-            objectName.setText("[" + eventCode + "]");
+            objectName.setText("[" + eventCode + "]"); //$NON-NLS-1$ //$NON-NLS-2$
          }
       }
        }
index cec8dfb..d4cce87 100644 (file)
@@ -140,7 +140,7 @@ public class ObjectConditionEditor extends ConditionEditor
             }
             else
             {
-               objectName.setText("[" + objectId + "]");
+               objectName.setText("[" + objectId + "]"); //$NON-NLS-1$ //$NON-NLS-2$
             }
          }
       }