externalized strings in plugins BXSL, OSM, and ObjectTools
authorVictor Kirhenshtein <victor@netxms.org>
Tue, 11 Nov 2014 17:18:45 +0000 (19:18 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Tue, 11 Nov 2014 17:18:45 +0000 (19:18 +0200)
79 files changed:
src/java/netxms-eclipse/NXSL/OSGI-INF/l10n/bundle_de.properties [new file with mode: 0644]
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/Messages.java
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/actions/ExecuteServerScript.java
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/dialogs/SaveScriptDialog.java
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/dialogs/ScriptEditDialog.java
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/messages.properties
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/messages_cs.properties
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/messages_de.properties [copied from src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/messages.properties with 55% similarity]
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/messages_es.properties
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/messages_ru.properties
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/messages_zh_CN.properties
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/tools/NXSLLineStyleListener.java
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/views/ScriptExecutor.java
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/widgets/internal/NXSLDocument.java
src/java/netxms-eclipse/OSM/META-INF/MANIFEST.MF
src/java/netxms-eclipse/OSM/OSGI-INF/l10n/bundle_de.properties [new file with mode: 0644]
src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/Messages.java
src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/actions/OpenHistoryMap.java
src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/dialogs/TimeSelectionDialog.java
src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/messages.properties
src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/messages_cs.properties
src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/messages_de.properties [copied from src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/messages.properties with 53% similarity]
src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/messages_es.properties
src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/messages_ru.properties
src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/messages_zh_CN.properties
src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/views/HistoryView.java
src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/widgets/GeoMapViewer.java
src/java/netxms-eclipse/ObjectTools/OSGI-INF/l10n/bundle_de.properties [new file with mode: 0644]
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/Messages.java
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsDynamicMenu.java
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/WakeupToolHandler.java
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/api/ObjectToolsCache.java
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_cs.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_de.properties [copied from src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages.properties with 92% similarity]
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_es.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_ru.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_zh_CN.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/propertypages/General.java
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/views/BrowserView.java
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/views/LocalCommandResults.java
webui/webapp/NXSL/OSGI-INF/l10n/bundle_de.properties [new file with mode: 0644]
webui/webapp/NXSL/src/org/netxms/ui/eclipse/nxsl/Messages.java
webui/webapp/NXSL/src/org/netxms/ui/eclipse/nxsl/actions/ExecuteServerScript.java
webui/webapp/NXSL/src/org/netxms/ui/eclipse/nxsl/dialogs/SaveScriptDialog.java
webui/webapp/NXSL/src/org/netxms/ui/eclipse/nxsl/dialogs/ScriptEditDialog.java
webui/webapp/NXSL/src/org/netxms/ui/eclipse/nxsl/messages.properties
webui/webapp/NXSL/src/org/netxms/ui/eclipse/nxsl/messages_cs.properties
webui/webapp/NXSL/src/org/netxms/ui/eclipse/nxsl/messages_de.properties [copied from src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/messages.properties with 55% similarity]
webui/webapp/NXSL/src/org/netxms/ui/eclipse/nxsl/messages_es.properties
webui/webapp/NXSL/src/org/netxms/ui/eclipse/nxsl/messages_ru.properties
webui/webapp/NXSL/src/org/netxms/ui/eclipse/nxsl/messages_zh_CN.properties
webui/webapp/NXSL/src/org/netxms/ui/eclipse/nxsl/views/ScriptExecutor.java
webui/webapp/OSM/META-INF/MANIFEST.MF
webui/webapp/OSM/OSGI-INF/l10n/bundle_de.properties [new file with mode: 0644]
webui/webapp/OSM/src/org/netxms/ui/eclipse/osm/Messages.java
webui/webapp/OSM/src/org/netxms/ui/eclipse/osm/actions/OpenHistoryMap.java
webui/webapp/OSM/src/org/netxms/ui/eclipse/osm/dialogs/TimeSelectionDialog.java
webui/webapp/OSM/src/org/netxms/ui/eclipse/osm/messages.properties
webui/webapp/OSM/src/org/netxms/ui/eclipse/osm/messages_cs.properties
webui/webapp/OSM/src/org/netxms/ui/eclipse/osm/messages_de.properties [copied from src/java/netxms-eclipse/OSM/src/org/netxms/ui/eclipse/osm/messages.properties with 53% similarity]
webui/webapp/OSM/src/org/netxms/ui/eclipse/osm/messages_es.properties
webui/webapp/OSM/src/org/netxms/ui/eclipse/osm/messages_ru.properties
webui/webapp/OSM/src/org/netxms/ui/eclipse/osm/messages_zh_CN.properties
webui/webapp/OSM/src/org/netxms/ui/eclipse/osm/views/HistoryView.java
webui/webapp/OSM/src/org/netxms/ui/eclipse/osm/widgets/GeoMapViewer.java
webui/webapp/ObjectTools/OSGI-INF/l10n/bundle_de.properties [new file with mode: 0644]
webui/webapp/ObjectTools/plugin.xml
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/Messages.java
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsDynamicMenu.java
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/WakeupToolHandler.java
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/api/ObjectToolsCache.java
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_cs.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_de.properties [copied from src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages.properties with 92% similarity]
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_es.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_ru.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_zh_CN.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/propertypages/General.java

diff --git a/src/java/netxms-eclipse/NXSL/OSGI-INF/l10n/bundle_de.properties b/src/java/netxms-eclipse/NXSL/OSGI-INF/l10n/bundle_de.properties
new file mode 100644 (file)
index 0000000..3db1951
--- /dev/null
@@ -0,0 +1,7 @@
+action.label.ScriptLibrary= Script Library
+action.tooltip.ScriptLibrary= Open Script Library
+actionSet.label.ScriptLibrary= Script Library
+command.description.ScriptLibrary= Open Script Library
+command.name.ScriptLibrary= Script Library
+view.name.EditScript= Edit Script
+view.name.ScriptLibrary= Script Library
index bd4ca11..0adff82 100644 (file)
@@ -10,8 +10,17 @@ public class Messages extends NLS
    public static String CreateScriptDialog_ScriptName;
    public static String CreateScriptDialog_Warning;
    public static String CreateScriptDialog_WarningEmptyName;
+   public static String ExecuteServerScript_Error;
+   public static String ExecuteServerScript_ErrorMessage;
    public static String OpenScriptLibrary_Error;
    public static String OpenScriptLibrary_ErrorMsg;
+   public static String SaveScriptDialog_Cancel;
+   public static String SaveScriptDialog_Discard;
+   public static String SaveScriptDialog_Message;
+   public static String SaveScriptDialog_Save;
+   public static String SaveScriptDialog_SaveAs;
+   public static String SaveScriptDialog_Title;
+   public static String ScriptEditDialog_Title;
    public static String ScriptEditorView_Error;
    public static String ScriptEditorView_LoadJobError;
    public static String ScriptEditorView_LoadJobTitle;
@@ -20,6 +29,27 @@ public class Messages extends NLS
    public static String ScriptEditorView_SaveErrorMessage;
    public static String ScriptEditorView_SaveJobError;
    public static String ScriptEditorView_SaveJobTitle;
+   public static String ScriptExecutor_Clear;
+   public static String ScriptExecutor_ClearOutput;
+   public static String ScriptExecutor_Error;
+   public static String ScriptExecutor_Execute;
+   public static String ScriptExecutor_JobError_Create;
+   public static String ScriptExecutor_JobError_Execute;
+   public static String ScriptExecutor_JobError_ReadList;
+   public static String ScriptExecutor_JobError_Update;
+   public static String ScriptExecutor_JobName_Create;
+   public static String ScriptExecutor_JobName_Execute;
+   public static String ScriptExecutor_JobName_ReadList;
+   public static String ScriptExecutor_JobName_Update;
+   public static String ScriptExecutor_LibScript;
+   public static String ScriptExecutor_Noname;
+   public static String ScriptExecutor_Output;
+   public static String ScriptExecutor_PartName;
+   public static String ScriptExecutor_Reload;
+   public static String ScriptExecutor_Save;
+   public static String ScriptExecutor_SaveAs;
+   public static String ScriptExecutor_SaveError;
+   public static String ScriptExecutor_Source;
    public static String ScriptLibrary_ColumnId;
    public static String ScriptLibrary_ColumnName;
    public static String ScriptLibrary_Confirmation;
index 4e849cd..3b3b538 100644 (file)
@@ -28,6 +28,7 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.nxsl.Messages;
 import org.netxms.ui.eclipse.nxsl.views.ScriptExecutor;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
@@ -57,7 +58,7 @@ public class ExecuteServerScript extends AbstractHandler
       }
       catch(PartInitException e)
       {
-         MessageDialogHelper.openError(window.getShell(), "Error", String.format("Error opening script execution view: %s", e.getLocalizedMessage()));
+         MessageDialogHelper.openError(window.getShell(), Messages.get().ExecuteServerScript_Error, String.format(Messages.get().ExecuteServerScript_ErrorMessage, e.getLocalizedMessage()));
       }
       return null;
    }
index ee8c133..d2d5ccb 100644 (file)
@@ -29,6 +29,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.netxms.ui.eclipse.nxsl.Activator;
+import org.netxms.ui.eclipse.nxsl.Messages;
 import org.netxms.ui.eclipse.tools.WidgetHelper;
 
 /**
@@ -60,7 +61,7 @@ public class SaveScriptDialog extends Dialog
    protected void configureShell(Shell newShell)
    {
       super.configureShell(newShell);
-      newShell.setText("Unsaved changes");
+      newShell.setText(Messages.get().SaveScriptDialog_Title);
    }
 
    /*
@@ -71,10 +72,10 @@ public class SaveScriptDialog extends Dialog
    @Override
    protected void createButtonsForButtonBar(Composite parent)
    {
-      createButton(parent, SAVE_ID, "Save", false);
-      createButton(parent, SAVE_AS_ID, "Save as...", false);
-      createButton(parent, DISCARD_ID, "Discard", false);
-      createButton(parent, IDialogConstants.CANCEL_ID, "Cancel", false);
+      createButton(parent, SAVE_ID, Messages.get().SaveScriptDialog_Save, false);
+      createButton(parent, SAVE_AS_ID, Messages.get().SaveScriptDialog_SaveAs, false);
+      createButton(parent, DISCARD_ID, Messages.get().SaveScriptDialog_Discard, false);
+      createButton(parent, IDialogConstants.CANCEL_ID, Messages.get().SaveScriptDialog_Cancel, false);
       
       if (!showSave)
          getButton(SAVE_ID).setEnabled(false);
@@ -101,7 +102,7 @@ public class SaveScriptDialog extends Dialog
       image.setImage(Activator.getImageDescriptor("icons/unsaved_config.png").createImage()); //$NON-NLS-1$
 
       final CLabel text = new CLabel(dialogArea, SWT.LEFT);
-      text.setText("Script source has been modified. Please select one of the following actions:\n\t\"Save\"\t\tSave into currently selected library script\n\t\"Save as...\"\tSave as new library script\n\t\"Discard\"\tDiscard changes\n\t\"Cancel\"\t\tCancel requested operation and return to editing script");
+      text.setText(Messages.get().SaveScriptDialog_Message);
       GridData gd = new GridData();
       gd.grabExcessHorizontalSpace = true;
       gd.horizontalAlignment = SWT.FILL;
index 0f15229..4df50f5 100644 (file)
@@ -24,6 +24,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
+import org.netxms.ui.eclipse.nxsl.Messages;
 import org.netxms.ui.eclipse.nxsl.widgets.ScriptEditor;
 
 /**
@@ -51,7 +52,7 @@ public class ScriptEditDialog extends Dialog
    protected void configureShell(Shell newShell)
    {
       super.configureShell(newShell);
-      newShell.setText("Edit Script");
+      newShell.setText(Messages.get().ScriptEditDialog_Title);
    }
 
    /* (non-Javadoc)
index 9cc2294..3773da2 100644 (file)
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=Rename script
 CreateScriptDialog_ScriptName=Script name
 CreateScriptDialog_Warning=Warning
 CreateScriptDialog_WarningEmptyName=Please enter valid script name
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=Error
 OpenScriptLibrary_ErrorMsg=Error opening view: 
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=Error
 ScriptEditorView_LoadJobError=Cannot load script with ID %d from server
 ScriptEditorView_LoadJobTitle=Loading script [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&Save
 ScriptEditorView_SaveErrorMessage=Cannot save script: %s
 ScriptEditorView_SaveJobError=Cannot save script to database
 ScriptEditorView_SaveJobTitle=Saving script to library
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=ID
 ScriptLibrary_ColumnName=Name
 ScriptLibrary_Confirmation=Confirmation
index 5eb1e64..3283379 100644 (file)
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=P\u0159ejmenovat skript
 CreateScriptDialog_ScriptName=N\u00E1zev skriptu
 CreateScriptDialog_Warning=Varov\u00E1n\u00ED
 CreateScriptDialog_WarningEmptyName=Pros\u00EDm vlo\u017Ete platn\u00FD n\u00E1zev skriptu
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=Chyba
 OpenScriptLibrary_ErrorMsg=Chyba p\u0159i otev\u00EDr\u00E1n\u00ED\:
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=Chyba
 ScriptEditorView_LoadJobError=Ze serveru nelze na\u010D\u00EDst skript s ID %d
 ScriptEditorView_LoadJobTitle=Na\u010D\u00EDt\u00E1n\u00ED skriptu [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&Ulo\u017Eit
 ScriptEditorView_SaveErrorMessage=Nelze ulo\u017Eit skript\: %s
 ScriptEditorView_SaveJobError=Nelze ulo\u017Eit skript do datab\u00E1ze
 ScriptEditorView_SaveJobTitle=Ukl\u00E1d\u00E1n\u00ED skriptu do knihovny
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=ID
 ScriptLibrary_ColumnName=N\u00E1zev
 ScriptLibrary_Confirmation=Potvrzen\u00ED
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=Rename script
 CreateScriptDialog_ScriptName=Script name
 CreateScriptDialog_Warning=Warning
 CreateScriptDialog_WarningEmptyName=Please enter valid script name
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=Error
 OpenScriptLibrary_ErrorMsg=Error opening view: 
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=Error
 ScriptEditorView_LoadJobError=Cannot load script with ID %d from server
 ScriptEditorView_LoadJobTitle=Loading script [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&Save
 ScriptEditorView_SaveErrorMessage=Cannot save script: %s
 ScriptEditorView_SaveJobError=Cannot save script to database
 ScriptEditorView_SaveJobTitle=Saving script to library
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=ID
 ScriptLibrary_ColumnName=Name
 ScriptLibrary_Confirmation=Confirmation
index 9cc2294..3773da2 100644 (file)
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=Rename script
 CreateScriptDialog_ScriptName=Script name
 CreateScriptDialog_Warning=Warning
 CreateScriptDialog_WarningEmptyName=Please enter valid script name
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=Error
 OpenScriptLibrary_ErrorMsg=Error opening view: 
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=Error
 ScriptEditorView_LoadJobError=Cannot load script with ID %d from server
 ScriptEditorView_LoadJobTitle=Loading script [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&Save
 ScriptEditorView_SaveErrorMessage=Cannot save script: %s
 ScriptEditorView_SaveJobError=Cannot save script to database
 ScriptEditorView_SaveJobTitle=Saving script to library
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=ID
 ScriptLibrary_ColumnName=Name
 ScriptLibrary_Confirmation=Confirmation
index 6c30caf..d4f1149 100644 (file)
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e
 CreateScriptDialog_ScriptName=\u0418\u043c\u044f \u0441\u043a\u0440\u0438\u043f\u0442\u0430
 CreateScriptDialog_Warning=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435
 CreateScriptDialog_WarningEmptyName=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0443\u043a\u0430\u0436\u0438\u0442\u0435 \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e\u0435 \u0438\u043c\u044f \u0441\u043a\u0440\u0438\u043f\u0442\u0430
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=\u041e\u0448\u0438\u0431\u043a\u0430
 OpenScriptLibrary_ErrorMsg=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f: 
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=\u041e\u0448\u0438\u0431\u043a\u0430
 ScriptEditorView_LoadJobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0441\u043a\u0440\u0438\u043f\u0442 \u0441 \u043a\u043e\u0434\u043e\u043c %d \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430
 ScriptEditorView_LoadJobTitle=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u043a\u0440\u0438\u043f\u0442\u0430 [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
 ScriptEditorView_SaveErrorMessage=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0441\u043a\u0440\u0438\u043f\u0442: %s
 ScriptEditorView_SaveJobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0441\u043a\u0440\u0438\u043f\u0442 \u0432 \u0431\u0430\u0437\u0435 \u0434\u0430\u043d\u043d\u044b\u0445
 ScriptEditorView_SaveJobTitle=\u0421\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435 \u0441\u043a\u0440\u0438\u043f\u0442\u0430 \u0432 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0435
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=\u041a\u043e\u0434
 ScriptLibrary_ColumnName=\u0418\u043c\u044f
 ScriptLibrary_Confirmation=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
index 9cc2294..3773da2 100644 (file)
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=Rename script
 CreateScriptDialog_ScriptName=Script name
 CreateScriptDialog_Warning=Warning
 CreateScriptDialog_WarningEmptyName=Please enter valid script name
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=Error
 OpenScriptLibrary_ErrorMsg=Error opening view: 
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=Error
 ScriptEditorView_LoadJobError=Cannot load script with ID %d from server
 ScriptEditorView_LoadJobTitle=Loading script [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&Save
 ScriptEditorView_SaveErrorMessage=Cannot save script: %s
 ScriptEditorView_SaveJobError=Cannot save script to database
 ScriptEditorView_SaveJobTitle=Saving script to library
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=ID
 ScriptLibrary_ColumnName=Name
 ScriptLibrary_Confirmation=Confirmation
index 1d153c2..3f3d29a 100644 (file)
@@ -50,10 +50,11 @@ public class NXSLLineStyleListener implements LineStyleListener, ExtendedModifyL
        private static final Color KEYWORD_COLOR = new Color(Display.getCurrent(), 96, 0, 0);
        private static final Color STRING_COLOR = new Color(Display.getCurrent(), 0, 0, 192);
        
-       private static final String[] keywords = { "break", "classof", "continue", "do", "else", "exit", "for", "if", "ilike",
-                                                  "imatch", "int32", "int64", "like", "match", "print", "println",
-                                                  "real", "return", "string", "sub", "typeof", "uint32", "uint64",
-                                                  "use", "while" };
+       private static final String[] keywords = { 
+          "abort", "array", "break", "case", "catch", "classof", "const", "continue", "default", "do",
+          "else", "exit", "for", "foreach", "global", "if", "ilike", "imatch", "int32", "int64", "like",
+          "match", "print", "println", "real", "return", "string", "sub", "switch", "try", "typeof",
+          "uint32", "uint64", "use", "while" };
        private static final String[] systemConstants = { "null", "NULL", "true", "TRUE", "false", "FALSE" };
        
        @SuppressWarnings("rawtypes")
index db843c9..396645a 100644 (file)
@@ -58,6 +58,7 @@ import org.netxms.ui.eclipse.actions.RefreshAction;
 import org.netxms.ui.eclipse.console.resources.SharedIcons;
 import org.netxms.ui.eclipse.jobs.ConsoleJob;
 import org.netxms.ui.eclipse.nxsl.Activator;
+import org.netxms.ui.eclipse.nxsl.Messages;
 import org.netxms.ui.eclipse.nxsl.dialogs.CreateScriptDialog;
 import org.netxms.ui.eclipse.nxsl.dialogs.SaveScriptDialog;
 import org.netxms.ui.eclipse.nxsl.widgets.ScriptEditor;
@@ -106,7 +107,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       objectId = Long.parseLong(site.getSecondaryId());
       scriptLibraryManager = (ScriptLibraryManager)ConsoleSharedData.getSession();
 
-      setPartName("Execute Script - " +session.getObjectName(objectId));
+      setPartName(String.format(Messages.get().ScriptExecutor_PartName, session.getObjectName(objectId)));
    }
 
    /* (non-Javadoc)
@@ -124,14 +125,14 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       formContainer.setLayout(new FillLayout());      
       
       form = toolkit.createForm(formContainer);
-      form.setText("noname");
+      form.setText(Messages.get().ScriptExecutor_Noname);
       
       GridLayout layout = new GridLayout();
       layout.verticalSpacing = 8;
       form.getBody().setLayout(layout);
 
       /**** Script list dropdown ****/
-      scriptCombo = WidgetHelper.createLabeledCombo(form.getBody(), SWT.READ_ONLY, "Script from library", WidgetHelper.DEFAULT_LAYOUT_DATA, toolkit);
+      scriptCombo = WidgetHelper.createLabeledCombo(form.getBody(), SWT.READ_ONLY, Messages.get().ScriptExecutor_LibScript, WidgetHelper.DEFAULT_LAYOUT_DATA, toolkit);
       updateScriptList(null); 
       scriptCombo.addSelectionListener( new SelectionListener() {
          @Override
@@ -170,7 +171,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       layout.marginBottom = 4;
       container.setLayout(layout);
       Section section = toolkit.createSection(container, Section.TITLE_BAR);
-      section.setText("Source");
+      section.setText(Messages.get().ScriptExecutor_Source);
       gridData = new GridData();
       gridData.horizontalAlignment = GridData.FILL;
       gridData.grabExcessHorizontalSpace = true;
@@ -180,7 +181,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       
       scriptEditor = new ScriptEditor(section, SWT.BORDER, SWT.H_SCROLL | SWT.V_SCROLL, 0);
       section.setClient(scriptEditor);
-      scriptEditor.setText("");
+      scriptEditor.setText(""); //$NON-NLS-1$
       scriptEditor.getTextWidget().addModifyListener(new ModifyListener() {
          @Override
          public void modifyText(ModifyEvent e)
@@ -197,7 +198,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       layout.marginTop = 4;
       container.setLayout(layout);
       section = toolkit.createSection(container, Section.TITLE_BAR);
-      section.setText("Output");
+      section.setText(Messages.get().ScriptExecutor_Output);
       gridData = new GridData();
       gridData.horizontalAlignment = GridData.FILL;
       gridData.grabExcessHorizontalSpace = true;
@@ -264,17 +265,17 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
    {
       final IHandlerService handlerService = (IHandlerService)getSite().getService(IHandlerService.class);
       
-      actionSave = new Action("Save", SharedIcons.SAVE) {
+      actionSave = new Action(Messages.get().ScriptExecutor_Save, SharedIcons.SAVE) {
          @Override
          public void run()
          {
-            intermidiateSave(false);
+            intermediateSave(false);
          }
       };
       actionSave.setActionDefinitionId("org.netxms.ui.eclipse.nxsl.commands.save"); //$NON-NLS-1$
       handlerService.activateHandler(actionSave.getActionDefinitionId(), new ActionHandler(actionSave));
       
-      actionSaveAs = new Action("Save as...", SharedIcons.SAVE_AS) {
+      actionSaveAs = new Action(Messages.get().ScriptExecutor_SaveAs, SharedIcons.SAVE_AS) {
          @Override
          public void run()
          {
@@ -284,7 +285,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       actionSaveAs.setActionDefinitionId("org.netxms.ui.eclipse.nxsl.commands.save_as"); //$NON-NLS-1$
       handlerService.activateHandler(actionSaveAs.getActionDefinitionId(), new ActionHandler(actionSaveAs));
       
-      actionClear = new Action("Clear source", SharedIcons.CLEAR) {
+      actionClear = new Action(Messages.get().ScriptExecutor_Clear, SharedIcons.CLEAR) {
          @Override
          public void run()
          {
@@ -295,13 +296,13 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
             }
             scriptCombo.deselectAll();
             scriptCombo.clearSelection();
-            scriptEditor.setText("");
+            scriptEditor.setText(""); //$NON-NLS-1$
             output.clear();
-            form.setText("noname");
+            form.setText(Messages.get().ScriptExecutor_Noname);
          }
       };
 
-      actionClearOutput = new Action("Clear output", SharedIcons.CLEAR_LOG) {
+      actionClearOutput = new Action(Messages.get().ScriptExecutor_ClearOutput, SharedIcons.CLEAR_LOG) {
          @Override
          public void run()
          {
@@ -326,9 +327,9 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
             output.clear();
          }
       };
-      actionReload.setText("Reload script");
+      actionReload.setText(Messages.get().ScriptExecutor_Reload);
       
-      actionExecute = new Action("Execute", SharedIcons.EXECUTE) {
+      actionExecute = new Action(Messages.get().ScriptExecutor_Execute, SharedIcons.EXECUTE) {
          @Override
          public void run()
          {
@@ -350,7 +351,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       switch(rc)
       {
          case SaveScriptDialog.SAVE_ID:
-            intermidiateSave(onSelectionChange);
+            intermediateSave(onSelectionChange);
             break;
          case SaveScriptDialog.SAVE_AS_ID:
             createNewScript(onSelectionChange);
@@ -374,7 +375,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       final CreateScriptDialog dlg = new CreateScriptDialog(getSite().getShell(), null);
       if (dlg.open() == Window.OK)
       {
-         new ConsoleJob("Create new script", this, Activator.PLUGIN_ID, null) {
+         new ConsoleJob(Messages.get().ScriptExecutor_JobName_Create, this, Activator.PLUGIN_ID, null) {
             @Override
             protected void runInternal(IProgressMonitor monitor) throws Exception
             {
@@ -390,7 +391,6 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
                         public void run()
                         {
                            scriptCombo.select(scriptCombo.indexOf(dlg.getName()));
-                           System.out.println("Trying to set newly created item");
                         }
                      };
                      updateScriptList(saveOnSelectionChange ? null : run);
@@ -402,7 +402,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
             @Override
             protected String getErrorMessage()
             {
-               return "Error modifying script";
+               return Messages.get().ScriptExecutor_JobError_Create;
             }
          }.start();
       }
@@ -417,7 +417,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       if (index == -1)
          return;
       
-      new ConsoleJob("Update script content", this, Activator.PLUGIN_ID, null) {
+      new ConsoleJob(Messages.get().ScriptExecutor_JobName_Update, this, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {            
@@ -437,7 +437,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
          @Override
          protected String getErrorMessage()
          {
-            return "Not possible to get script content";
+            return Messages.get().ScriptExecutor_JobError_Update;
          }
       }.start();
    }
@@ -450,7 +450,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       final String script = scriptEditor.getText();
       consoleOutputStream = output.newOutputStream();
       actionExecute.setEnabled(false);
-      new ConsoleJob("Execute script", null, Activator.PLUGIN_ID, null) {
+      new ConsoleJob(Messages.get().ScriptExecutor_JobName_Execute, null, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
@@ -460,7 +460,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
          @Override
          protected String getErrorMessage()
          {
-            return "Error executing script";
+            return Messages.get().ScriptExecutor_JobError_Execute;
          }
 
          /* (non-Javadoc)
@@ -495,7 +495,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
    {
       final String selection = (scriptCombo.getSelectionIndex() != -1) ? scriptCombo.getItem(scriptCombo.getSelectionIndex()) : null;
             
-      new ConsoleJob("Update script list", this, Activator.PLUGIN_ID, null) {
+      new ConsoleJob(Messages.get().ScriptExecutor_JobName_ReadList, this, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
@@ -528,7 +528,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
          @Override
          protected String getErrorMessage()
          {
-            return "Not possible to get script list";
+            return Messages.get().ScriptExecutor_JobError_ReadList;
          }
       }.start();
    }
@@ -536,10 +536,10 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
    /**
     * Update script
     */
-   public void intermidiateSave(boolean saveOnSelectionChange)
+   public void intermediateSave(boolean saveOnSelectionChange)
    {
       final Script s = library.get( saveOnSelectionChange ? previousSelection : scriptCombo.getSelectionIndex());
-      new ConsoleJob("Update script", this, Activator.PLUGIN_ID, null) {
+      new ConsoleJob(Messages.get().ScriptExecutor_JobName_Update, this, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
@@ -557,7 +557,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
          @Override
          protected String getErrorMessage()
          {
-            return "Not possible to save script";
+            return Messages.get().ScriptExecutor_JobError_Update;
          }
       }.start();
    }
@@ -631,8 +631,8 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       }
       catch(Exception e)
       {
-         MessageDialogHelper.openError(getViewSite().getShell(), "Error",
-               "Error while saving script: " + e.getMessage());
+         MessageDialogHelper.openError(getViewSite().getShell(), Messages.get().ScriptExecutor_Error,
+               String.format(Messages.get().ScriptExecutor_SaveError, e.getLocalizedMessage()));
       }
       clearDirtyFlags();
    }
index 4f77018..56961b1 100644 (file)
@@ -19,16 +19,16 @@ import org.eclipse.jface.text.rules.Token;
  */
 public class NXSLDocument extends Document
 {
-       public static final String CONTENT_COMMENTS = "COMMENTS";
-       public static final String CONTENT_STRING = "STRING";
+       public static final String CONTENT_COMMENTS = "COMMENTS"; //$NON-NLS-1$
+       public static final String CONTENT_STRING = "STRING"; //$NON-NLS-1$
        
        public static final String[] NXSL_CONTENT_TYPES = { IDocument.DEFAULT_CONTENT_TYPE, CONTENT_COMMENTS, CONTENT_STRING };
 
        // Document partitioning rules
        private static final IPredicateRule[] NXSL_RULES = {
-               new PatternRule("/*", "*/", new Token(CONTENT_COMMENTS), (char)0, false, false, false),
-               new EndOfLineRule("//", new Token(CONTENT_COMMENTS)),
-               new SingleLineRule("\"", "\"", new Token(CONTENT_STRING), '\\', true, false),
+               new PatternRule("/*", "*/", new Token(CONTENT_COMMENTS), (char)0, false, false, false), //$NON-NLS-1$ //$NON-NLS-2$
+               new EndOfLineRule("//", new Token(CONTENT_COMMENTS)), //$NON-NLS-1$
+               new SingleLineRule("\"", "\"", new Token(CONTENT_STRING), '\\', true, false), //$NON-NLS-1$ //$NON-NLS-2$
                new CodePatternRule(new Token(DEFAULT_CONTENT_TYPE))
        };
        
index 868be59..35fa2b5 100644 (file)
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NXMC Open Street Maps Plug-in
 Bundle-SymbolicName: org.netxms.ui.eclipse.osm;singleton:=true
-Bundle-Version: 1.2.10
+Bundle-Version: 2.0.0
 Bundle-Activator: org.netxms.ui.eclipse.osm.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.netxms.ui.eclipse.console;bundle-version="1.2.10",
- org.netxms.ui.eclipse.objectbrowser;bundle-version="1.2.10"
+ org.netxms.ui.eclipse.console;bundle-version="2.0.0",
+ org.netxms.ui.eclipse.objectbrowser;bundle-version="1.2.17"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.osm.actions,
diff --git a/src/java/netxms-eclipse/OSM/OSGI-INF/l10n/bundle_de.properties b/src/java/netxms-eclipse/OSM/OSGI-INF/l10n/bundle_de.properties
new file mode 100644 (file)
index 0000000..3457a0d
--- /dev/null
@@ -0,0 +1,8 @@
+action.label.Geolocation= Geolocation
+action.label.WorldMap= World Map
+action.tooltip.WorldMap= Open World Map view
+actionSet.label.WorldMap= World Map
+command.description.WorldMap= Open world map view
+command.name.WorldMap= World Map
+view.name.Geolocation= Geolocation
+view.name.WorldMap= World Map
index 2293c98..6a595de 100644 (file)
@@ -9,14 +9,33 @@ public class Messages extends NLS
        public static String AbstractGeolocationView_ZoomOut;
        public static String GeoMapViewer_DownloadError;
        public static String GeoMapViewer_DownloadJob_Title;
+   public static String GeoMapViewer_End;
        public static String GeoMapViewer_LoadMissingJob_Title;
-       public static String LocationMap_InitError1;
+   public static String GeoMapViewer_Start;
+       public static String HistoryView_CustomTimeFrame;
+   public static String HistoryView_Preset10min;
+   public static String HistoryView_Preset12hours;
+   public static String HistoryView_Preset1day;
+   public static String HistoryView_Preset1hour;
+   public static String HistoryView_Preset1month;
+   public static String HistoryView_Preset1week;
+   public static String HistoryView_Preset1year;
+   public static String HistoryView_Preset2days;
+   public static String HistoryView_Preset2hours;
+   public static String HistoryView_Preset30min;
+   public static String HistoryView_Preset4hours;
+   public static String HistoryView_Preset5days;
+   public static String HistoryView_Presets;
+   public static String LocationMap_InitError1;
        public static String LocationMap_InitError2;
        public static String LocationMap_PartNamePrefix;
-       public static String OpenLocationMap_Error;
+       public static String OpenHistoryMap_CannotOpenView;
+   public static String OpenHistoryMap_Error;
+   public static String OpenLocationMap_Error;
        public static String OpenLocationMap_ErrorText;
        public static String OpenWorldMap_Error;
        public static String OpenWorldMap_ErrorText;
+   public static String TimeSelectionDialog_Title;
        public static String WorldMap_JobError;
        public static String WorldMap_JobTitle;
        public static String WorldMap_PlaceObject;
index ba8a5eb..a431140 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2011 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,11 +28,12 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.netxms.base.GeoLocation;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.osm.Messages;
 import org.netxms.ui.eclipse.osm.views.HistoryView;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
 /**
- * Object action: open geolocation view
+ * Object action: open geolocation history view
  */
 public class OpenHistoryMap implements IObjectActionDelegate
 {
@@ -54,16 +55,15 @@ public class OpenHistoryMap implements IObjectActionDelegate
        @Override
        public void run(IAction action)
        {
-               if(window != null)
+               if (window != null)
                {       
-                  //Open dialog
                        try 
                        {
                                window.getActivePage().showView(HistoryView.ID, Long.toString(object.getObjectId()), IWorkbenchPage.VIEW_ACTIVATE);
                        } 
                        catch (PartInitException e) 
                        {
-                               MessageDialogHelper.openError(window.getShell(), "Error while opening historical map", "Error while opening historical map: " + e.getMessage());
+                               MessageDialogHelper.openError(window.getShell(), Messages.get().OpenHistoryMap_Error, String.format(Messages.get().OpenHistoryMap_CannotOpenView, e.getMessage()));
                        }
                }
        }
index 7c549a8..d38cfac 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2011 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.netxms.client.TimePeriod;
+import org.netxms.ui.eclipse.osm.Messages;
 import org.netxms.ui.eclipse.widgets.TimePeriodSelector;
 
 public class TimeSelectionDialog extends Dialog
@@ -45,7 +46,7 @@ public class TimeSelectionDialog extends Dialog
    protected void configureShell(Shell newShell)
    {
       super.configureShell(newShell);
-      newShell.setText("Set time");  
+      newShell.setText(Messages.get().TimeSelectionDialog_Title);  
    }
    
    /* (non-Javadoc)
index 9aab130..505921e 100644 (file)
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=Zoom &in
 AbstractGeolocationView_ZoomOut=Zoom &out
 GeoMapViewer_DownloadError=Cannot download map image
 GeoMapViewer_DownloadJob_Title=Download map image
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=Load missing map tiles
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=Cannot initialize geolocation view: internal error
 LocationMap_InitError2=Cannot initialize geolocation view: object not found
 LocationMap_PartNamePrefix=Geolocation - 
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=Error
 OpenLocationMap_ErrorText=Error opening view: 
 OpenWorldMap_Error=Error
 OpenWorldMap_ErrorText=Error opening view: 
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=Cannot update object's geolocation
 WorldMap_JobTitle=Update object's geolocation
 WorldMap_PlaceObject=Place object here...
index a93d8ac..22909dd 100644 (file)
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=P\u0159ibl\u00ED\u017Eit
 AbstractGeolocationView_ZoomOut=Odd\u00E1lit
 GeoMapViewer_DownloadError=Nelze st\u00E1hnout obr\u00E1zek mapy
 GeoMapViewer_DownloadJob_Title=St\u00E1hnout obr\u00E1zek mapy
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=Na\u010D\u00EDst chyb\u011Bj\u00EDc\u00ED mapov\u00E9 dla\u017Edice
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=Nelze inicializovat geolokaci\: intern\u00ED chyba
 LocationMap_InitError2=Nelze inicializovat geolokaci\: objekt nenalezen
 LocationMap_PartNamePrefix=Geolokace -
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=Chyba
 OpenLocationMap_ErrorText=Chyba p\u0159i otev\u00EDr\u00E1n\u00ED\:
 OpenWorldMap_Error=Chyba
 OpenWorldMap_ErrorText=Chyba p\u0159i otev\u00EDr\u00E1n\u00ED\:
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=Nelze aktualizovat geolokaci objektu
 WorldMap_JobTitle=Aktualizovat geolokaci objektu
 WorldMap_PlaceObject=Objekt um\u00EDstit zde...
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=Zoom &in
 AbstractGeolocationView_ZoomOut=Zoom &out
 GeoMapViewer_DownloadError=Cannot download map image
 GeoMapViewer_DownloadJob_Title=Download map image
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=Load missing map tiles
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=Cannot initialize geolocation view: internal error
 LocationMap_InitError2=Cannot initialize geolocation view: object not found
 LocationMap_PartNamePrefix=Geolocation - 
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=Error
 OpenLocationMap_ErrorText=Error opening view: 
 OpenWorldMap_Error=Error
 OpenWorldMap_ErrorText=Error opening view: 
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=Cannot update object's geolocation
 WorldMap_JobTitle=Update object's geolocation
 WorldMap_PlaceObject=Place object here...
index 281ef28..abce61b 100644 (file)
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=&Aumentar
 AbstractGeolocationView_ZoomOut=&Reducir
 GeoMapViewer_DownloadError=No es posible descargar la imagen del mapa
 GeoMapViewer_DownloadJob_Title=Descargar imagen del mapa
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=Cargar los mosaicos que faltan del mapa
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=No es posible mostrar la vista de localizaci\u00f3n geogr\u00e1fica: error interno
 LocationMap_InitError2=No es posible mostrar la vista de localizaci\u00f3n geogr\u00e1fica: objeto no encontrado
 LocationMap_PartNamePrefix=localizaci\u00f3n geogr\u00e1fica - 
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=Error
 OpenLocationMap_ErrorText=Error al abrir la vista: 
 OpenWorldMap_Error=Error
 OpenWorldMap_ErrorText=Error al abrir la vista: 
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=No es posible actualizar la localizaci\u00f3n geogr\u00e1fica del objecto
 WorldMap_JobTitle=Actualizar localizaci\u00f3n geogr\u00e1fica del objecto
 WorldMap_PlaceObject=Situar el objeto aqu\u00ed...
index e94b32c..3b55789 100644 (file)
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=\u0423&\u0432\u0435\u043b\u0438\u0447\u0438\u0442
 AbstractGeolocationView_ZoomOut=\u0423&\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c
 GeoMapViewer_DownloadError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u043a\u0430\u0440\u0442\u044b
 GeoMapViewer_DownloadJob_Title=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u043a\u0430\u0440\u0442\u044b
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0445 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432 \u043f\u043b\u0438\u0442\u043e\u043a
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=\u041e\u0448\u0438\u0431\u043a\u0430 \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u043a\u0430\u0440\u0442\u044b: \u0432\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u044f\u044f \u043e\u0448\u0438\u0431\u043a\u0430
 LocationMap_InitError2=\u041e\u0448\u0438\u0431\u043a\u0430 \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u043a\u0430\u0440\u0442\u044b: \u043e\u0431\u044a\u0435\u043a\u0442 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d
 LocationMap_PartNamePrefix=\u0413\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 - 
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=\u041e\u0448\u0438\u0431\u043a\u0430
 OpenLocationMap_ErrorText=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f: 
 OpenWorldMap_Error=\u041e\u0448\u0438\u0431\u043a\u0430
 OpenWorldMap_ErrorText=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f: 
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432
 WorldMap_JobTitle=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432
 WorldMap_PlaceObject=\u0420\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0438\u0442\u044c \u043e\u0431\u044a\u0435\u043a\u0442 \u0437\u0434\u0435\u0441\u044c...
index 9aab130..505921e 100644 (file)
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=Zoom &in
 AbstractGeolocationView_ZoomOut=Zoom &out
 GeoMapViewer_DownloadError=Cannot download map image
 GeoMapViewer_DownloadJob_Title=Download map image
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=Load missing map tiles
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=Cannot initialize geolocation view: internal error
 LocationMap_InitError2=Cannot initialize geolocation view: object not found
 LocationMap_PartNamePrefix=Geolocation - 
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=Error
 OpenLocationMap_ErrorText=Error opening view: 
 OpenWorldMap_Error=Error
 OpenWorldMap_ErrorText=Error opening view: 
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=Cannot update object's geolocation
 WorldMap_JobTitle=Update object's geolocation
 WorldMap_PlaceObject=Place object here...
index 51512b5..4d19768 100644 (file)
@@ -58,8 +58,8 @@ public class HistoryView extends ViewPart
       GraphSettings.TIME_UNIT_DAY, GraphSettings.TIME_UNIT_DAY };
    private static final int[] presetRanges = { 10, 30, 1, 2, 4, 12, 1, 2, 5, 7, 31, 365 };
    private static final String[] presetNames = 
-      { "10 minutes", "30 minutes", "1 hour", "2 hours", "4 hours", "12 hours", "Today",
-        "Last 2 days", "Last 5 days", "This week", "This month","This Year" };
+      { Messages.get().HistoryView_Preset10min, Messages.get().HistoryView_Preset30min, Messages.get().HistoryView_Preset1hour, Messages.get().HistoryView_Preset2hours, Messages.get().HistoryView_Preset4hours, Messages.get().HistoryView_Preset12hours, Messages.get().HistoryView_Preset1day,
+        Messages.get().HistoryView_Preset2days, Messages.get().HistoryView_Preset5days, Messages.get().HistoryView_Preset1week, Messages.get().HistoryView_Preset1month,Messages.get().HistoryView_Preset1year };
 
        
        protected GeoMapViewer map;
@@ -198,7 +198,7 @@ public class HistoryView extends ViewPart
          };
       }
       
-      setConfigurableTime = new Action("Set time frame"
+      setConfigurableTime = new Action(Messages.get().HistoryView_CustomTimeFrame
       {
          @Override
          public void run()
@@ -229,7 +229,7 @@ public class HistoryView extends ViewPart
         */
        protected void fillLocalPullDown(IMenuManager manager)
        {
-          MenuManager presets = new MenuManager("&Presets");
+          MenuManager presets = new MenuManager(Messages.get().HistoryView_Presets);
       for(int i = 0; i < presetActions.length; i++)
          presets.add(presetActions[i]);
       
@@ -280,7 +280,7 @@ public class HistoryView extends ViewPart
         */
        protected void fillContextMenu(final IMenuManager manager)
        {
-          MenuManager presets = new MenuManager("&Presets");
+          MenuManager presets = new MenuManager(Messages.get().HistoryView_Presets);
       for(int i = 0; i < presetActions.length; i++)
          presets.add(presetActions[i]);
       
index e33bd98..027716c 100644 (file)
@@ -80,7 +80,7 @@ public class GeoMapViewer extends Canvas implements PaintListener, GeoLocationCa
 {
    private static final int START = 1;
    private static final int END = 2;
-   private static final String pointInformation[] = {"Start","End"};
+   private static final String pointInformation[] = {Messages.get().GeoMapViewer_Start, Messages.get().GeoMapViewer_End};
    
        private static final Color MAP_BACKGROUND = new Color(Display.getCurrent(), 255, 255, 255);
    private static final Color INFO_BLOCK_BACKGROUND = new Color(Display.getCurrent(), 0, 0, 0);
@@ -142,8 +142,8 @@ public class GeoMapViewer extends Canvas implements PaintListener, GeoLocationCa
                   this.historyObject = historyObject;             
                }
                
-               imageZoomIn = Activator.getImageDescriptor("icons/map_zoom_in.png").createImage();
-      imageZoomOut = Activator.getImageDescriptor("icons/map_zoom_out.png").createImage();
+               imageZoomIn = Activator.getImageDescriptor("icons/map_zoom_in.png").createImage(); //$NON-NLS-1$
+      imageZoomOut = Activator.getImageDescriptor("icons/map_zoom_out.png").createImage(); //$NON-NLS-1$
 
                labelProvider = WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider();
                mapLoader = new MapLoader(getDisplay());
@@ -530,7 +530,7 @@ public class GeoMapViewer extends Canvas implements PaintListener, GeoLocationCa
                {
                   color = SWT.COLOR_GREEN;
                   DateFormat df = RegionalSettings.getDateTimeFormat();
-                  toolTip.setText(String.format("%s\r\n%s - %s", 
+                  toolTip.setText(String.format("%s\r\n%s - %s",  //$NON-NLS-1$
                         history.get(i), df.format(history.get(i).getTimestamp()), df.format(history.get(i).getEndTimestamp())));
                   toolTip.setVisible(true);
                }
@@ -1058,11 +1058,11 @@ public class GeoMapViewer extends Canvas implements PaintListener, GeoLocationCa
         */
        private void updateHistory()
        {
+       final NXCSession session = (NXCSession)ConsoleSharedData.getSession();
           ConsoleJob job = new ConsoleJob(Messages.get().GeoMapViewer_DownloadJob_Title, viewPart, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
-            NXCSession session = (NXCSession)ConsoleSharedData.getSession();
             history = session.getLocationHistory(historyObject.getObjectId(), timePeriod.getPeriodStart(), timePeriod.getPeriodEnd());
             for(int i = 0; i < history.size(); i++)
                locationTree.insert(history.get(i).getLatitude(), history.get(i).getLongitude(), history.get(i));
diff --git a/src/java/netxms-eclipse/ObjectTools/OSGI-INF/l10n/bundle_de.properties b/src/java/netxms-eclipse/ObjectTools/OSGI-INF/l10n/bundle_de.properties
new file mode 100644 (file)
index 0000000..d75e6a4
--- /dev/null
@@ -0,0 +1,19 @@
+action.label.ObjectTools= Object Tools
+actionSet.label.ObjectTools= Object Tools Configuration
+command.description.Copy= Copy
+command.description.ObjectTools= Open object tools editor
+command.description.SelectAll= Select all
+command.description.Terminate= Terminate running external command
+command.name.Copy= Copy
+command.name.ObjectTools= Object Tools
+command.name.SelectAll= Select all
+command.name.Terminate= Terminate
+page.name.AccessControl= Access Control
+page.name.Columns= Columns
+page.name.Filter= Filter
+page.name.General= General
+view.name.FileViewer= File Viewer
+view.name.LocalCommand= Local Command
+view.name.ObjectTools= Object Tools
+view.name.TableResults= Table Tool Results
+view.name.WebBrowser= Web Browser
index 13b43fa..4e9aca3 100644 (file)
@@ -50,16 +50,25 @@ public class Messages extends NLS
    public static String Filter_OIDShouldMatch;
    public static String Filter_SNMPNeeded;
    public static String General_AgentAction;
+   public static String General_AllFiles;
+   public static String General_CannotLoadImage;
+   public static String General_Clear;
    public static String General_Command;
+   public static String General_CommandName;
+   public static String General_CommandShortName;
    public static String General_Confirmation;
    public static String General_ConfirmationMessage;
    public static String General_Description;
    public static String General_DisableObjectToll;
+   public static String General_Error;
    public static String General_ExecOptions;
    public static String General_FileOptions;
    public static String General_FirstColumnValue;
    public static String General_FollowFileChanges;
    public static String General_GeneratesOutput;
+   public static String General_Icon;
+   public static String General_ImageFiles;
+   public static String General_ImageTooLarge;
    public static String General_LimitDownloadFileSizeLable;
    public static String General_Name;
    public static String General_OIDSuffix;
@@ -68,6 +77,9 @@ public class Messages extends NLS
    public static String General_RegExp;
    public static String General_RemoteFileName;
    public static String General_RequiresConfirmation;
+   public static String General_Select;
+   public static String General_ShowInCommands;
+   public static String General_ShowInCommandsTooltip;
    public static String General_SNMPTableOptions;
    public static String General_Title;
    public static String General_URL;
@@ -144,6 +156,8 @@ public class Messages extends NLS
    public static String ToolColumnLabelProvider_FmtIpAddr;
    public static String ToolColumnLabelProvider_FmtMacAddr;
    public static String ToolColumnLabelProvider_FmtString;
+   public static String WakeupToolHandler_JobError;
+   public static String WakeupToolHandler_JobName;
    static
    {
       // initialize resource bundle
index 18cc75d..b870ac4 100644 (file)
@@ -130,7 +130,7 @@ public class ObjectToolsDynamicMenu extends ContributionItem implements IWorkben
                                Menu rootMenu = toolsMenu;
                                for(int j = 0; j < path.length - 1; j++)
                                {
-               final String key = rootMenu.hashCode() + "@" + path[j].replace("&", ""); //$NON-NLS-1$ //$NON-NLS-2$
+               final String key = rootMenu.hashCode() + "@" + path[j].replace("&", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                                        Menu currMenu = menus.get(key);
                                        if (currMenu == null)
                                        {
index af42a7d..932bf68 100644 (file)
@@ -47,7 +47,7 @@ public class WakeupToolHandler implements ObjectToolHandler
    public void execute(final AbstractNode node, ObjectTool tool)
    {
       final NXCSession session = (NXCSession)ConsoleSharedData.getSession();
-      new ConsoleJob("Wakeup node", null, Activator.PLUGIN_ID, null) {
+      new ConsoleJob(Messages.get().WakeupToolHandler_JobName, null, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
@@ -57,7 +57,7 @@ public class WakeupToolHandler implements ObjectToolHandler
          @Override
          protected String getErrorMessage()
          {
-            return "Cannot send wake-on-LAN packet to node";
+            return Messages.get().WakeupToolHandler_JobError;
          }
       }.start();
    }
index 8aee926..0440cab 100644 (file)
@@ -158,14 +158,14 @@ public class ObjectToolsCache
                }
                catch(Exception e)
                {
-                  Activator.logError("Exception in ObjectToolsCache.reload()", e);
+                  Activator.logError("Exception in ObjectToolsCache.reload()", e); //$NON-NLS-1$
                }
             }
          }
                }
                catch(Exception e)
                {
-                  Activator.logError("Exception in ObjectToolsCache.reload()", e);
+                  Activator.logError("Exception in ObjectToolsCache.reload()", e); //$NON-NLS-1$
                }
        }
        
index 27c6ebf..ffa272f 100644 (file)
@@ -43,16 +43,25 @@ Filter_AgentNeeded=NetXMS agent should be available
 Filter_OIDShouldMatch=Node SNMP OID should match with the following template:
 Filter_SNMPNeeded=Node should support SNMP
 General_AgentAction=Agent's action
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=Command
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=Confirmation
 General_ConfirmationMessage=Confirmation message
 General_Description=Description
 General_DisableObjectToll=Disable Object Tool
+General_Error=Error
 General_ExecOptions=Execution options
 General_FileOptions=File Options
 General_FirstColumnValue=&Value of first column
 General_FollowFileChanges=Follow file changes
 General_GeneratesOutput=Command generates output
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=Limit initial download size (in bytes, 0 for unlimited)
 General_Name=Name
 General_OIDSuffix=&OID suffix of first column
@@ -61,6 +70,9 @@ General_Parameter=Parameter
 General_RegExp=Regular expression
 General_RemoteFileName=Remote file name
 General_RequiresConfirmation=This tool requires confirmation before execution
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_SNMPTableOptions=SNMP Table Options
 General_Title=Title
 General_URL=URL
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=Integer
 ToolColumnLabelProvider_FmtIpAddr=IP Address
 ToolColumnLabelProvider_FmtMacAddr=MAC Address
 ToolColumnLabelProvider_FmtString=String
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
index e11d191..d52a9da 100644 (file)
@@ -43,16 +43,25 @@ Filter_AgentNeeded=NetXMS agent by m\u011Bl b\u00FDt dostupn\u00FD
 Filter_OIDShouldMatch=SNMP OID prvku by m\u011Bl souhlasit s n\u00E1sleduj\u00EDc\u00ED \u0161ablonou\:
 Filter_SNMPNeeded=Prvek by m\u011Bl podporovat SNMP
 General_AgentAction=Akce agenta
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=P\u0159\u00EDkaz
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=Potvrzen\u00ED
 General_ConfirmationMessage=Potvrzovac\u00ED zpr\u00E1va
 General_Description=Popis
 General_DisableObjectToll=Disable Object Tool
+General_Error=Error
 General_ExecOptions=Mo\u017Enosti spu\u0161t\u011Bn\u00ED
 General_FileOptions=File Options
 General_FirstColumnValue=&Hodnota prvn\u00EDho sloupce
 General_FollowFileChanges=Follow file changes
 General_GeneratesOutput=P\u0159\u00EDkaz generuj\u00EDc\u00ED v\u00FDstup
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=Limit initial download size (in bytes, 0 for unlimited)
 General_Name=N\u00E1zev
 General_OIDSuffix=&OID p\u0159\u00EDpona prvn\u00EDho sloupce
@@ -62,6 +71,9 @@ General_RegExp=Regul\u00E1rn\u00ED v\u00FDraz
 General_RemoteFileName=N\u00E1zev vzd\u00E1len\u00E9ho souboru
 General_RequiresConfirmation=Tento n\u00E1stroj pot\u0159ebuje potvrzen\u00ED p\u0159ed spu\u0161t\u011Bn\u00EDm
 General_SNMPTableOptions=Mo\u017Enosti SNMP tabulky
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_Title=N\u00E1zev
 General_URL=URL
 General_UseAsIndex=Pou\u017E\u00EDt jako index pro druhou a n\u00E1sleduj\u00EDc\u00ED sloupce
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=Integer
 ToolColumnLabelProvider_FmtIpAddr=IP adresa
 ToolColumnLabelProvider_FmtMacAddr=MAC adresa
 ToolColumnLabelProvider_FmtString=String
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
@@ -43,16 +43,25 @@ Filter_AgentNeeded=NetXMS agent should be available
 Filter_OIDShouldMatch=Node SNMP OID should match with the following template:
 Filter_SNMPNeeded=Node should support SNMP
 General_AgentAction=Agent's action
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=Command
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=Confirmation
 General_ConfirmationMessage=Confirmation message
 General_Description=Description
 General_DisableObjectToll=Disable Object Tool
+General_Error=Error
 General_ExecOptions=Execution options
 General_FileOptions=File Options
 General_FirstColumnValue=&Value of first column
 General_FollowFileChanges=Follow file changes
 General_GeneratesOutput=Command generates output
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=Limit initial download size (in bytes, 0 for unlimited)
 General_Name=Name
 General_OIDSuffix=&OID suffix of first column
@@ -62,6 +71,9 @@ General_RegExp=Regular expression
 General_RemoteFileName=Remote file name
 General_RequiresConfirmation=This tool requires confirmation before execution
 General_SNMPTableOptions=SNMP Table Options
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_Title=Title
 General_URL=URL
 General_UseAsIndex=Use as index for second and subsequent columns:
@@ -106,8 +118,8 @@ ObjectToolsEditor_Disable=Disable
 ObjectToolsEditor_DisableObjTool=DisableObject Tool
 ObjectToolsEditor_Enable=Enable
 ObjectToolsEditor_EnableObjTool=Enable Object Tool
-ObjectToolsEditor_ErrorDisablingObjectTools=It is not possible to disable this object tool.
 ObjectToolsEditor_ErrorDisablingObjTools=It is not possible to enable this object tool.
+ObjectToolsEditor_ErrorDisablingObjectTools=It is not possible to disable this object tool.
 ObjectToolsEditor_JobDelete=Delete objecttools
 ObjectToolsEditor_JobDeleteError=Cannot delete object tool
 ObjectToolsEditor_JobGetConfig=Get object tools configuration
@@ -122,8 +134,8 @@ ObjectToolsLabelProvider_TypeAgentTable=Agent Table
 ObjectToolsLabelProvider_TypeDownloadFile=Download File
 ObjectToolsLabelProvider_TypeInternal=Internal
 ObjectToolsLabelProvider_TypeLocalCmd=Local Command
-ObjectToolsLabelProvider_TypeServerCmd=Server Command
 ObjectToolsLabelProvider_TypeSNMPTable=SNMP Table
+ObjectToolsLabelProvider_TypeServerCmd=Server Command
 ObjectToolsLabelProvider_TypeURL=URL
 OpenObjectToolsEditor_Error=Error
 OpenObjectToolsEditor_ErrorOpenView=Error opening view: 
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=Integer
 ToolColumnLabelProvider_FmtIpAddr=IP Address
 ToolColumnLabelProvider_FmtMacAddr=MAC Address
 ToolColumnLabelProvider_FmtString=String
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
index 4adf0e5..25914f2 100644 (file)
@@ -43,16 +43,25 @@ Filter_AgentNeeded=NetXMS agent should be available
 Filter_OIDShouldMatch=Node SNMP OID should match with the following template:
 Filter_SNMPNeeded=Node should support SNMP
 General_AgentAction=Agent's action
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=Command
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=Confirmation
 General_ConfirmationMessage=Confirmation message
 General_Description=Description
 General_DisableObjectToll=Disable Object Tool
+General_Error=Error
 General_ExecOptions=Execution options
 General_FileOptions=File Options
 General_FirstColumnValue=&Value of first column
 General_FollowFileChanges=Follow file changes
 General_GeneratesOutput=Command generates output
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=Limit initial download size (in bytes, 0 for unlimited)
 General_Name=Name
 General_OIDSuffix=&OID suffix of first column
@@ -62,6 +71,9 @@ General_RegExp=Regular expression
 General_RemoteFileName=Remote file name
 General_RequiresConfirmation=This tool requires confirmation before execution
 General_SNMPTableOptions=SNMP Table Options
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_Title=Title
 General_URL=URL
 General_UseAsIndex=Use as index for second and subsequent columns:
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=Integer
 ToolColumnLabelProvider_FmtIpAddr=IP Address
 ToolColumnLabelProvider_FmtMacAddr=MAC Address
 ToolColumnLabelProvider_FmtString=String
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
index 0f6c0ea..f14b46b 100644 (file)
@@ -43,16 +43,25 @@ Filter_AgentNeeded=\u0410\u0433\u0435\u043d\u0442 NetXMS \u0434\u043e\u043b\u043
 Filter_OIDShouldMatch=\u0423\u0437\u0435\u043b \u0434\u043e\u043b\u0436\u0435\u043d \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u044c SNMP OID, \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c\u0443 \u0448\u0430\u0431\u043b\u043e\u043d\u0443:
 Filter_SNMPNeeded=\u0423\u0437\u0435\u043b \u0434\u043e\u043b\u0436\u0435\u043d \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u044c SNMP
 General_AgentAction=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0430\u0433\u0435\u043d\u0442\u0430
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=\u041a\u043e\u043c\u043c\u0430\u043d\u0434\u0430
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
 General_ConfirmationMessage=\u0422\u0435\u043a\u0441\u0442 \u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f
 General_Description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
 General_DisableObjectToll=\u041e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442
+General_Error=Error
 General_ExecOptions=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f
 General_FileOptions=\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0444\u0430\u043b\u0439\u0430
 General_FirstColumnValue=&\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u043f\u0435\u0440\u0432\u043e\u0433\u043e \u0441\u0442\u043e\u043b\u0431\u0446\u0430
 General_FollowFileChanges=\u041e\u0442\u0441\u043b\u0435\u0436\u0438\u0432\u0430\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0444\u0430\u043b\u0430
 General_GeneratesOutput=\u041a\u043e\u043c\u0430\u043d\u0434\u0430 \u0433\u0435\u043d\u0435\u0440\u0438\u0440\u0443\u0435\u0442 \u0432\u044b\u0432\u043e\u0434
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u044b\u0439 \u0440\u0430\u0437\u043c\u0435\u0440 \u0444\u0430\u0439\u043b\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 (\u0431\u0430\u0439\u0442, 0 - \u043d\u0435 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043e)
 General_Name=\u0418\u043c\u044f
 General_OIDSuffix=\u0421\u0443\u0444\u0444\u0438\u043a\u0441 &OID \u043f\u0435\u0440\u0432\u043e\u0433\u043e \u0441\u0442\u043e\u043b\u0431\u0446\u0430
@@ -62,6 +71,9 @@ General_RegExp=\u0420\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u04
 General_RemoteFileName=\u0418\u043c\u044f \u0443\u0434\u0430\u043b\u0435\u043d\u043d\u043e\u0433\u043e \u0444\u0430\u0439\u043b\u0430
 General_RequiresConfirmation=\u0414\u043b\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
 General_SNMPTableOptions=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0442\u0430\u0431\u043b\u0438\u0446\u044b SNMP
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_Title=\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a
 General_URL=URL
 General_UseAsIndex=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043a\u0430\u043a \u0438\u043d\u0434\u0435\u043a\u0441 \u0434\u043b\u044f \u0432\u0442\u043e\u0440\u043e\u0433\u043e \u0438 \u043f\u043e\u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0445 \u0441\u0442\u043e\u043b\u0431\u0446\u043e\u0432:
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=\u0426\u0435\u043b\u043e\u0435 \u0447\u0438\u
 ToolColumnLabelProvider_FmtIpAddr=IP \u0430\u0434\u0440\u0435\u0441
 ToolColumnLabelProvider_FmtMacAddr=MAC \u0430\u0434\u0440\u0435\u0441
 ToolColumnLabelProvider_FmtString=\u0421\u0442\u0440\u043e\u043a\u0430
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
index 4adf0e5..25914f2 100644 (file)
@@ -43,16 +43,25 @@ Filter_AgentNeeded=NetXMS agent should be available
 Filter_OIDShouldMatch=Node SNMP OID should match with the following template:
 Filter_SNMPNeeded=Node should support SNMP
 General_AgentAction=Agent's action
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=Command
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=Confirmation
 General_ConfirmationMessage=Confirmation message
 General_Description=Description
 General_DisableObjectToll=Disable Object Tool
+General_Error=Error
 General_ExecOptions=Execution options
 General_FileOptions=File Options
 General_FirstColumnValue=&Value of first column
 General_FollowFileChanges=Follow file changes
 General_GeneratesOutput=Command generates output
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=Limit initial download size (in bytes, 0 for unlimited)
 General_Name=Name
 General_OIDSuffix=&OID suffix of first column
@@ -62,6 +71,9 @@ General_RegExp=Regular expression
 General_RemoteFileName=Remote file name
 General_RequiresConfirmation=This tool requires confirmation before execution
 General_SNMPTableOptions=SNMP Table Options
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_Title=Title
 General_URL=URL
 General_UseAsIndex=Use as index for second and subsequent columns:
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=Integer
 ToolColumnLabelProvider_FmtIpAddr=IP Address
 ToolColumnLabelProvider_FmtMacAddr=MAC Address
 ToolColumnLabelProvider_FmtString=String
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
index 7109a28..ca312f4 100644 (file)
@@ -277,7 +277,7 @@ public class General extends PropertyPage
                textConfirmation.setEnabled(checkConfirmation.getSelection());
                
       Group commandGroup = new Group(dialogArea, SWT.NONE);
-      commandGroup.setText("Show in commands");
+      commandGroup.setText(Messages.get().General_ShowInCommands);
       gd = new GridData();
       gd.horizontalAlignment = SWT.FILL;
       gd.grabExcessHorizontalSpace = true;
@@ -289,7 +289,7 @@ public class General extends PropertyPage
       commandGroup.setLayout(layout);
       
       checkCommand = new Button(commandGroup, SWT.CHECK);
-      checkCommand.setText("Show this tool in node commands");
+      checkCommand.setText(Messages.get().General_ShowInCommandsTooltip);
       checkCommand.setSelection((objectTool.getFlags() & ObjectTool.SHOW_IN_COMMANDS) != 0);
       checkCommand.addSelectionListener(new SelectionListener() {
          @Override
@@ -314,7 +314,7 @@ public class General extends PropertyPage
       checkCommand.setLayoutData(gd);
       
       textCommandName = new LabeledText(commandGroup, SWT.NONE);
-      textCommandName.setLabel("Command name");
+      textCommandName.setLabel(Messages.get().General_CommandName);
       gd = new GridData();
       gd.horizontalAlignment = SWT.FILL;
       gd.grabExcessHorizontalSpace = true;
@@ -323,7 +323,7 @@ public class General extends PropertyPage
       textCommandName.setEnabled(checkCommand.getSelection());
                
       textCommandShortName = new LabeledText(commandGroup, SWT.NONE);
-      textCommandShortName.setLabel("Command short name");
+      textCommandShortName.setLabel(Messages.get().General_CommandShortName);
       gd = new GridData();
       gd.horizontalAlignment = SWT.FILL;
       gd.grabExcessHorizontalSpace = true;
@@ -380,7 +380,7 @@ public class General extends PropertyPage
       }
       catch(Exception e)
       {
-         Activator.logError("Exception in General.createIcon()", e);
+         Activator.logError("Exception in General.createIcon()", e); //$NON-NLS-1$
       }
        }
        
@@ -390,7 +390,7 @@ public class General extends PropertyPage
        private void createIconSelector(Composite parent)
        {
           Group group = new Group(parent, SWT.NONE);
-          group.setText("Icon");
+          group.setText(Messages.get().General_Icon);
           group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
           
           GridLayout layout = new GridLayout();
@@ -408,7 +408,7 @@ public class General extends PropertyPage
           
       Button link = new Button(group, SWT.PUSH);
       link.setImage(SharedIcons.IMG_FIND);
-      link.setToolTipText("Select...");
+      link.setToolTipText(Messages.get().General_Select);
       link.addSelectionListener(new SelectionAdapter() {
          @Override
          public void widgetSelected(SelectionEvent e)
@@ -419,7 +419,7 @@ public class General extends PropertyPage
 
       link = new Button(group, SWT.PUSH);
       link.setImage(SharedIcons.IMG_CLEAR);
-      link.setToolTipText("Clear");
+      link.setToolTipText(Messages.get().General_Clear);
       link.addSelectionListener(new SelectionAdapter() {
          @Override
          public void widgetSelected(SelectionEvent e)
@@ -440,8 +440,8 @@ public class General extends PropertyPage
        private void selectIcon()
        {
           FileDialog dlg = new FileDialog(getShell(), SWT.OPEN);
-          dlg.setFilterExtensions(new String[] { "*.gif;*.jpg;*.png", "*.*" });
-      dlg.setFilterNames(new String[] { "Image Files", "All Files" });
+          dlg.setFilterExtensions(new String[] { "*.gif;*.jpg;*.png", "*.*" }); //$NON-NLS-1$ //$NON-NLS-2$
+      dlg.setFilterNames(new String[] { Messages.get().General_ImageFiles, Messages.get().General_AllFiles });
       String fileName = dlg.open();
       if (fileName == null)
          return;
@@ -459,12 +459,12 @@ public class General extends PropertyPage
          else
          {
             image.dispose();
-            MessageDialogHelper.openError(getShell(), "Error", "Select image file is too large");
+            MessageDialogHelper.openError(getShell(), Messages.get().General_Error, Messages.get().General_ImageTooLarge);
          }
       }
       catch(Exception e)
       {
-         MessageDialogHelper.openError(getShell(), "Error", String.format("Cannot load image file: %s", e.getLocalizedMessage()));
+         MessageDialogHelper.openError(getShell(), Messages.get().General_Error, String.format(Messages.get().General_CannotLoadImage, e.getLocalizedMessage()));
       }
        }
 
index ed1ba05..5fa0643 100644 (file)
@@ -176,7 +176,7 @@ public class BrowserView extends ViewPart
         */
        private static String getTitle(String html, String fallback)
        {
-          Pattern p = Pattern.compile("\\<html\\>.*\\<head\\>.*\\<title\\>(.*)\\</title\\>.*", Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
+          Pattern p = Pattern.compile("\\<html\\>.*\\<head\\>.*\\<title\\>(.*)\\</title\\>.*", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
           Matcher m = p.matcher(html);
           if (m.matches())
           {
index 38c480b..c9372df 100644 (file)
@@ -188,7 +188,7 @@ public class LocalCommandResults extends AbstractCommandResults
                                }
                                catch(IOException e)
                                {
-                                  Activator.logError("Exception while running local command", e);
+                                  Activator.logError("Exception while running local command", e); //$NON-NLS-1$
                                }
                                finally
                                {
diff --git a/webui/webapp/NXSL/OSGI-INF/l10n/bundle_de.properties b/webui/webapp/NXSL/OSGI-INF/l10n/bundle_de.properties
new file mode 100644 (file)
index 0000000..3db1951
--- /dev/null
@@ -0,0 +1,7 @@
+action.label.ScriptLibrary= Script Library
+action.tooltip.ScriptLibrary= Open Script Library
+actionSet.label.ScriptLibrary= Script Library
+command.description.ScriptLibrary= Open Script Library
+command.name.ScriptLibrary= Script Library
+view.name.EditScript= Edit Script
+view.name.ScriptLibrary= Script Library
index 21ce96b..4098c2d 100644 (file)
@@ -13,8 +13,17 @@ public class Messages extends NLS
    public String CreateScriptDialog_ScriptName;
    public String CreateScriptDialog_Warning;
    public String CreateScriptDialog_WarningEmptyName;
+   public String ExecuteServerScript_Error;
+   public String ExecuteServerScript_ErrorMessage;
    public String OpenScriptLibrary_Error;
    public String OpenScriptLibrary_ErrorMsg;
+   public String SaveScriptDialog_Cancel;
+   public String SaveScriptDialog_Discard;
+   public String SaveScriptDialog_Message;
+   public String SaveScriptDialog_Save;
+   public String SaveScriptDialog_SaveAs;
+   public String SaveScriptDialog_Title;
+   public String ScriptEditDialog_Title;
    public String ScriptEditorView_Error;
    public String ScriptEditorView_LoadJobError;
    public String ScriptEditorView_LoadJobTitle;
@@ -23,6 +32,27 @@ public class Messages extends NLS
    public String ScriptEditorView_SaveErrorMessage;
    public String ScriptEditorView_SaveJobError;
    public String ScriptEditorView_SaveJobTitle;
+   public String ScriptExecutor_Clear;
+   public String ScriptExecutor_ClearOutput;
+   public String ScriptExecutor_Error;
+   public String ScriptExecutor_Execute;
+   public String ScriptExecutor_JobError_Create;
+   public String ScriptExecutor_JobError_Execute;
+   public String ScriptExecutor_JobError_ReadList;
+   public String ScriptExecutor_JobError_Update;
+   public String ScriptExecutor_JobName_Create;
+   public String ScriptExecutor_JobName_Execute;
+   public String ScriptExecutor_JobName_ReadList;
+   public String ScriptExecutor_JobName_Update;
+   public String ScriptExecutor_LibScript;
+   public String ScriptExecutor_Noname;
+   public String ScriptExecutor_Output;
+   public String ScriptExecutor_PartName;
+   public String ScriptExecutor_Reload;
+   public String ScriptExecutor_Save;
+   public String ScriptExecutor_SaveAs;
+   public String ScriptExecutor_SaveError;
+   public String ScriptExecutor_Source;
    public String ScriptLibrary_ColumnId;
    public String ScriptLibrary_ColumnName;
    public String ScriptLibrary_Confirmation;
index 4e849cd..3b3b538 100644 (file)
@@ -28,6 +28,7 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.nxsl.Messages;
 import org.netxms.ui.eclipse.nxsl.views.ScriptExecutor;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
@@ -57,7 +58,7 @@ public class ExecuteServerScript extends AbstractHandler
       }
       catch(PartInitException e)
       {
-         MessageDialogHelper.openError(window.getShell(), "Error", String.format("Error opening script execution view: %s", e.getLocalizedMessage()));
+         MessageDialogHelper.openError(window.getShell(), Messages.get().ExecuteServerScript_Error, String.format(Messages.get().ExecuteServerScript_ErrorMessage, e.getLocalizedMessage()));
       }
       return null;
    }
index ee8c133..d2d5ccb 100644 (file)
@@ -29,6 +29,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.netxms.ui.eclipse.nxsl.Activator;
+import org.netxms.ui.eclipse.nxsl.Messages;
 import org.netxms.ui.eclipse.tools.WidgetHelper;
 
 /**
@@ -60,7 +61,7 @@ public class SaveScriptDialog extends Dialog
    protected void configureShell(Shell newShell)
    {
       super.configureShell(newShell);
-      newShell.setText("Unsaved changes");
+      newShell.setText(Messages.get().SaveScriptDialog_Title);
    }
 
    /*
@@ -71,10 +72,10 @@ public class SaveScriptDialog extends Dialog
    @Override
    protected void createButtonsForButtonBar(Composite parent)
    {
-      createButton(parent, SAVE_ID, "Save", false);
-      createButton(parent, SAVE_AS_ID, "Save as...", false);
-      createButton(parent, DISCARD_ID, "Discard", false);
-      createButton(parent, IDialogConstants.CANCEL_ID, "Cancel", false);
+      createButton(parent, SAVE_ID, Messages.get().SaveScriptDialog_Save, false);
+      createButton(parent, SAVE_AS_ID, Messages.get().SaveScriptDialog_SaveAs, false);
+      createButton(parent, DISCARD_ID, Messages.get().SaveScriptDialog_Discard, false);
+      createButton(parent, IDialogConstants.CANCEL_ID, Messages.get().SaveScriptDialog_Cancel, false);
       
       if (!showSave)
          getButton(SAVE_ID).setEnabled(false);
@@ -101,7 +102,7 @@ public class SaveScriptDialog extends Dialog
       image.setImage(Activator.getImageDescriptor("icons/unsaved_config.png").createImage()); //$NON-NLS-1$
 
       final CLabel text = new CLabel(dialogArea, SWT.LEFT);
-      text.setText("Script source has been modified. Please select one of the following actions:\n\t\"Save\"\t\tSave into currently selected library script\n\t\"Save as...\"\tSave as new library script\n\t\"Discard\"\tDiscard changes\n\t\"Cancel\"\t\tCancel requested operation and return to editing script");
+      text.setText(Messages.get().SaveScriptDialog_Message);
       GridData gd = new GridData();
       gd.grabExcessHorizontalSpace = true;
       gd.horizontalAlignment = SWT.FILL;
index 0f15229..4df50f5 100644 (file)
@@ -24,6 +24,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
+import org.netxms.ui.eclipse.nxsl.Messages;
 import org.netxms.ui.eclipse.nxsl.widgets.ScriptEditor;
 
 /**
@@ -51,7 +52,7 @@ public class ScriptEditDialog extends Dialog
    protected void configureShell(Shell newShell)
    {
       super.configureShell(newShell);
-      newShell.setText("Edit Script");
+      newShell.setText(Messages.get().ScriptEditDialog_Title);
    }
 
    /* (non-Javadoc)
index 9cc2294..3773da2 100644 (file)
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=Rename script
 CreateScriptDialog_ScriptName=Script name
 CreateScriptDialog_Warning=Warning
 CreateScriptDialog_WarningEmptyName=Please enter valid script name
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=Error
 OpenScriptLibrary_ErrorMsg=Error opening view: 
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=Error
 ScriptEditorView_LoadJobError=Cannot load script with ID %d from server
 ScriptEditorView_LoadJobTitle=Loading script [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&Save
 ScriptEditorView_SaveErrorMessage=Cannot save script: %s
 ScriptEditorView_SaveJobError=Cannot save script to database
 ScriptEditorView_SaveJobTitle=Saving script to library
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=ID
 ScriptLibrary_ColumnName=Name
 ScriptLibrary_Confirmation=Confirmation
index 5eb1e64..3283379 100644 (file)
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=P\u0159ejmenovat skript
 CreateScriptDialog_ScriptName=N\u00E1zev skriptu
 CreateScriptDialog_Warning=Varov\u00E1n\u00ED
 CreateScriptDialog_WarningEmptyName=Pros\u00EDm vlo\u017Ete platn\u00FD n\u00E1zev skriptu
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=Chyba
 OpenScriptLibrary_ErrorMsg=Chyba p\u0159i otev\u00EDr\u00E1n\u00ED\:
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=Chyba
 ScriptEditorView_LoadJobError=Ze serveru nelze na\u010D\u00EDst skript s ID %d
 ScriptEditorView_LoadJobTitle=Na\u010D\u00EDt\u00E1n\u00ED skriptu [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&Ulo\u017Eit
 ScriptEditorView_SaveErrorMessage=Nelze ulo\u017Eit skript\: %s
 ScriptEditorView_SaveJobError=Nelze ulo\u017Eit skript do datab\u00E1ze
 ScriptEditorView_SaveJobTitle=Ukl\u00E1d\u00E1n\u00ED skriptu do knihovny
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=ID
 ScriptLibrary_ColumnName=N\u00E1zev
 ScriptLibrary_Confirmation=Potvrzen\u00ED
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=Rename script
 CreateScriptDialog_ScriptName=Script name
 CreateScriptDialog_Warning=Warning
 CreateScriptDialog_WarningEmptyName=Please enter valid script name
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=Error
 OpenScriptLibrary_ErrorMsg=Error opening view: 
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=Error
 ScriptEditorView_LoadJobError=Cannot load script with ID %d from server
 ScriptEditorView_LoadJobTitle=Loading script [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&Save
 ScriptEditorView_SaveErrorMessage=Cannot save script: %s
 ScriptEditorView_SaveJobError=Cannot save script to database
 ScriptEditorView_SaveJobTitle=Saving script to library
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=ID
 ScriptLibrary_ColumnName=Name
 ScriptLibrary_Confirmation=Confirmation
index 9cc2294..3773da2 100644 (file)
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=Rename script
 CreateScriptDialog_ScriptName=Script name
 CreateScriptDialog_Warning=Warning
 CreateScriptDialog_WarningEmptyName=Please enter valid script name
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=Error
 OpenScriptLibrary_ErrorMsg=Error opening view: 
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=Error
 ScriptEditorView_LoadJobError=Cannot load script with ID %d from server
 ScriptEditorView_LoadJobTitle=Loading script [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&Save
 ScriptEditorView_SaveErrorMessage=Cannot save script: %s
 ScriptEditorView_SaveJobError=Cannot save script to database
 ScriptEditorView_SaveJobTitle=Saving script to library
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=ID
 ScriptLibrary_ColumnName=Name
 ScriptLibrary_Confirmation=Confirmation
index 6c30caf..d4f1149 100644 (file)
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e
 CreateScriptDialog_ScriptName=\u0418\u043c\u044f \u0441\u043a\u0440\u0438\u043f\u0442\u0430
 CreateScriptDialog_Warning=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435
 CreateScriptDialog_WarningEmptyName=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0443\u043a\u0430\u0436\u0438\u0442\u0435 \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e\u0435 \u0438\u043c\u044f \u0441\u043a\u0440\u0438\u043f\u0442\u0430
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=\u041e\u0448\u0438\u0431\u043a\u0430
 OpenScriptLibrary_ErrorMsg=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f: 
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=\u041e\u0448\u0438\u0431\u043a\u0430
 ScriptEditorView_LoadJobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0441\u043a\u0440\u0438\u043f\u0442 \u0441 \u043a\u043e\u0434\u043e\u043c %d \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430
 ScriptEditorView_LoadJobTitle=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u043a\u0440\u0438\u043f\u0442\u0430 [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
 ScriptEditorView_SaveErrorMessage=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0441\u043a\u0440\u0438\u043f\u0442: %s
 ScriptEditorView_SaveJobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0441\u043a\u0440\u0438\u043f\u0442 \u0432 \u0431\u0430\u0437\u0435 \u0434\u0430\u043d\u043d\u044b\u0445
 ScriptEditorView_SaveJobTitle=\u0421\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435 \u0441\u043a\u0440\u0438\u043f\u0442\u0430 \u0432 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0435
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=\u041a\u043e\u0434
 ScriptLibrary_ColumnName=\u0418\u043c\u044f
 ScriptLibrary_Confirmation=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
index 9cc2294..3773da2 100644 (file)
@@ -3,8 +3,17 @@ CreateScriptDialog_Rename=Rename script
 CreateScriptDialog_ScriptName=Script name
 CreateScriptDialog_Warning=Warning
 CreateScriptDialog_WarningEmptyName=Please enter valid script name
+ExecuteServerScript_Error=Error
+ExecuteServerScript_ErrorMessage=Error opening script execution view: %s
 OpenScriptLibrary_Error=Error
 OpenScriptLibrary_ErrorMsg=Error opening view: 
+SaveScriptDialog_Cancel=Cancel
+SaveScriptDialog_Discard=&Discard
+SaveScriptDialog_Message=Script source has been modified. Please select one of the following actions:\n\t"Save"\t\tSave into currently selected library script\n\t"Save as..."\tSave as new library script\n\t"Discard"\tDiscard changes\n\t"Cancel"\t\tCancel requested operation and return to editing script
+SaveScriptDialog_Save=&Save
+SaveScriptDialog_SaveAs=Save &as...
+SaveScriptDialog_Title=Unsaved Changes
+ScriptEditDialog_Title=Edit Script
 ScriptEditorView_Error=Error
 ScriptEditorView_LoadJobError=Cannot load script with ID %d from server
 ScriptEditorView_LoadJobTitle=Loading script [%d]
@@ -13,6 +22,27 @@ ScriptEditorView_Save=&Save
 ScriptEditorView_SaveErrorMessage=Cannot save script: %s
 ScriptEditorView_SaveJobError=Cannot save script to database
 ScriptEditorView_SaveJobTitle=Saving script to library
+ScriptExecutor_Clear=Clear source
+ScriptExecutor_ClearOutput=Clear output
+ScriptExecutor_Error=Error
+ScriptExecutor_Execute=E&xecute
+ScriptExecutor_JobError_Create=Cannot create script
+ScriptExecutor_JobError_Execute=Error executing script
+ScriptExecutor_JobError_ReadList=Cannot read script list
+ScriptExecutor_JobError_Update=Cannot update script
+ScriptExecutor_JobName_Create=Create new script
+ScriptExecutor_JobName_Execute=Execute script
+ScriptExecutor_JobName_ReadList=Read script list
+ScriptExecutor_JobName_Update=Update script
+ScriptExecutor_LibScript=Script from library
+ScriptExecutor_Noname=noname
+ScriptExecutor_Output=Output
+ScriptExecutor_PartName=Execute Script - %s
+ScriptExecutor_Reload=Reload script
+ScriptExecutor_Save=&Save
+ScriptExecutor_SaveAs=Save &as...
+ScriptExecutor_SaveError=Cannot save script: %s
+ScriptExecutor_Source=Source
 ScriptLibrary_ColumnId=ID
 ScriptLibrary_ColumnName=Name
 ScriptLibrary_Confirmation=Confirmation
index b806d99..a3b6f13 100644 (file)
@@ -57,6 +57,7 @@ import org.netxms.ui.eclipse.actions.RefreshAction;
 import org.netxms.ui.eclipse.console.resources.SharedIcons;
 import org.netxms.ui.eclipse.jobs.ConsoleJob;
 import org.netxms.ui.eclipse.nxsl.Activator;
+import org.netxms.ui.eclipse.nxsl.Messages;
 import org.netxms.ui.eclipse.nxsl.dialogs.CreateScriptDialog;
 import org.netxms.ui.eclipse.nxsl.dialogs.SaveScriptDialog;
 import org.netxms.ui.eclipse.nxsl.widgets.ScriptEditor;
@@ -106,7 +107,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       objectId = Long.parseLong(site.getSecondaryId());
       scriptLibraryManager = (ScriptLibraryManager)ConsoleSharedData.getSession();
 
-      setPartName("Execute Script - " +session.getObjectName(objectId));
+      setPartName(String.format(Messages.get().ScriptExecutor_PartName, session.getObjectName(objectId)));
    }
 
    /* (non-Javadoc)
@@ -124,14 +125,14 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       formContainer.setLayout(new FillLayout());      
       
       form = toolkit.createForm(formContainer);
-      form.setText("noname");
+      form.setText(Messages.get().ScriptExecutor_Noname);
       
       GridLayout layout = new GridLayout();
       layout.verticalSpacing = 8;
       form.getBody().setLayout(layout);
 
       /**** Script list dropdown ****/
-      scriptCombo = WidgetHelper.createLabeledCombo(form.getBody(), SWT.READ_ONLY, "Script from library", WidgetHelper.DEFAULT_LAYOUT_DATA, toolkit);
+      scriptCombo = WidgetHelper.createLabeledCombo(form.getBody(), SWT.READ_ONLY, Messages.get().ScriptExecutor_LibScript, WidgetHelper.DEFAULT_LAYOUT_DATA, toolkit);
       updateScriptList(null); 
       scriptCombo.addSelectionListener( new SelectionListener() {
          @Override
@@ -170,7 +171,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       layout.marginBottom = 4;
       container.setLayout(layout);
       Section section = toolkit.createSection(container, Section.TITLE_BAR);
-      section.setText("Source");
+      section.setText(Messages.get().ScriptExecutor_Source);
       gridData = new GridData();
       gridData.horizontalAlignment = GridData.FILL;
       gridData.grabExcessHorizontalSpace = true;
@@ -180,7 +181,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       
       scriptEditor = new ScriptEditor(section, SWT.BORDER, SWT.H_SCROLL | SWT.V_SCROLL, 0);
       section.setClient(scriptEditor);
-      scriptEditor.setText("");
+      scriptEditor.setText(""); //$NON-NLS-1$
       scriptEditor.getTextWidget().addModifyListener(new ModifyListener() {
          @Override
          public void modifyText(ModifyEvent e)
@@ -197,7 +198,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       layout.marginTop = 4;
       container.setLayout(layout);
       section = toolkit.createSection(container, Section.TITLE_BAR);
-      section.setText("Output");
+      section.setText(Messages.get().ScriptExecutor_Output);
       gridData = new GridData();
       gridData.horizontalAlignment = GridData.FILL;
       gridData.grabExcessHorizontalSpace = true;
@@ -264,17 +265,17 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
    {
       final IHandlerService handlerService = (IHandlerService)getSite().getService(IHandlerService.class);
       
-      actionSave = new Action("Save", SharedIcons.SAVE) {
+      actionSave = new Action(Messages.get().ScriptExecutor_Save, SharedIcons.SAVE) {
          @Override
          public void run()
          {
-            intermidiateSave(false);
+            intermediateSave(false);
          }
       };
       actionSave.setActionDefinitionId("org.netxms.ui.eclipse.nxsl.commands.save"); //$NON-NLS-1$
       handlerService.activateHandler(actionSave.getActionDefinitionId(), new ActionHandler(actionSave));
       
-      actionSaveAs = new Action("Save as...", SharedIcons.SAVE_AS) {
+      actionSaveAs = new Action(Messages.get().ScriptExecutor_SaveAs, SharedIcons.SAVE_AS) {
          @Override
          public void run()
          {
@@ -284,7 +285,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       actionSaveAs.setActionDefinitionId("org.netxms.ui.eclipse.nxsl.commands.save_as"); //$NON-NLS-1$
       handlerService.activateHandler(actionSaveAs.getActionDefinitionId(), new ActionHandler(actionSaveAs));
       
-      actionClear = new Action("Clear source", SharedIcons.CLEAR) {
+      actionClear = new Action(Messages.get().ScriptExecutor_Clear, SharedIcons.CLEAR) {
          @Override
          public void run()
          {
@@ -295,13 +296,13 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
             }
             scriptCombo.deselectAll();
             scriptCombo.clearSelection();
-            scriptEditor.setText("");
+            scriptEditor.setText(""); //$NON-NLS-1$
             output.clear();
-            form.setText("noname");
+            form.setText(Messages.get().ScriptExecutor_Noname);
          }
       };
 
-      actionClearOutput = new Action("Clear output", SharedIcons.CLEAR_LOG) {
+      actionClearOutput = new Action(Messages.get().ScriptExecutor_ClearOutput, SharedIcons.CLEAR_LOG) {
          @Override
          public void run()
          {
@@ -326,9 +327,9 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
             output.clear();
          }
       };
-      actionReload.setText("Reload script");
+      actionReload.setText(Messages.get().ScriptExecutor_Reload);
       
-      actionExecute = new Action("Execute", SharedIcons.EXECUTE) {
+      actionExecute = new Action(Messages.get().ScriptExecutor_Execute, SharedIcons.EXECUTE) {
          @Override
          public void run()
          {
@@ -350,7 +351,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       switch(rc)
       {
          case SaveScriptDialog.SAVE_ID:
-            intermidiateSave(onSelectionChange);
+            intermediateSave(onSelectionChange);
             break;
          case SaveScriptDialog.SAVE_AS_ID:
             createNewScript(onSelectionChange);
@@ -374,7 +375,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       final CreateScriptDialog dlg = new CreateScriptDialog(getSite().getShell(), null);
       if (dlg.open() == Window.OK)
       {
-         new ConsoleJob("Create new script", this, Activator.PLUGIN_ID, null) {
+         new ConsoleJob(Messages.get().ScriptExecutor_JobName_Create, this, Activator.PLUGIN_ID, null) {
             @Override
             protected void runInternal(IProgressMonitor monitor) throws Exception
             {
@@ -390,7 +391,6 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
                         public void run()
                         {
                            scriptCombo.select(scriptCombo.indexOf(dlg.getName()));
-                           System.out.println("Trying to set newly created item");
                         }
                      };
                      updateScriptList(saveOnSelectionChange ? null : run);
@@ -402,7 +402,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
             @Override
             protected String getErrorMessage()
             {
-               return "Error modifying script";
+               return Messages.get().ScriptExecutor_JobError_Create;
             }
          }.start();
       }
@@ -417,7 +417,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       if (index == -1)
          return;
       
-      new ConsoleJob("Update script content", this, Activator.PLUGIN_ID, null) {
+      new ConsoleJob(Messages.get().ScriptExecutor_JobName_Update, this, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {            
@@ -437,7 +437,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
          @Override
          protected String getErrorMessage()
          {
-            return "Not possible to get script content";
+            return Messages.get().ScriptExecutor_JobError_Update;
          }
       }.start();
    }
@@ -450,7 +450,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       final String script = scriptEditor.getText();
       consoleOutputStream = output.newOutputStream();
       actionExecute.setEnabled(false);
-      new ConsoleJob("Execute script", null, Activator.PLUGIN_ID, null) {
+      new ConsoleJob(Messages.get().ScriptExecutor_JobName_Execute, null, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
@@ -460,7 +460,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
          @Override
          protected String getErrorMessage()
          {
-            return "Error executing script";
+            return Messages.get().ScriptExecutor_JobError_Execute;
          } 
 
          /* (non-Javadoc)
@@ -495,7 +495,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
    {
       final String selection = (scriptCombo.getSelectionIndex() != -1) ? scriptCombo.getItem(scriptCombo.getSelectionIndex()) : null;
             
-      new ConsoleJob("Update script list", this, Activator.PLUGIN_ID, null) {
+      new ConsoleJob(Messages.get().ScriptExecutor_JobName_ReadList, this, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
@@ -528,7 +528,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
          @Override
          protected String getErrorMessage()
          {
-            return "Not possible to get script list";
+            return Messages.get().ScriptExecutor_JobError_ReadList;
          }
       }.start();
    }
@@ -536,10 +536,10 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
    /**
     * Update script
     */
-   public void intermidiateSave(boolean saveOnSelectionChange)
+   public void intermediateSave(boolean saveOnSelectionChange)
    {
       final Script s = library.get( saveOnSelectionChange ? previousSelection : scriptCombo.getSelectionIndex());
-      new ConsoleJob("Update script", this, Activator.PLUGIN_ID, null) {
+      new ConsoleJob(Messages.get().ScriptExecutor_JobName_Update, this, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
@@ -557,7 +557,7 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
          @Override
          protected String getErrorMessage()
          {
-            return "Not possible to save script";
+            return Messages.get().ScriptExecutor_JobError_Update;
          }
       }.start();
    }
@@ -631,8 +631,8 @@ public class ScriptExecutor extends ViewPart implements ISaveablePart2, TextOutp
       }
       catch(Exception e)
       {
-         MessageDialogHelper.openError(getViewSite().getShell(), "Error",
-               "Error while saving script: " + e.getMessage());
+         MessageDialogHelper.openError(getViewSite().getShell(), Messages.get().ScriptExecutor_Error,
+               String.format(Messages.get().ScriptExecutor_SaveError, e.getLocalizedMessage()));
       }
       clearDirtyFlags();
    }
index 35d7894..ddfcabd 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NXMC Open Street Maps Plug-in
 Bundle-SymbolicName: org.netxms.ui.eclipse.osm;singleton:=true
-Bundle-Version: 1.2.10
+Bundle-Version: 2.0.0
 Bundle-Activator: org.netxms.ui.eclipse.osm.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.netxms.ui.eclipse.objectbrowser;bundle-version="1.2.10",
diff --git a/webui/webapp/OSM/OSGI-INF/l10n/bundle_de.properties b/webui/webapp/OSM/OSGI-INF/l10n/bundle_de.properties
new file mode 100644 (file)
index 0000000..3457a0d
--- /dev/null
@@ -0,0 +1,8 @@
+action.label.Geolocation= Geolocation
+action.label.WorldMap= World Map
+action.tooltip.WorldMap= Open World Map view
+actionSet.label.WorldMap= World Map
+command.description.WorldMap= Open world map view
+command.name.WorldMap= World Map
+view.name.Geolocation= Geolocation
+view.name.WorldMap= World Map
index 36b65d3..934b3a1 100644 (file)
@@ -12,14 +12,33 @@ public class Messages extends NLS
        public String AbstractGeolocationView_ZoomOut;
        public String GeoMapViewer_DownloadError;
        public String GeoMapViewer_DownloadJob_Title;
+   public String GeoMapViewer_End;
        public String GeoMapViewer_LoadMissingJob_Title;
-       public String LocationMap_InitError1;
+   public String GeoMapViewer_Start;
+       public String HistoryView_CustomTimeFrame;
+   public String HistoryView_Preset10min;
+   public String HistoryView_Preset12hours;
+   public String HistoryView_Preset1day;
+   public String HistoryView_Preset1hour;
+   public String HistoryView_Preset1month;
+   public String HistoryView_Preset1week;
+   public String HistoryView_Preset1year;
+   public String HistoryView_Preset2days;
+   public String HistoryView_Preset2hours;
+   public String HistoryView_Preset30min;
+   public String HistoryView_Preset4hours;
+   public String HistoryView_Preset5days;
+   public String HistoryView_Presets;
+   public String LocationMap_InitError1;
        public String LocationMap_InitError2;
        public String LocationMap_PartNamePrefix;
-       public String OpenLocationMap_Error;
+       public String OpenHistoryMap_CannotOpenView;
+   public String OpenHistoryMap_Error;
+   public String OpenLocationMap_Error;
        public String OpenLocationMap_ErrorText;
        public String OpenWorldMap_Error;
        public String OpenWorldMap_ErrorText;
+   public String TimeSelectionDialog_Title;
        public String WorldMap_JobError;
        public String WorldMap_JobTitle;
        public String WorldMap_PlaceObject;
index ba8a5eb..a431140 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2011 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,11 +28,12 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.netxms.base.GeoLocation;
 import org.netxms.client.objects.AbstractObject;
+import org.netxms.ui.eclipse.osm.Messages;
 import org.netxms.ui.eclipse.osm.views.HistoryView;
 import org.netxms.ui.eclipse.tools.MessageDialogHelper;
 
 /**
- * Object action: open geolocation view
+ * Object action: open geolocation history view
  */
 public class OpenHistoryMap implements IObjectActionDelegate
 {
@@ -54,16 +55,15 @@ public class OpenHistoryMap implements IObjectActionDelegate
        @Override
        public void run(IAction action)
        {
-               if(window != null)
+               if (window != null)
                {       
-                  //Open dialog
                        try 
                        {
                                window.getActivePage().showView(HistoryView.ID, Long.toString(object.getObjectId()), IWorkbenchPage.VIEW_ACTIVATE);
                        } 
                        catch (PartInitException e) 
                        {
-                               MessageDialogHelper.openError(window.getShell(), "Error while opening historical map", "Error while opening historical map: " + e.getMessage());
+                               MessageDialogHelper.openError(window.getShell(), Messages.get().OpenHistoryMap_Error, String.format(Messages.get().OpenHistoryMap_CannotOpenView, e.getMessage()));
                        }
                }
        }
index 7c549a8..d38cfac 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2011 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.netxms.client.TimePeriod;
+import org.netxms.ui.eclipse.osm.Messages;
 import org.netxms.ui.eclipse.widgets.TimePeriodSelector;
 
 public class TimeSelectionDialog extends Dialog
@@ -45,7 +46,7 @@ public class TimeSelectionDialog extends Dialog
    protected void configureShell(Shell newShell)
    {
       super.configureShell(newShell);
-      newShell.setText("Set time");  
+      newShell.setText(Messages.get().TimeSelectionDialog_Title);  
    }
    
    /* (non-Javadoc)
index 9aab130..505921e 100644 (file)
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=Zoom &in
 AbstractGeolocationView_ZoomOut=Zoom &out
 GeoMapViewer_DownloadError=Cannot download map image
 GeoMapViewer_DownloadJob_Title=Download map image
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=Load missing map tiles
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=Cannot initialize geolocation view: internal error
 LocationMap_InitError2=Cannot initialize geolocation view: object not found
 LocationMap_PartNamePrefix=Geolocation - 
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=Error
 OpenLocationMap_ErrorText=Error opening view: 
 OpenWorldMap_Error=Error
 OpenWorldMap_ErrorText=Error opening view: 
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=Cannot update object's geolocation
 WorldMap_JobTitle=Update object's geolocation
 WorldMap_PlaceObject=Place object here...
index a93d8ac..22909dd 100644 (file)
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=P\u0159ibl\u00ED\u017Eit
 AbstractGeolocationView_ZoomOut=Odd\u00E1lit
 GeoMapViewer_DownloadError=Nelze st\u00E1hnout obr\u00E1zek mapy
 GeoMapViewer_DownloadJob_Title=St\u00E1hnout obr\u00E1zek mapy
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=Na\u010D\u00EDst chyb\u011Bj\u00EDc\u00ED mapov\u00E9 dla\u017Edice
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=Nelze inicializovat geolokaci\: intern\u00ED chyba
 LocationMap_InitError2=Nelze inicializovat geolokaci\: objekt nenalezen
 LocationMap_PartNamePrefix=Geolokace -
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=Chyba
 OpenLocationMap_ErrorText=Chyba p\u0159i otev\u00EDr\u00E1n\u00ED\:
 OpenWorldMap_Error=Chyba
 OpenWorldMap_ErrorText=Chyba p\u0159i otev\u00EDr\u00E1n\u00ED\:
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=Nelze aktualizovat geolokaci objektu
 WorldMap_JobTitle=Aktualizovat geolokaci objektu
 WorldMap_PlaceObject=Objekt um\u00EDstit zde...
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=Zoom &in
 AbstractGeolocationView_ZoomOut=Zoom &out
 GeoMapViewer_DownloadError=Cannot download map image
 GeoMapViewer_DownloadJob_Title=Download map image
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=Load missing map tiles
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=Cannot initialize geolocation view: internal error
 LocationMap_InitError2=Cannot initialize geolocation view: object not found
 LocationMap_PartNamePrefix=Geolocation - 
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=Error
 OpenLocationMap_ErrorText=Error opening view: 
 OpenWorldMap_Error=Error
 OpenWorldMap_ErrorText=Error opening view: 
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=Cannot update object's geolocation
 WorldMap_JobTitle=Update object's geolocation
 WorldMap_PlaceObject=Place object here...
index 281ef28..abce61b 100644 (file)
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=&Aumentar
 AbstractGeolocationView_ZoomOut=&Reducir
 GeoMapViewer_DownloadError=No es posible descargar la imagen del mapa
 GeoMapViewer_DownloadJob_Title=Descargar imagen del mapa
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=Cargar los mosaicos que faltan del mapa
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=No es posible mostrar la vista de localizaci\u00f3n geogr\u00e1fica: error interno
 LocationMap_InitError2=No es posible mostrar la vista de localizaci\u00f3n geogr\u00e1fica: objeto no encontrado
 LocationMap_PartNamePrefix=localizaci\u00f3n geogr\u00e1fica - 
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=Error
 OpenLocationMap_ErrorText=Error al abrir la vista: 
 OpenWorldMap_Error=Error
 OpenWorldMap_ErrorText=Error al abrir la vista: 
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=No es posible actualizar la localizaci\u00f3n geogr\u00e1fica del objecto
 WorldMap_JobTitle=Actualizar localizaci\u00f3n geogr\u00e1fica del objecto
 WorldMap_PlaceObject=Situar el objeto aqu\u00ed...
index e94b32c..3b55789 100644 (file)
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=\u0423&\u0432\u0435\u043b\u0438\u0447\u0438\u0442
 AbstractGeolocationView_ZoomOut=\u0423&\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c
 GeoMapViewer_DownloadError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u043a\u0430\u0440\u0442\u044b
 GeoMapViewer_DownloadJob_Title=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u043a\u0430\u0440\u0442\u044b
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0445 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432 \u043f\u043b\u0438\u0442\u043e\u043a
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=\u041e\u0448\u0438\u0431\u043a\u0430 \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u043a\u0430\u0440\u0442\u044b: \u0432\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u044f\u044f \u043e\u0448\u0438\u0431\u043a\u0430
 LocationMap_InitError2=\u041e\u0448\u0438\u0431\u043a\u0430 \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u043a\u0430\u0440\u0442\u044b: \u043e\u0431\u044a\u0435\u043a\u0442 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d
 LocationMap_PartNamePrefix=\u0413\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 - 
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=\u041e\u0448\u0438\u0431\u043a\u0430
 OpenLocationMap_ErrorText=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f: 
 OpenWorldMap_Error=\u041e\u0448\u0438\u0431\u043a\u0430
 OpenWorldMap_ErrorText=\u041e\u0448\u0438\u0431\u043a\u0430 \u043e\u0442\u043a\u0440\u044b\u0442\u0438\u044f: 
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432
 WorldMap_JobTitle=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432
 WorldMap_PlaceObject=\u0420\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0438\u0442\u044c \u043e\u0431\u044a\u0435\u043a\u0442 \u0437\u0434\u0435\u0441\u044c...
index 9aab130..505921e 100644 (file)
@@ -2,14 +2,33 @@ AbstractGeolocationView_ZoomIn=Zoom &in
 AbstractGeolocationView_ZoomOut=Zoom &out
 GeoMapViewer_DownloadError=Cannot download map image
 GeoMapViewer_DownloadJob_Title=Download map image
+GeoMapViewer_End=End
 GeoMapViewer_LoadMissingJob_Title=Load missing map tiles
+GeoMapViewer_Start=Start
+HistoryView_CustomTimeFrame=Custom time period...
+HistoryView_Preset10min=10 minutes
+HistoryView_Preset12hours=12 hours
+HistoryView_Preset1day=1 day
+HistoryView_Preset1hour=1 hour
+HistoryView_Preset1month=Month
+HistoryView_Preset1week=Week
+HistoryView_Preset1year=Year
+HistoryView_Preset2days=2 days
+HistoryView_Preset2hours=2 hours
+HistoryView_Preset30min=30 minutes
+HistoryView_Preset4hours=4 hours
+HistoryView_Preset5days=5 days
+HistoryView_Presets=&Presets
 LocationMap_InitError1=Cannot initialize geolocation view: internal error
 LocationMap_InitError2=Cannot initialize geolocation view: object not found
 LocationMap_PartNamePrefix=Geolocation - 
+OpenHistoryMap_CannotOpenView=Cannot open view: %s
+OpenHistoryMap_Error=Error
 OpenLocationMap_Error=Error
 OpenLocationMap_ErrorText=Error opening view: 
 OpenWorldMap_Error=Error
 OpenWorldMap_ErrorText=Error opening view: 
+TimeSelectionDialog_Title=Time Period
 WorldMap_JobError=Cannot update object's geolocation
 WorldMap_JobTitle=Update object's geolocation
 WorldMap_PlaceObject=Place object here...
index 51512b5..4d19768 100644 (file)
@@ -58,8 +58,8 @@ public class HistoryView extends ViewPart
       GraphSettings.TIME_UNIT_DAY, GraphSettings.TIME_UNIT_DAY };
    private static final int[] presetRanges = { 10, 30, 1, 2, 4, 12, 1, 2, 5, 7, 31, 365 };
    private static final String[] presetNames = 
-      { "10 minutes", "30 minutes", "1 hour", "2 hours", "4 hours", "12 hours", "Today",
-        "Last 2 days", "Last 5 days", "This week", "This month","This Year" };
+      { Messages.get().HistoryView_Preset10min, Messages.get().HistoryView_Preset30min, Messages.get().HistoryView_Preset1hour, Messages.get().HistoryView_Preset2hours, Messages.get().HistoryView_Preset4hours, Messages.get().HistoryView_Preset12hours, Messages.get().HistoryView_Preset1day,
+        Messages.get().HistoryView_Preset2days, Messages.get().HistoryView_Preset5days, Messages.get().HistoryView_Preset1week, Messages.get().HistoryView_Preset1month,Messages.get().HistoryView_Preset1year };
 
        
        protected GeoMapViewer map;
@@ -198,7 +198,7 @@ public class HistoryView extends ViewPart
          };
       }
       
-      setConfigurableTime = new Action("Set time frame"
+      setConfigurableTime = new Action(Messages.get().HistoryView_CustomTimeFrame
       {
          @Override
          public void run()
@@ -229,7 +229,7 @@ public class HistoryView extends ViewPart
         */
        protected void fillLocalPullDown(IMenuManager manager)
        {
-          MenuManager presets = new MenuManager("&Presets");
+          MenuManager presets = new MenuManager(Messages.get().HistoryView_Presets);
       for(int i = 0; i < presetActions.length; i++)
          presets.add(presetActions[i]);
       
@@ -280,7 +280,7 @@ public class HistoryView extends ViewPart
         */
        protected void fillContextMenu(final IMenuManager manager)
        {
-          MenuManager presets = new MenuManager("&Presets");
+          MenuManager presets = new MenuManager(Messages.get().HistoryView_Presets);
       for(int i = 0; i < presetActions.length; i++)
          presets.add(presetActions[i]);
       
index 3809f63..5134d82 100644 (file)
@@ -87,15 +87,16 @@ public class GeoMapViewer extends Canvas implements PaintListener, GeoLocationCa
 {
    private static final int START = 1;
    private static final int END = 2;
-   private static final String pointInformation[] = {"Start","End"};
+   private final String pointInformation[] = {Messages.get().GeoMapViewer_Start, Messages.get().GeoMapViewer_End};
    
-       private static final Color MAP_BACKGROUND = new Color(Display.getCurrent(), 255, 255, 255);
-   private static final Color INFO_BLOCK_BACKGROUND = new Color(Display.getCurrent(), 0, 0, 0);
-   private static final Color INFO_BLOCK_TEXT = new Color(Display.getCurrent(), 255, 255, 255);
-       private static final Color LABEL_BACKGROUND = new Color(Display.getCurrent(), 240, 254, 192);
-       private static final Color LABEL_TEXT = new Color(Display.getCurrent(), 0, 0, 0);
-       private static final Color BORDER_COLOR = new Color(Display.getCurrent(), 128, 128, 128);
-       private static final Color SELECTION_COLOR = new Color(Display.getCurrent(), 0, 0, 255);
+       private final Color MAP_BACKGROUND = new Color(Display.getCurrent(), 255, 255, 255);
+   private final Color INFO_BLOCK_BACKGROUND = new Color(Display.getCurrent(), 0, 0, 0);
+   private final Color INFO_BLOCK_TEXT = new Color(Display.getCurrent(), 255, 255, 255);
+       private final Color LABEL_BACKGROUND = new Color(Display.getCurrent(), 240, 254, 192);
+       private final Color LABEL_TEXT = new Color(Display.getCurrent(), 0, 0, 0);
+       private final Color BORDER_COLOR = new Color(Display.getCurrent(), 128, 128, 128);
+       private final Color SELECTION_COLOR = new Color(Display.getCurrent(), 0, 0, 255);
+   private final Color TRACK_COLOR = new Color(Display.getCurrent(), 163, 73, 164);
        
        private static final Font TITLE_FONT = new Font(Display.getCurrent(), "Verdana", 10, SWT.BOLD);  //$NON-NLS-1$
 
@@ -147,8 +148,8 @@ public class GeoMapViewer extends Canvas implements PaintListener, GeoLocationCa
                   this.historyObject = historyObject;             
                }
                
-               imageZoomIn = Activator.getImageDescriptor("icons/map_zoom_in.png").createImage();
-      imageZoomOut = Activator.getImageDescriptor("icons/map_zoom_out.png").createImage();
+               imageZoomIn = Activator.getImageDescriptor("icons/map_zoom_in.png").createImage(); //$NON-NLS-1$
+      imageZoomOut = Activator.getImageDescriptor("icons/map_zoom_out.png").createImage(); //$NON-NLS-1$
 
                labelProvider = WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider();
                mapLoader = new MapLoader(getDisplay());
diff --git a/webui/webapp/ObjectTools/OSGI-INF/l10n/bundle_de.properties b/webui/webapp/ObjectTools/OSGI-INF/l10n/bundle_de.properties
new file mode 100644 (file)
index 0000000..d75e6a4
--- /dev/null
@@ -0,0 +1,19 @@
+action.label.ObjectTools= Object Tools
+actionSet.label.ObjectTools= Object Tools Configuration
+command.description.Copy= Copy
+command.description.ObjectTools= Open object tools editor
+command.description.SelectAll= Select all
+command.description.Terminate= Terminate running external command
+command.name.Copy= Copy
+command.name.ObjectTools= Object Tools
+command.name.SelectAll= Select all
+command.name.Terminate= Terminate
+page.name.AccessControl= Access Control
+page.name.Columns= Columns
+page.name.Filter= Filter
+page.name.General= General
+view.name.FileViewer= File Viewer
+view.name.LocalCommand= Local Command
+view.name.ObjectTools= Object Tools
+view.name.TableResults= Table Tool Results
+view.name.WebBrowser= Web Browser
index cb7e98f..0ab7333 100644 (file)
          point="org.eclipse.ui.contexts">
       <context
             id="org.netxms.ui.eclipse.objecttools.context.AbstractCommandResults"
-            name="AbstractCommandResults"
+            name="Abstract Command Results"
             parentId="org.eclipse.ui.contexts.window">
       </context>
       <context
             commandId="org.netxms.ui.eclipse.objecttools.commands.clear_output"
             contextId="org.netxms.ui.eclipse.objecttools.context.AbstractCommandResults"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
-            sequence="CTRL+L">
+            sequence="M1+L">
       </key>
       <key
             commandId="org.netxms.ui.eclipse.objecttools.commands.clear_output"
             contextId="org.netxms.ui.eclipse.objecttools.context.FileViewer"
             schemeId="org.netxms.ui.eclipse.defaultKeyBinding"
-            sequence="CTRL+L">
+            sequence="M1+L">
       </key>
    </extension>
    <extension
index e2e79fe..e527893 100644 (file)
@@ -53,16 +53,25 @@ public class Messages extends NLS
    public String Filter_OIDShouldMatch;
    public String Filter_SNMPNeeded;
    public String General_AgentAction;
+   public String General_AllFiles;
+   public String General_CannotLoadImage;
+   public String General_Clear;
    public String General_Command;
+   public String General_CommandName;
+   public String General_CommandShortName;
    public String General_Confirmation;
    public String General_ConfirmationMessage;
    public String General_Description;
    public String General_DisableObjectToll;
+   public String General_Error;
    public String General_ExecOptions;
    public String General_FileOptions;
    public String General_FirstColumnValue;
    public String General_FollowFileChanges;
    public String General_GeneratesOutput;
+   public String General_Icon;
+   public String General_ImageFiles;
+   public String General_ImageTooLarge;
    public String General_LimitDownloadFileSizeLable;
    public String General_Name;
    public String General_OIDSuffix;
@@ -71,6 +80,9 @@ public class Messages extends NLS
    public String General_RegExp;
    public String General_RemoteFileName;
    public String General_RequiresConfirmation;
+   public String General_Select;
+   public String General_ShowInCommands;
+   public String General_ShowInCommandsTooltip;
    public String General_SNMPTableOptions;
    public String General_Title;
    public String General_URL;
@@ -147,6 +159,8 @@ public class Messages extends NLS
    public String ToolColumnLabelProvider_FmtIpAddr;
    public String ToolColumnLabelProvider_FmtMacAddr;
    public String ToolColumnLabelProvider_FmtString;
+   public String WakeupToolHandler_JobError;
+   public String WakeupToolHandler_JobName;
    static
    {
       // initialize resource bundle
index 18cc75d..b870ac4 100644 (file)
@@ -130,7 +130,7 @@ public class ObjectToolsDynamicMenu extends ContributionItem implements IWorkben
                                Menu rootMenu = toolsMenu;
                                for(int j = 0; j < path.length - 1; j++)
                                {
-               final String key = rootMenu.hashCode() + "@" + path[j].replace("&", ""); //$NON-NLS-1$ //$NON-NLS-2$
+               final String key = rootMenu.hashCode() + "@" + path[j].replace("&", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                                        Menu currMenu = menus.get(key);
                                        if (currMenu == null)
                                        {
index af42a7d..932bf68 100644 (file)
@@ -47,7 +47,7 @@ public class WakeupToolHandler implements ObjectToolHandler
    public void execute(final AbstractNode node, ObjectTool tool)
    {
       final NXCSession session = (NXCSession)ConsoleSharedData.getSession();
-      new ConsoleJob("Wakeup node", null, Activator.PLUGIN_ID, null) {
+      new ConsoleJob(Messages.get().WakeupToolHandler_JobName, null, Activator.PLUGIN_ID, null) {
          @Override
          protected void runInternal(IProgressMonitor monitor) throws Exception
          {
@@ -57,7 +57,7 @@ public class WakeupToolHandler implements ObjectToolHandler
          @Override
          protected String getErrorMessage()
          {
-            return "Cannot send wake-on-LAN packet to node";
+            return Messages.get().WakeupToolHandler_JobError;
          }
       }.start();
    }
index 566dc10..6f94794 100644 (file)
@@ -161,14 +161,14 @@ public class ObjectToolsCache
                }
                catch(Exception e)
                {
-                  Activator.logError("Exception in ObjectToolsCache.reload()", e);
+                  Activator.logError("Exception in ObjectToolsCache.reload()", e); //$NON-NLS-1$
                }
             }
          }
                }
                catch(Exception e)
                {
-                  Activator.logError("Exception in ObjectToolsCache.reload()", e);
+                  Activator.logError("Exception in ObjectToolsCache.reload()", e); //$NON-NLS-1$
                }
        }
        
index 27c6ebf..ffa272f 100644 (file)
@@ -43,16 +43,25 @@ Filter_AgentNeeded=NetXMS agent should be available
 Filter_OIDShouldMatch=Node SNMP OID should match with the following template:
 Filter_SNMPNeeded=Node should support SNMP
 General_AgentAction=Agent's action
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=Command
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=Confirmation
 General_ConfirmationMessage=Confirmation message
 General_Description=Description
 General_DisableObjectToll=Disable Object Tool
+General_Error=Error
 General_ExecOptions=Execution options
 General_FileOptions=File Options
 General_FirstColumnValue=&Value of first column
 General_FollowFileChanges=Follow file changes
 General_GeneratesOutput=Command generates output
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=Limit initial download size (in bytes, 0 for unlimited)
 General_Name=Name
 General_OIDSuffix=&OID suffix of first column
@@ -61,6 +70,9 @@ General_Parameter=Parameter
 General_RegExp=Regular expression
 General_RemoteFileName=Remote file name
 General_RequiresConfirmation=This tool requires confirmation before execution
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_SNMPTableOptions=SNMP Table Options
 General_Title=Title
 General_URL=URL
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=Integer
 ToolColumnLabelProvider_FmtIpAddr=IP Address
 ToolColumnLabelProvider_FmtMacAddr=MAC Address
 ToolColumnLabelProvider_FmtString=String
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
index e11d191..d52a9da 100644 (file)
@@ -43,16 +43,25 @@ Filter_AgentNeeded=NetXMS agent by m\u011Bl b\u00FDt dostupn\u00FD
 Filter_OIDShouldMatch=SNMP OID prvku by m\u011Bl souhlasit s n\u00E1sleduj\u00EDc\u00ED \u0161ablonou\:
 Filter_SNMPNeeded=Prvek by m\u011Bl podporovat SNMP
 General_AgentAction=Akce agenta
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=P\u0159\u00EDkaz
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=Potvrzen\u00ED
 General_ConfirmationMessage=Potvrzovac\u00ED zpr\u00E1va
 General_Description=Popis
 General_DisableObjectToll=Disable Object Tool
+General_Error=Error
 General_ExecOptions=Mo\u017Enosti spu\u0161t\u011Bn\u00ED
 General_FileOptions=File Options
 General_FirstColumnValue=&Hodnota prvn\u00EDho sloupce
 General_FollowFileChanges=Follow file changes
 General_GeneratesOutput=P\u0159\u00EDkaz generuj\u00EDc\u00ED v\u00FDstup
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=Limit initial download size (in bytes, 0 for unlimited)
 General_Name=N\u00E1zev
 General_OIDSuffix=&OID p\u0159\u00EDpona prvn\u00EDho sloupce
@@ -62,6 +71,9 @@ General_RegExp=Regul\u00E1rn\u00ED v\u00FDraz
 General_RemoteFileName=N\u00E1zev vzd\u00E1len\u00E9ho souboru
 General_RequiresConfirmation=Tento n\u00E1stroj pot\u0159ebuje potvrzen\u00ED p\u0159ed spu\u0161t\u011Bn\u00EDm
 General_SNMPTableOptions=Mo\u017Enosti SNMP tabulky
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_Title=N\u00E1zev
 General_URL=URL
 General_UseAsIndex=Pou\u017E\u00EDt jako index pro druhou a n\u00E1sleduj\u00EDc\u00ED sloupce
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=Integer
 ToolColumnLabelProvider_FmtIpAddr=IP adresa
 ToolColumnLabelProvider_FmtMacAddr=MAC adresa
 ToolColumnLabelProvider_FmtString=String
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
@@ -43,16 +43,25 @@ Filter_AgentNeeded=NetXMS agent should be available
 Filter_OIDShouldMatch=Node SNMP OID should match with the following template:
 Filter_SNMPNeeded=Node should support SNMP
 General_AgentAction=Agent's action
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=Command
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=Confirmation
 General_ConfirmationMessage=Confirmation message
 General_Description=Description
 General_DisableObjectToll=Disable Object Tool
+General_Error=Error
 General_ExecOptions=Execution options
 General_FileOptions=File Options
 General_FirstColumnValue=&Value of first column
 General_FollowFileChanges=Follow file changes
 General_GeneratesOutput=Command generates output
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=Limit initial download size (in bytes, 0 for unlimited)
 General_Name=Name
 General_OIDSuffix=&OID suffix of first column
@@ -62,6 +71,9 @@ General_RegExp=Regular expression
 General_RemoteFileName=Remote file name
 General_RequiresConfirmation=This tool requires confirmation before execution
 General_SNMPTableOptions=SNMP Table Options
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_Title=Title
 General_URL=URL
 General_UseAsIndex=Use as index for second and subsequent columns:
@@ -106,8 +118,8 @@ ObjectToolsEditor_Disable=Disable
 ObjectToolsEditor_DisableObjTool=DisableObject Tool
 ObjectToolsEditor_Enable=Enable
 ObjectToolsEditor_EnableObjTool=Enable Object Tool
-ObjectToolsEditor_ErrorDisablingObjectTools=It is not possible to disable this object tool.
 ObjectToolsEditor_ErrorDisablingObjTools=It is not possible to enable this object tool.
+ObjectToolsEditor_ErrorDisablingObjectTools=It is not possible to disable this object tool.
 ObjectToolsEditor_JobDelete=Delete objecttools
 ObjectToolsEditor_JobDeleteError=Cannot delete object tool
 ObjectToolsEditor_JobGetConfig=Get object tools configuration
@@ -122,8 +134,8 @@ ObjectToolsLabelProvider_TypeAgentTable=Agent Table
 ObjectToolsLabelProvider_TypeDownloadFile=Download File
 ObjectToolsLabelProvider_TypeInternal=Internal
 ObjectToolsLabelProvider_TypeLocalCmd=Local Command
-ObjectToolsLabelProvider_TypeServerCmd=Server Command
 ObjectToolsLabelProvider_TypeSNMPTable=SNMP Table
+ObjectToolsLabelProvider_TypeServerCmd=Server Command
 ObjectToolsLabelProvider_TypeURL=URL
 OpenObjectToolsEditor_Error=Error
 OpenObjectToolsEditor_ErrorOpenView=Error opening view: 
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=Integer
 ToolColumnLabelProvider_FmtIpAddr=IP Address
 ToolColumnLabelProvider_FmtMacAddr=MAC Address
 ToolColumnLabelProvider_FmtString=String
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
index 4adf0e5..25914f2 100644 (file)
@@ -43,16 +43,25 @@ Filter_AgentNeeded=NetXMS agent should be available
 Filter_OIDShouldMatch=Node SNMP OID should match with the following template:
 Filter_SNMPNeeded=Node should support SNMP
 General_AgentAction=Agent's action
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=Command
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=Confirmation
 General_ConfirmationMessage=Confirmation message
 General_Description=Description
 General_DisableObjectToll=Disable Object Tool
+General_Error=Error
 General_ExecOptions=Execution options
 General_FileOptions=File Options
 General_FirstColumnValue=&Value of first column
 General_FollowFileChanges=Follow file changes
 General_GeneratesOutput=Command generates output
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=Limit initial download size (in bytes, 0 for unlimited)
 General_Name=Name
 General_OIDSuffix=&OID suffix of first column
@@ -62,6 +71,9 @@ General_RegExp=Regular expression
 General_RemoteFileName=Remote file name
 General_RequiresConfirmation=This tool requires confirmation before execution
 General_SNMPTableOptions=SNMP Table Options
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_Title=Title
 General_URL=URL
 General_UseAsIndex=Use as index for second and subsequent columns:
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=Integer
 ToolColumnLabelProvider_FmtIpAddr=IP Address
 ToolColumnLabelProvider_FmtMacAddr=MAC Address
 ToolColumnLabelProvider_FmtString=String
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
index 0f6c0ea..f14b46b 100644 (file)
@@ -43,16 +43,25 @@ Filter_AgentNeeded=\u0410\u0433\u0435\u043d\u0442 NetXMS \u0434\u043e\u043b\u043
 Filter_OIDShouldMatch=\u0423\u0437\u0435\u043b \u0434\u043e\u043b\u0436\u0435\u043d \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u044c SNMP OID, \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c\u0443 \u0448\u0430\u0431\u043b\u043e\u043d\u0443:
 Filter_SNMPNeeded=\u0423\u0437\u0435\u043b \u0434\u043e\u043b\u0436\u0435\u043d \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u044c SNMP
 General_AgentAction=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0430\u0433\u0435\u043d\u0442\u0430
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=\u041a\u043e\u043c\u043c\u0430\u043d\u0434\u0430
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
 General_ConfirmationMessage=\u0422\u0435\u043a\u0441\u0442 \u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f
 General_Description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
 General_DisableObjectToll=\u041e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442
+General_Error=Error
 General_ExecOptions=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f
 General_FileOptions=\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0444\u0430\u043b\u0439\u0430
 General_FirstColumnValue=&\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u043f\u0435\u0440\u0432\u043e\u0433\u043e \u0441\u0442\u043e\u043b\u0431\u0446\u0430
 General_FollowFileChanges=\u041e\u0442\u0441\u043b\u0435\u0436\u0438\u0432\u0430\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0444\u0430\u043b\u0430
 General_GeneratesOutput=\u041a\u043e\u043c\u0430\u043d\u0434\u0430 \u0433\u0435\u043d\u0435\u0440\u0438\u0440\u0443\u0435\u0442 \u0432\u044b\u0432\u043e\u0434
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u044b\u0439 \u0440\u0430\u0437\u043c\u0435\u0440 \u0444\u0430\u0439\u043b\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 (\u0431\u0430\u0439\u0442, 0 - \u043d\u0435 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043e)
 General_Name=\u0418\u043c\u044f
 General_OIDSuffix=\u0421\u0443\u0444\u0444\u0438\u043a\u0441 &OID \u043f\u0435\u0440\u0432\u043e\u0433\u043e \u0441\u0442\u043e\u043b\u0431\u0446\u0430
@@ -62,6 +71,9 @@ General_RegExp=\u0420\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u04
 General_RemoteFileName=\u0418\u043c\u044f \u0443\u0434\u0430\u043b\u0435\u043d\u043d\u043e\u0433\u043e \u0444\u0430\u0439\u043b\u0430
 General_RequiresConfirmation=\u0414\u043b\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430 \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
 General_SNMPTableOptions=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0442\u0430\u0431\u043b\u0438\u0446\u044b SNMP
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_Title=\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a
 General_URL=URL
 General_UseAsIndex=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043a\u0430\u043a \u0438\u043d\u0434\u0435\u043a\u0441 \u0434\u043b\u044f \u0432\u0442\u043e\u0440\u043e\u0433\u043e \u0438 \u043f\u043e\u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0445 \u0441\u0442\u043e\u043b\u0431\u0446\u043e\u0432:
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=\u0426\u0435\u043b\u043e\u0435 \u0447\u0438\u
 ToolColumnLabelProvider_FmtIpAddr=IP \u0430\u0434\u0440\u0435\u0441
 ToolColumnLabelProvider_FmtMacAddr=MAC \u0430\u0434\u0440\u0435\u0441
 ToolColumnLabelProvider_FmtString=\u0421\u0442\u0440\u043e\u043a\u0430
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
index 4adf0e5..25914f2 100644 (file)
@@ -43,16 +43,25 @@ Filter_AgentNeeded=NetXMS agent should be available
 Filter_OIDShouldMatch=Node SNMP OID should match with the following template:
 Filter_SNMPNeeded=Node should support SNMP
 General_AgentAction=Agent's action
+General_AllFiles=All Files
+General_CannotLoadImage=Cannot load image file: %s
+General_Clear=Clear
 General_Command=Command
+General_CommandName=Command name
+General_CommandShortName=Command short name
 General_Confirmation=Confirmation
 General_ConfirmationMessage=Confirmation message
 General_Description=Description
 General_DisableObjectToll=Disable Object Tool
+General_Error=Error
 General_ExecOptions=Execution options
 General_FileOptions=File Options
 General_FirstColumnValue=&Value of first column
 General_FollowFileChanges=Follow file changes
 General_GeneratesOutput=Command generates output
+General_Icon=Icon
+General_ImageFiles=Image Files
+General_ImageTooLarge=Select image file is too large
 General_LimitDownloadFileSizeLable=Limit initial download size (in bytes, 0 for unlimited)
 General_Name=Name
 General_OIDSuffix=&OID suffix of first column
@@ -62,6 +71,9 @@ General_RegExp=Regular expression
 General_RemoteFileName=Remote file name
 General_RequiresConfirmation=This tool requires confirmation before execution
 General_SNMPTableOptions=SNMP Table Options
+General_Select=Select...
+General_ShowInCommands=Show in commands
+General_ShowInCommandsTooltip=Show this tool in node commands
 General_Title=Title
 General_URL=URL
 General_UseAsIndex=Use as index for second and subsequent columns:
@@ -137,3 +149,5 @@ ToolColumnLabelProvider_FmtInteger=Integer
 ToolColumnLabelProvider_FmtIpAddr=IP Address
 ToolColumnLabelProvider_FmtMacAddr=MAC Address
 ToolColumnLabelProvider_FmtString=String
+WakeupToolHandler_JobError=Cannot send wake-on-LAN packet to node
+WakeupToolHandler_JobName=Wakeup node
index fdceabc..cee806b 100644 (file)
@@ -277,7 +277,7 @@ public class General extends PropertyPage
                textConfirmation.setEnabled(checkConfirmation.getSelection());
                
       Group commandGroup = new Group(dialogArea, SWT.NONE);
-      commandGroup.setText("Show in commands");
+      commandGroup.setText(Messages.get().General_ShowInCommands);
       gd = new GridData();
       gd.horizontalAlignment = SWT.FILL;
       gd.grabExcessHorizontalSpace = true;
@@ -289,7 +289,7 @@ public class General extends PropertyPage
       commandGroup.setLayout(layout);
       
       checkCommand = new Button(commandGroup, SWT.CHECK);
-      checkCommand.setText("Show this tool in node commands");
+      checkCommand.setText(Messages.get().General_ShowInCommandsTooltip);
       checkCommand.setSelection((objectTool.getFlags() & ObjectTool.SHOW_IN_COMMANDS) != 0);
       checkCommand.addSelectionListener(new SelectionListener() {
          @Override
@@ -314,7 +314,7 @@ public class General extends PropertyPage
       checkCommand.setLayoutData(gd);
       
       textCommandName = new LabeledText(commandGroup, SWT.NONE);
-      textCommandName.setLabel("Command name");
+      textCommandName.setLabel(Messages.get().General_CommandName);
       gd = new GridData();
       gd.horizontalAlignment = SWT.FILL;
       gd.grabExcessHorizontalSpace = true;
@@ -323,7 +323,7 @@ public class General extends PropertyPage
       textCommandName.setEnabled(checkCommand.getSelection());
                
       textCommandShortName = new LabeledText(commandGroup, SWT.NONE);
-      textCommandShortName.setLabel("Command short name");
+      textCommandShortName.setLabel(Messages.get().General_CommandShortName);
       gd = new GridData();
       gd.horizontalAlignment = SWT.FILL;
       gd.grabExcessHorizontalSpace = true;
@@ -380,7 +380,7 @@ public class General extends PropertyPage
       }
       catch(Exception e)
       {
-         Activator.logError("Exception in General.createIcon()", e);
+         Activator.logError("Exception in General.createIcon()", e); //$NON-NLS-1$
       }
        }
        
@@ -390,7 +390,7 @@ public class General extends PropertyPage
        private void createIconSelector(Composite parent)
        {
           Group group = new Group(parent, SWT.NONE);
-          group.setText("Icon");
+          group.setText(Messages.get().General_Icon);
           group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
           
           GridLayout layout = new GridLayout();
@@ -408,7 +408,7 @@ public class General extends PropertyPage
           
       Button link = new Button(group, SWT.PUSH);
       link.setImage(SharedIcons.IMG_FIND);
-      link.setToolTipText("Select...");
+      link.setToolTipText(Messages.get().General_Select);
       link.addSelectionListener(new SelectionAdapter() {
          @Override
          public void widgetSelected(SelectionEvent e)
@@ -419,7 +419,7 @@ public class General extends PropertyPage
 
       link = new Button(group, SWT.PUSH);
       link.setImage(SharedIcons.IMG_CLEAR);
-      link.setToolTipText("Clear");
+      link.setToolTipText(Messages.get().General_Clear);
       link.addSelectionListener(new SelectionAdapter() {
          @Override
          public void widgetSelected(SelectionEvent e)
@@ -440,8 +440,6 @@ public class General extends PropertyPage
        private void selectIcon()
        {
           FileDialog dlg = new FileDialog(getShell(), SWT.OPEN);
-          //dlg.setFilterExtensions(new String[] { "*.gif;*.jpg;*.png", "*.*" });
-      //dlg.setFilterNames(new String[] { "Image Files", "All Files" });
       String fileName = dlg.open();
       if (fileName == null)
          return;
@@ -459,12 +457,12 @@ public class General extends PropertyPage
          else
          {
             image.dispose();
-            MessageDialogHelper.openError(getShell(), "Error", "Select image file is too large");
+            MessageDialogHelper.openError(getShell(), Messages.get().General_Error, Messages.get().General_ImageTooLarge);
          }
       }
       catch(Exception e)
       {
-         MessageDialogHelper.openError(getShell(), "Error", String.format("Cannot load image file: %s", e.getLocalizedMessage()));
+         MessageDialogHelper.openError(getShell(), Messages.get().General_Error, String.format(Messages.get().General_CannotLoadImage, e.getLocalizedMessage()));
       }
        }