externalized strings
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 18 May 2016 12:01:04 +0000 (15:01 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 18 May 2016 12:01:04 +0000 (15:01 +0300)
60 files changed:
src/java/netxms-eclipse/Topology/OSGI-INF/l10n/bundle.properties
src/java/netxms-eclipse/Topology/OSGI-INF/l10n/bundle_cs.properties
src/java/netxms-eclipse/Topology/OSGI-INF/l10n/bundle_de.properties
src/java/netxms-eclipse/Topology/OSGI-INF/l10n/bundle_es.properties
src/java/netxms-eclipse/Topology/OSGI-INF/l10n/bundle_fr.properties
src/java/netxms-eclipse/Topology/OSGI-INF/l10n/bundle_ru.properties
src/java/netxms-eclipse/Topology/OSGI-INF/l10n/bundle_zh_CN.properties
src/java/netxms-eclipse/Topology/plugin.xml
src/java/netxms-eclipse/Topology/src/org/netxms/ui/eclipse/topology/Messages.java
src/java/netxms-eclipse/Topology/src/org/netxms/ui/eclipse/topology/messages.properties
src/java/netxms-eclipse/Topology/src/org/netxms/ui/eclipse/topology/messages_cs.properties
src/java/netxms-eclipse/Topology/src/org/netxms/ui/eclipse/topology/messages_de.properties
src/java/netxms-eclipse/Topology/src/org/netxms/ui/eclipse/topology/messages_es.properties
src/java/netxms-eclipse/Topology/src/org/netxms/ui/eclipse/topology/messages_fr.properties
src/java/netxms-eclipse/Topology/src/org/netxms/ui/eclipse/topology/messages_ru.properties
src/java/netxms-eclipse/Topology/src/org/netxms/ui/eclipse/topology/messages_zh_CN.properties
src/java/netxms-eclipse/Topology/src/org/netxms/ui/eclipse/topology/views/SwitchForwardingDatabaseView.java
src/java/netxms-eclipse/Topology/src/org/netxms/ui/eclipse/topology/views/helpers/FDBLabelProvider.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/Messages.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/messages.properties
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_cs.properties
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_de.properties
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_es.properties
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_fr.properties
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_ru.properties
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_zh_CN.properties
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/Authentication.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/SystemRights.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/views/UserManagementView.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/views/helpers/UserLabelProvider.java
webui/webapp/Topology/OSGI-INF/l10n/bundle.properties
webui/webapp/Topology/OSGI-INF/l10n/bundle_cs.properties
webui/webapp/Topology/OSGI-INF/l10n/bundle_de.properties
webui/webapp/Topology/OSGI-INF/l10n/bundle_es.properties
webui/webapp/Topology/OSGI-INF/l10n/bundle_fr.properties
webui/webapp/Topology/OSGI-INF/l10n/bundle_ru.properties
webui/webapp/Topology/OSGI-INF/l10n/bundle_zh_CN.properties
webui/webapp/Topology/plugin.xml
webui/webapp/Topology/src/org/netxms/ui/eclipse/topology/Messages.java
webui/webapp/Topology/src/org/netxms/ui/eclipse/topology/messages.properties
webui/webapp/Topology/src/org/netxms/ui/eclipse/topology/messages_cs.properties
webui/webapp/Topology/src/org/netxms/ui/eclipse/topology/messages_de.properties
webui/webapp/Topology/src/org/netxms/ui/eclipse/topology/messages_es.properties
webui/webapp/Topology/src/org/netxms/ui/eclipse/topology/messages_fr.properties
webui/webapp/Topology/src/org/netxms/ui/eclipse/topology/messages_ru.properties
webui/webapp/Topology/src/org/netxms/ui/eclipse/topology/messages_zh_CN.properties
webui/webapp/Topology/src/org/netxms/ui/eclipse/topology/views/SwitchForwardingDatabaseView.java
webui/webapp/Topology/src/org/netxms/ui/eclipse/topology/views/helpers/FDBLabelProvider.java
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/Messages.java
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/messages.properties
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_cs.properties
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_de.properties
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_es.properties
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_fr.properties
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_ru.properties
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/messages_zh_CN.properties
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/Authentication.java
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/SystemRights.java
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/views/UserManagementView.java
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/views/helpers/UserLabelProvider.java

index 7ea7ef5..1bbb35e 100644 (file)
@@ -18,6 +18,8 @@ menu.topology = &Topology
 tab.name.AddressMap = Address Map
 tab.name.Ports = Ports
 view.name.ConnSearch = Connection Search
+view.name.MACAddressTable = MAC Address Table
+view.name.RadioIfs = Radio Interfaces
+view.name.RoutingTable = Routing Table
 view.name.VlanView = VLAN View
 view.name.WirelessStations = Wireless Stations
-view.name.RadioIfs = Radio Interfaces
index 47031bd..7c960fa 100644 (file)
@@ -17,6 +17,8 @@ menu.topology=&Topologie
 tab.name.AddressMap=Address Map
 tab.name.Ports=Porty
 view.name.ConnSearch=Vyhled\u00e1v\u00e1n\u00ed spojen\u00ed
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs=R\u00e1diov\u00e1 rozhran\u00ed
+view.name.RoutingTable= Routing Table
 view.name.VlanView=VLAN pohled
 view.name.WirelessStations=Bezdr\u00e1tov\u00e9 stanice
index 6449eab..391e67b 100644 (file)
@@ -17,6 +17,8 @@ menu.topology= &Topology
 tab.name.AddressMap= Address Map
 tab.name.Ports= Ports
 view.name.ConnSearch= Connection Search
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs= Radio Interfaces
+view.name.RoutingTable= Routing Table
 view.name.VlanView= VLAN View
 view.name.WirelessStations= Wireless Stations
index e7066f6..0361c35 100644 (file)
@@ -17,6 +17,8 @@ menu.topology=&Topology
 tab.name.AddressMap=Address Map
 tab.name.Ports=Ports
 view.name.ConnSearch=Connection Search
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs=Radio Interfaces
+view.name.RoutingTable= Routing Table
 view.name.VlanView=VLAN View
 view.name.WirelessStations=Wireless Stations
index 6449eab..391e67b 100644 (file)
@@ -17,6 +17,8 @@ menu.topology= &Topology
 tab.name.AddressMap= Address Map
 tab.name.Ports= Ports
 view.name.ConnSearch= Connection Search
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs= Radio Interfaces
+view.name.RoutingTable= Routing Table
 view.name.VlanView= VLAN View
 view.name.WirelessStations= Wireless Stations
index 9d809a0..fb2c7d6 100644 (file)
@@ -17,6 +17,8 @@ menu.topology=&\u0422\u043e\u043f\u043e\u043b\u043e\u0433\u0438\u044f
 tab.name.AddressMap=\u041a\u0430\u0440\u0442\u0430 \u0430\u0434\u0440\u0435\u0441\u043e\u0432
 tab.name.Ports=\u041f\u043e\u0440\u0442\u044b
 view.name.ConnSearch=\u0422\u043e\u0447\u043a\u0438 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs=\u0411\u0435\u0441\u043f\u0440\u043e\u0432\u043e\u0434\u043d\u044b\u0435 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u044b
+view.name.RoutingTable= Routing Table
 view.name.VlanView=\u0421\u043f\u0438\u0441\u043e\u043a VLAN
 view.name.WirelessStations=\u0411\u0435\u0441\u043f\u0440\u043e\u0432\u043e\u0434\u043d\u044b\u0435 \u0441\u0442\u0430\u043d\u0446\u0438\u0438
index e7066f6..0361c35 100644 (file)
@@ -17,6 +17,8 @@ menu.topology=&Topology
 tab.name.AddressMap=Address Map
 tab.name.Ports=Ports
 view.name.ConnSearch=Connection Search
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs=Radio Interfaces
+view.name.RoutingTable= Routing Table
 view.name.VlanView=VLAN View
 view.name.WirelessStations=Wireless Stations
index 0f11f25..2c86146 100644 (file)
             class="org.netxms.ui.eclipse.topology.views.RoutingTableView"
             icon="icons/routing_table.gif"
             id="org.netxms.ui.eclipse.topology.views.RoutingTableView"
-            name="Routing Table"
+            name="%view.name.RoutingTable"
             restorable="true">
       </view>
       <view
             class="org.netxms.ui.eclipse.topology.views.SwitchForwardingDatabaseView"
             icon="icons/routing_table.gif"
             id="org.netxms.ui.eclipse.topology.views.SwitchForwardingDatabaseView"
-            name="MAC Address Table"
+            name="%view.name.MACAddressTable"
             restorable="true">
       </view>
    </extension>
index 61721a1..675f228 100644 (file)
@@ -20,6 +20,9 @@ public class Messages extends NLS
    public static String EnterMacAddressDlg_IncorrectMacAddress;
    public static String EnterMacAddressDlg_MacAddress;
    public static String EnterMacAddressDlg_Title;
+   public static String FDBLabelProvider_Dynamic;
+   public static String FDBLabelProvider_Static;
+   public static String FDBLabelProvider_Unknown;
    public static String FindConnectionPoint_JobError;
    public static String FindConnectionPoint_JobTitle;
    public static String FindIpAddress_JobError;
@@ -89,6 +92,7 @@ public class Messages extends NLS
    public static String SwitchForwardingDatabaseView_ColMacAddr;
    public static String SwitchForwardingDatabaseView_ColNode;
    public static String SwitchForwardingDatabaseView_ColPort;
+   public static String SwitchForwardingDatabaseView_ColType;
    public static String SwitchForwardingDatabaseView_ColVlan;
    public static String SwitchForwardingDatabaseView_ConIface;
    public static String SwitchForwardingDatabaseView_JobError;
index 56f27c6..aaee45f 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Error
 EnterMacAddressDlg_IncorrectMacAddress=MAC address entered is incorrect. Please enter correct MAC address.
 EnterMacAddressDlg_MacAddress=MAC address
 EnterMacAddressDlg_Title=Enter MAC Address
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Cannot get conection point information
 FindConnectionPoint_JobTitle=Find connection point for object %d
 FindIpAddress_JobError=Search for IP address %s failed
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index 8ec927b..e9c96b7 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Chyba
 EnterMacAddressDlg_IncorrectMacAddress=Vlo\u017Een\u00E1 MAC adresa je \u0161patn\u00E1. Pros\u00EDm vlo\u017Ete spr\u00E1vnou MAC adresu.
 EnterMacAddressDlg_MacAddress=MAC adressa
 EnterMacAddressDlg_Title=Vlo\u017Ete MAC adresu
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Nelze z\u00EDskat informace p\u0159\u00EDpojn\u00E9ho bodu
 FindConnectionPoint_JobTitle=Nalezen p\u0159\u00EDpojn\u00FD bod pro objekt %d
 FindIpAddress_JobError=Vyhled\u00E1v\u00E1n\u00ED IP adresy %s selhalo
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index 56f27c6..aaee45f 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Error
 EnterMacAddressDlg_IncorrectMacAddress=MAC address entered is incorrect. Please enter correct MAC address.
 EnterMacAddressDlg_MacAddress=MAC address
 EnterMacAddressDlg_Title=Enter MAC Address
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Cannot get conection point information
 FindConnectionPoint_JobTitle=Find connection point for object %d
 FindIpAddress_JobError=Search for IP address %s failed
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index 56f27c6..aaee45f 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Error
 EnterMacAddressDlg_IncorrectMacAddress=MAC address entered is incorrect. Please enter correct MAC address.
 EnterMacAddressDlg_MacAddress=MAC address
 EnterMacAddressDlg_Title=Enter MAC Address
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Cannot get conection point information
 FindConnectionPoint_JobTitle=Find connection point for object %d
 FindIpAddress_JobError=Search for IP address %s failed
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index 56f27c6..aaee45f 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Error
 EnterMacAddressDlg_IncorrectMacAddress=MAC address entered is incorrect. Please enter correct MAC address.
 EnterMacAddressDlg_MacAddress=MAC address
 EnterMacAddressDlg_Title=Enter MAC Address
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Cannot get conection point information
 FindConnectionPoint_JobTitle=Find connection point for object %d
 FindIpAddress_JobError=Search for IP address %s failed
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index e048150..c89a863 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=\u041e\u0448\u0438\u0431\u043a\u0430
 EnterMacAddressDlg_IncorrectMacAddress=\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 MAC \u0430\u0434\u0440\u0435\u0441. \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441.
 EnterMacAddressDlg_MacAddress=MAC -\u0430\u0434\u0440\u0435\u0441
 EnterMacAddressDlg_Title=\u0417\u0430\u0434\u0430\u043d\u0438\u0435 MAC \u0430\u0434\u0440\u0435\u0441\u0430
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043e \u0442\u043e\u0447\u043a\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f
 FindConnectionPoint_JobTitle=\u041f\u043e\u0438\u0441\u043a \u0442\u043e\u0447\u043a\u0438 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043e\u0431\u044a\u0435\u043a\u0442\u0430 %d
 FindIpAddress_JobError=IP \u0430\u0434\u0440\u0435\u0441 %s \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=\u0410\u0434\u0440\u0435\u0441 \u043f\u043e\u0434
 SwitchForwardingDatabaseView_ColMacAddr=MAC \u0430\u0434\u0440\u0435\u0441
 SwitchForwardingDatabaseView_ColNode=\u0423\u0437\u0435\u043b
 SwitchForwardingDatabaseView_ColPort=\u041f\u043e\u0440\u0442
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=\u0418\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441
 SwitchForwardingDatabaseView_JobError=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0431\u0430\u0437\u044b \u0430\u0434\u0440\u0435\u0441\u0430\u0446\u0438\u0438 \u043a\u043e\u043c\u043c\u0443\u0442\u0430\u0442\u043e\u0440\u0430 \u0434\u043b\u044f \u0443\u0437\u043b\u0430 %s
index 56f27c6..aaee45f 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Error
 EnterMacAddressDlg_IncorrectMacAddress=MAC address entered is incorrect. Please enter correct MAC address.
 EnterMacAddressDlg_MacAddress=MAC address
 EnterMacAddressDlg_Title=Enter MAC Address
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Cannot get conection point information
 FindConnectionPoint_JobTitle=Find connection point for object %d
 FindIpAddress_JobError=Search for IP address %s failed
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index a6283ca..c68337e 100644 (file)
@@ -104,7 +104,7 @@ public class SwitchForwardingDatabaseView extends ViewPart
                      Messages.get().SwitchForwardingDatabaseView_ConIface, 
                      Messages.get().SwitchForwardingDatabaseView_ColVlan, 
                      Messages.get().SwitchForwardingDatabaseView_ColNode,
-                     "Type"
+                     Messages.get().SwitchForwardingDatabaseView_ColType
                   };
                final int[] widths = { 180, 100, 200, 100, 250, 110 };
                viewer = new SortableTableViewer(parent, names, widths, COLUMN_MAC_ADDRESS, SWT.DOWN, SWT.FULL_SELECTION | SWT.MULTI);
index 27436b5..07de914 100644 (file)
@@ -24,6 +24,7 @@ import org.eclipse.swt.graphics.Image;
 import org.netxms.client.NXCSession;
 import org.netxms.client.topology.FdbEntry;
 import org.netxms.ui.eclipse.shared.ConsoleSharedData;
+import org.netxms.ui.eclipse.topology.Messages;
 import org.netxms.ui.eclipse.topology.views.SwitchForwardingDatabaseView;
 
 /**
@@ -68,7 +69,7 @@ public class FDBLabelProvider extends LabelProvider implements ITableLabelProvid
                return ""; //$NON-NLS-1$
             return Integer.toString(e.getVlanId());
          case SwitchForwardingDatabaseView.COLUMN_TYPE:
-            return (e.getType() == 3) ? "dynamic" : ((e.getType() == 5) ? "static" : "unknown");
+            return (e.getType() == 3) ? Messages.get().FDBLabelProvider_Dynamic : ((e.getType() == 5) ? Messages.get().FDBLabelProvider_Static : Messages.get().FDBLabelProvider_Unknown);
       }
       return null;
    }
index 6fd11d6..33e6b5f 100644 (file)
@@ -17,6 +17,7 @@ public class Messages extends NLS
    public static String Authentication_CommonName;
        public static String Authentication_JobError;
        public static String Authentication_JobTitle;
+   public static String Authentication_LDAPPassword;
        public static String Authentication_MappingData;
        public static String Authentication_MustChangePassword;
        public static String Authentication_Password;
@@ -103,24 +104,40 @@ public class Messages extends NLS
        public static String SystemRights_JobTitle;
        public static String SystemRights_LoginAsMobile;
        public static String SystemRights_ManageAgents;
+   public static String SystemRights_ManageAllScheduledTasks;
    public static String SystemRights_ManageDCISummaryTables;
        public static String SystemRights_ManageFiles;
        public static String SystemRights_ManageMappingTables;
+   public static String SystemRights_ManageOwnScheduledTasks;
        public static String SystemRights_ManagePackages;
        public static String SystemRights_ManageScripts;
        public static String SystemRights_ManageUsers;
+   public static String SystemRights_ManageUserScheduledTasks;
        public static String SystemRights_ReadFiles;
        public static String SystemRights_RegisterAgents;
    public static String SystemRights_ReportingServerAccess;
-       public static String SystemRights_SendSMS;
+       public static String SystemRights_ScheduleFileUploadTask;
+   public static String SystemRights_ScheduleObjectMaint;
+   public static String SystemRights_ScheduleScriptTask;
+   public static String SystemRights_SendSMS;
    public static String SystemRights_UnlinkTicket;
        public static String SystemRights_ViewAuditLog;
        public static String SystemRights_ViewEventConfig;
        public static String SystemRights_ViewEventLog;
+   public static String SystemRights_ViewSyslog;
        public static String SystemRights_ViewTrapLog;
-       public static String UserLabelProvider_Group;
-       public static String UserLabelProvider_User;
+       public static String UserLabelProvider_Certificate;
+   public static String UserLabelProvider_CertificateOrPassword;
+   public static String UserLabelProvider_CertificateOrRADIUS;
+   public static String UserLabelProvider_Group;
+   public static String UserLabelProvider_LDAP;
+   public static String UserLabelProvider_Local;
+   public static String UserLabelProvider_Password;
+   public static String UserLabelProvider_RADIUS;
+       public static String UserLabelProvider_Unknown;
+   public static String UserLabelProvider_User;
        public static String UserManagementView_7;
+   public static String UserManagementView_Authentication;
        public static String UserManagementView_CannotChangePassword;
        public static String UserManagementView_ChangePassword;
        public static String UserManagementView_ConfirmDeletePlural;
@@ -148,6 +165,7 @@ public class Messages extends NLS
        public static String UserManagementView_OpenJobError;
        public static String UserManagementView_OpenJobName;
        public static String UserManagementView_Properties;
+   public static String UserManagementView_Source;
        public static String UserManagementView_Type;
        public static String UserManagementView_UnlockJobError;
        public static String UserManagementView_UnlockJobName;
index 7a1b0b9..da6ee99 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certificate or RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Cannot update user account
 Authentication_JobTitle=Update user database object
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Certificate mapping data
 Authentication_MustChangePassword=User must &change password at next logon
 Authentication_Password=NetXMS password
@@ -96,24 +97,40 @@ SystemRights_JobError=Cannot update user object
 SystemRights_JobTitle=Update user database object
 SystemRights_LoginAsMobile=Login as mobile device
 SystemRights_ManageAgents=Manage agent configurations
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Manage server files
 SystemRights_ManageMappingTables=Manage mapping tables
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Manage packages
 SystemRights_ManageScripts=Manage script library
 SystemRights_ManageUsers=Manage users
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ReadFiles=Read server files
 SystemRights_RegisterAgents=Register agents
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Send SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=View audit log
 SystemRights_ViewEventConfig=View event templates configuration
 SystemRights_ViewEventLog=View event log
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=View SNMP trap log
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Group
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=User
 UserManagementView_7=Update user list
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Unable to change password
 UserManagementView_ChangePassword=Change password...
 UserManagementView_ConfirmDeletePlural=Do you really wish to delete selected users
@@ -141,6 +158,7 @@ UserManagementView_Name=Name
 UserManagementView_OpenJobError=Cannot lock user database
 UserManagementView_OpenJobName=Open user database
 UserManagementView_Properties=&Properties
+UserManagementView_Source=Source
 UserManagementView_Type=Type
 UserManagementView_UnlockJobError=Cannot unlock user database
 UserManagementView_UnlockJobName=Unlock user database
index 2a8ea48..118b6a0 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certifik\u00E1t nebo RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Nelze aktualizovat u\u017Eivatelsk\u00FD \u00FA\u010Det
 Authentication_JobTitle=Aktualizovat objekt u\u017Eivatelsk\u00E1 datab\u00E1ze
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Mapov\u00E1n\u00ED \u00FAdaj\u016F certifik\u00E1tu
 Authentication_MustChangePassword=U\u017Eivatel mus\u00ED &zm\u011Bnit heslo p\u0159i p\u0159\u00ED\u0161t\u00EDm p\u0159ihl\u00E1\u0161en\u00ED
 Authentication_Password=NetXMS heslo
@@ -95,25 +96,41 @@ SystemRights_JobError=Nelze aktualizovat objekt u\u017Eivatel
 SystemRights_JobTitle=Aktualizovat objekt u\u017Eivatelsk\u00E1 datab\u00E1ze
 SystemRights_LoginAsMobile=P\u0159ihl\u00E1sit se jako mobiln\u00ED za\u0159\u00EDzen\u00ED
 SystemRights_ManageAgents=Spravovat konfigurace agent\u016F
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Spravovat soubory na serveru
 SystemRights_ManageImageLibrary=Manage Image Library
 SystemRights_ManageMappingTables=Spravovat mapovac\u00ED tabulky
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Spravovat bal\u00ED\u010Dky
 SystemRights_ManageScripts=Spravovat knihovnu skript\u016F
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=Spravovat u\u017Eivatele
 SystemRights_ReadFiles=\u010C\u00EDst soubory na serveru
 SystemRights_RegisterAgents=Registrovat agenty
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Poslat SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=Zobrazit log u\u017Eivatelsk\u00FDch operac\u00ED
 SystemRights_ViewEventConfig=Zobrazit konfiguraci \u0161ablon ud\u00E1lost\u00ED
 SystemRights_ViewEventLog=Zobrazit log ud\u00E1lost\u00ED
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=Zobrazit log SNMP trap\u016F
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Skupina
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=U\u017Eivatel
 UserManagementView_7=Aktualizovat seznam u\u017Eivatel\u016F
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Nelze zm\u011Bnit heslo
 UserManagementView_ChangePassword=Zm\u011Bnit heslo
 UserManagementView_ConfirmDeletePlural=Opravdu chcete smazat ozna\u010Den\u00E9 u\u017Eivatele
@@ -141,6 +158,7 @@ UserManagementView_Name=Jm\u00E9no
 UserManagementView_OpenJobError=Nelze zamknout u\u017Eivatelskou datab\u00E1zi
 UserManagementView_OpenJobName=Otev\u0159\u00EDt u\u017Eivatelskou datab\u00E1zi
 UserManagementView_Properties=&Vlastnosti
+UserManagementView_Source=Source
 UserManagementView_Type=Typ
 UserManagementView_UnlockJobError=Nelze odblokovat u\u017Eivatelskou datab\u00E1zi
 UserManagementView_UnlockJobName=Odblokovat u\u017Eivatelskou datab\u00E1zi
index 49df38e..ce766b8 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certificate or RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Cannot update user account
 Authentication_JobTitle=Update user database object
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Certificate mapping data
 Authentication_MustChangePassword=User must &change password at next logon
 Authentication_Password=NetXMS password
@@ -95,25 +96,41 @@ SystemRights_JobError=Cannot update user object
 SystemRights_JobTitle=Update user database object
 SystemRights_LoginAsMobile=Login as mobile device
 SystemRights_ManageAgents=Manage agent configurations
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Manage server files
 SystemRights_ManageImageLibrary=Manage Image Library
 SystemRights_ManageMappingTables=Manage mapping tables
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Manage packages
 SystemRights_ManageScripts=Manage script library
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=Manage users
 SystemRights_ReadFiles=Read server files
 SystemRights_RegisterAgents=Register agents
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Send SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=View audit log
 SystemRights_ViewEventConfig=View event templates configuration
 SystemRights_ViewEventLog=View event log
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=View SNMP trap log
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Group
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=User
 UserManagementView_7=Update user list
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Unable to change password
 UserManagementView_ChangePassword=Change password...
 UserManagementView_ConfirmDeletePlural=Do you really wish to delete selected users
@@ -141,6 +158,7 @@ UserManagementView_Name=Name
 UserManagementView_OpenJobError=Cannot lock user database
 UserManagementView_OpenJobName=Open user database
 UserManagementView_Properties=&Properties
+UserManagementView_Source=Source
 UserManagementView_Type=Type
 UserManagementView_UnlockJobError=Cannot unlock user database
 UserManagementView_UnlockJobName=Unlock user database
index f038866..7415062 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certificate or RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Cannot update user account
 Authentication_JobTitle=Update user database object
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Certificate mapping data
 Authentication_MustChangePassword=User must &change password at next logon
 Authentication_Password=NetXMS password
@@ -95,25 +96,41 @@ SystemRights_JobError=Cannot update user object
 SystemRights_JobTitle=Update user database object
 SystemRights_LoginAsMobile=Login as mobile device
 SystemRights_ManageAgents=Manage agent configurations
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Manage server files
 SystemRights_ManageImageLibrary=Manage Image Library
 SystemRights_ManageMappingTables=Manage mapping tables
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Manage packages
 SystemRights_ManageScripts=Manage script library
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=Manage users
 SystemRights_ReadFiles=Read server files
 SystemRights_RegisterAgents=Register agents
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Send SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=View audit log
 SystemRights_ViewEventConfig=View event templates configuration
 SystemRights_ViewEventLog=View event log
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=View SNMP trap log
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Group
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=User
 UserManagementView_7=Update user list
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Unable to change password
 UserManagementView_ChangePassword=Change Password
 UserManagementView_ConfirmDeletePlural=Do you really wish to delete selected users
@@ -141,6 +158,7 @@ UserManagementView_Name=Name
 UserManagementView_OpenJobError=Cannot lock user database
 UserManagementView_OpenJobName=Open user database
 UserManagementView_Properties=&Properties
+UserManagementView_Source=Source
 UserManagementView_Type=Type
 UserManagementView_UnlockJobError=Cannot unlock user database
 UserManagementView_UnlockJobName=Unlock user database
index 49df38e..ce766b8 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certificate or RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Cannot update user account
 Authentication_JobTitle=Update user database object
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Certificate mapping data
 Authentication_MustChangePassword=User must &change password at next logon
 Authentication_Password=NetXMS password
@@ -95,25 +96,41 @@ SystemRights_JobError=Cannot update user object
 SystemRights_JobTitle=Update user database object
 SystemRights_LoginAsMobile=Login as mobile device
 SystemRights_ManageAgents=Manage agent configurations
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Manage server files
 SystemRights_ManageImageLibrary=Manage Image Library
 SystemRights_ManageMappingTables=Manage mapping tables
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Manage packages
 SystemRights_ManageScripts=Manage script library
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=Manage users
 SystemRights_ReadFiles=Read server files
 SystemRights_RegisterAgents=Register agents
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Send SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=View audit log
 SystemRights_ViewEventConfig=View event templates configuration
 SystemRights_ViewEventLog=View event log
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=View SNMP trap log
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Group
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=User
 UserManagementView_7=Update user list
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Unable to change password
 UserManagementView_ChangePassword=Change password...
 UserManagementView_ConfirmDeletePlural=Do you really wish to delete selected users
@@ -141,6 +158,7 @@ UserManagementView_Name=Name
 UserManagementView_OpenJobError=Cannot lock user database
 UserManagementView_OpenJobName=Open user database
 UserManagementView_Properties=&Properties
+UserManagementView_Source=Source
 UserManagementView_Type=Type
 UserManagementView_UnlockJobError=Cannot unlock user database
 UserManagementView_UnlockJobName=Unlock user database
index e994bb0..2bdfd3e 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=\u0421\u0435\u0440\u0442\u0438\u0444\u0438\u0
 Authentication_CommonName=\u0418\u043c\u044f (CN)
 Authentication_JobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
 Authentication_JobTitle=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=\u0414\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438
 Authentication_MustChangePassword=\u0422\u0440\u0435\u0431\u043e\u0432\u0430\u0442\u044c &\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u043f\u0430\u0440\u043e\u043b\u044f \u043f\u0440\u0438 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438
 Authentication_Password=\u041f\u0430\u0440\u043e\u043b\u044c
@@ -95,25 +96,41 @@ SystemRights_JobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u04
 SystemRights_JobTitle=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
 SystemRights_LoginAsMobile=\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0442\u044c\u0441\u044f \u043a\u0430\u043a \u043c\u043e\u0431\u0438\u043b\u044c\u043d\u043e\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e
 SystemRights_ManageAgents=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430\u043c\u0438 \u0430\u0433\u0435\u043d\u0442\u0430
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u0432\u043e\u0434\u043d\u044b\u043c\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u043c\u0438 \u043c\u0435\u0442\u0440\u0438\u043a
 SystemRights_ManageFiles=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u0430\u043c\u0438 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435
 SystemRights_ManageImageLibrary=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u043e\u0439 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0439
 SystemRights_ManageMappingTables=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u043c\u0438 \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0439
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u0430\u043a\u0435\u0442\u0430\u043c\u0438
 SystemRights_ManageScripts=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u043e\u0439 \u0441\u0446\u0435\u043d\u0430\u0440\u0438\u0435\u0432
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c\u0438
 SystemRights_ReadFiles=\u0427\u0442\u0435\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u043e\u0432 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430
 SystemRights_RegisterAgents=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u0430\u0433\u0435\u043d\u0442\u043e\u0432
 SystemRights_ReportingServerAccess=\u0414\u043e\u0441\u0442\u0443\u043f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 \u043e\u0442\u0447\u0435\u0442\u043e\u0432
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=\u041e\u0442\u043f\u0440\u0430\u0432\u043a\u0430 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 (SMS)
 SystemRights_UnlinkTicket=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0441\u0432\u044f\u0437\u0438 \u0441 \u0438\u043d\u0446\u0438\u0434\u0435\u043d\u0442\u043e\u043c \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0435 \u0441\u043b\u0443\u0436\u0431\u044b \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0438
 SystemRights_ViewAuditLog=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u0430\u0443\u0434\u0438\u0442\u0430
 SystemRights_ViewEventConfig=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a \u0448\u0430\u0431\u043b\u043e\u043d\u043e\u0432 \u0441\u043e\u0431\u044b\u0442\u0438\u0439
 SystemRights_ViewEventLog=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u0441\u043e\u0431\u044b\u0442\u0438\u0439
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0436\u0443\u0440\u043d\u0430\u043b\u0430 SNMP Traps
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=\u0413\u0440\u0443\u043f\u043f\u0430
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
 UserManagementView_7=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043f\u0438\u0441\u043a\u0430 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c
 UserManagementView_ChangePassword=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c
 UserManagementView_ConfirmDeletePlural=\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439?
@@ -141,6 +158,7 @@ UserManagementView_Name=\u0418\u043c\u044f \u0432\u0445\u043e\u0434\u0430
 UserManagementView_OpenJobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0431\u0430\u0437\u0443 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
 UserManagementView_OpenJobName=\u041e\u0442\u043a\u0440\u044b\u0442\u0438\u0435 \u0431\u0430\u0437\u044b \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
 UserManagementView_Properties=&\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430
+UserManagementView_Source=Source
 UserManagementView_Type=\u0422\u0438\u043f
 UserManagementView_UnlockJobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0440\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0431\u0430\u0437\u0443 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
 UserManagementView_UnlockJobName=\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0431\u0430\u0437\u044b \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
index f038866..7415062 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certificate or RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Cannot update user account
 Authentication_JobTitle=Update user database object
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Certificate mapping data
 Authentication_MustChangePassword=User must &change password at next logon
 Authentication_Password=NetXMS password
@@ -95,25 +96,41 @@ SystemRights_JobError=Cannot update user object
 SystemRights_JobTitle=Update user database object
 SystemRights_LoginAsMobile=Login as mobile device
 SystemRights_ManageAgents=Manage agent configurations
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Manage server files
 SystemRights_ManageImageLibrary=Manage Image Library
 SystemRights_ManageMappingTables=Manage mapping tables
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Manage packages
 SystemRights_ManageScripts=Manage script library
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=Manage users
 SystemRights_ReadFiles=Read server files
 SystemRights_RegisterAgents=Register agents
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Send SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=View audit log
 SystemRights_ViewEventConfig=View event templates configuration
 SystemRights_ViewEventLog=View event log
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=View SNMP trap log
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Group
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=User
 UserManagementView_7=Update user list
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Unable to change password
 UserManagementView_ChangePassword=Change Password
 UserManagementView_ConfirmDeletePlural=Do you really wish to delete selected users
@@ -141,6 +158,7 @@ UserManagementView_Name=Name
 UserManagementView_OpenJobError=Cannot lock user database
 UserManagementView_OpenJobName=Open user database
 UserManagementView_Properties=&Properties
+UserManagementView_Source=Source
 UserManagementView_Type=Type
 UserManagementView_UnlockJobError=Cannot unlock user database
 UserManagementView_UnlockJobName=Unlock user database
index 658ee53..b396905 100644 (file)
@@ -146,7 +146,7 @@ public class Authentication extends PropertyPage
          checkChangePassword.setEnabled(false);
          checkFixedPassword.setEnabled(false);
          comboAuthMethod.setEnabled(false);
-         comboAuthMethod.add("LDAP password");
+         comboAuthMethod.add(Messages.get().Authentication_LDAPPassword);
          comboAuthMethod.select(5);
          comboMappingMethod.setEnabled(false);
          textMappingData.setEnabled(false);
index 1318ee7..cd7f4f4 100644 (file)
@@ -77,7 +77,7 @@ public class SystemRights extends PropertyPage
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_EVENT_LOG, Messages.get().SystemRights_ViewEventLog);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_AUDIT_LOG, Messages.get().SystemRights_ViewAuditLog);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_TRAP_LOG, Messages.get().SystemRights_ViewTrapLog);
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_SYSLOG, "View syslog");
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_SYSLOG, Messages.get().SystemRights_ViewSyslog);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_MANAGE_MAPPING_TBLS, Messages.get().SystemRights_ManageMappingTables);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SERVER_CONFIG, Messages.get().SystemRights_EditServerConfig);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_READ_SERVER_FILES, Messages.get().SystemRights_ReadFiles);
@@ -91,12 +91,12 @@ public class SystemRights extends PropertyPage
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_MOBILE_DEVICE_LOGIN, Messages.get().SystemRights_LoginAsMobile);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_MANAGE_IMAGE_LIB, Messages.get().SystemRights_ManageImageLibrary);
       addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_REPORTING_SERVER, Messages.get().SystemRights_ReportingServerAccess);
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_USER_SCHEDULED_TASKS, "Manage user scheduled tasks");
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_OWN_SCHEDULED_TASKS, "Manage own scheduled tasks");
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_ALL_SCHEDULED_TASKS, "Manage all scheduled tasks");
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_SCRIPT, "Schedule script task");
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_FILE_UPLOAD, "Schedule file upload task"); 
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_MAINTENANCE, "Schedule object maintenance time interval"); 
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_USER_SCHEDULED_TASKS, Messages.get().SystemRights_ManageUserScheduledTasks);
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_OWN_SCHEDULED_TASKS, Messages.get().SystemRights_ManageOwnScheduledTasks);
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_ALL_SCHEDULED_TASKS, Messages.get().SystemRights_ManageAllScheduledTasks);
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_SCRIPT, Messages.get().SystemRights_ScheduleScriptTask);
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_FILE_UPLOAD, Messages.get().SystemRights_ScheduleFileUploadTask); 
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_MAINTENANCE, Messages.get().SystemRights_ScheduleObjectMaint); 
                
                return dialogArea;
        }
index 41a4fd4..a0f3494 100644 (file)
@@ -105,8 +105,8 @@ public class UserManagementView extends ViewPart
                      Messages.get().UserManagementView_Type, 
                      Messages.get().UserManagementView_FullName, 
                      Messages.get().UserManagementView_Description, 
-                     "Source"
-                     "Authentication"
+                     Messages.get().UserManagementView_Source
+                     Messages.get().UserManagementView_Authentication
                      Messages.get().UserManagementView_GUID 
                   };
                final int[] widths = { 100, 80, 180, 250, 80, 170, 250 };
index a47bc25..e54f5f6 100644 (file)
@@ -34,11 +34,11 @@ import org.netxms.ui.eclipse.usermanager.views.UserManagementView;
 public class UserLabelProvider extends DecoratingLabelProvider implements ITableLabelProvider
 {
    private static final String[] AUTH_METHOD = { 
-      "Password"
-      "RADIUS"
-      "Certificate"
-      "Certificate or password"
-      "Certificate or RADIUS" 
+      Messages.get().UserLabelProvider_Password
+      Messages.get().UserLabelProvider_RADIUS
+      Messages.get().UserLabelProvider_Certificate
+      Messages.get().UserLabelProvider_CertificateOrPassword
+      Messages.get().UserLabelProvider_CertificateOrRADIUS 
    };
    
    /**
@@ -68,14 +68,14 @@ public class UserLabelProvider extends DecoratingLabelProvider implements ITable
                {
          case UserManagementView.COLUMN_AUTH_METHOD:
             if (!(element instanceof User))
-               return "";
+               return ""; //$NON-NLS-1$
             try
             {
                return AUTH_METHOD[((User)element).getAuthMethod()];
             }
             catch(ArrayIndexOutOfBoundsException e)
             {
-               return "Unknown";
+               return Messages.get().UserLabelProvider_Unknown;
             }
          case UserManagementView.COLUMN_DESCRIPTION:
             return ((AbstractUserObject)element).getDescription();
@@ -86,7 +86,7 @@ public class UserLabelProvider extends DecoratingLabelProvider implements ITable
                        case UserManagementView.COLUMN_NAME:
                                return ((AbstractUserObject)element).getName();
          case UserManagementView.COLUMN_SOURCE:
-            return ((((AbstractUserObject)element).getFlags() & AbstractUserObject.LDAP_USER) != 0) ? "LDAP" : "Local";
+            return ((((AbstractUserObject)element).getFlags() & AbstractUserObject.LDAP_USER) != 0) ? Messages.get().UserLabelProvider_LDAP : Messages.get().UserLabelProvider_Local;
                        case UserManagementView.COLUMN_TYPE:
                                return (element instanceof User) ? Messages.get().UserLabelProvider_User : Messages.get().UserLabelProvider_Group;
                }
index 7ea7ef5..1bbb35e 100644 (file)
@@ -18,6 +18,8 @@ menu.topology = &Topology
 tab.name.AddressMap = Address Map
 tab.name.Ports = Ports
 view.name.ConnSearch = Connection Search
+view.name.MACAddressTable = MAC Address Table
+view.name.RadioIfs = Radio Interfaces
+view.name.RoutingTable = Routing Table
 view.name.VlanView = VLAN View
 view.name.WirelessStations = Wireless Stations
-view.name.RadioIfs = Radio Interfaces
index 47031bd..7c960fa 100644 (file)
@@ -17,6 +17,8 @@ menu.topology=&Topologie
 tab.name.AddressMap=Address Map
 tab.name.Ports=Porty
 view.name.ConnSearch=Vyhled\u00e1v\u00e1n\u00ed spojen\u00ed
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs=R\u00e1diov\u00e1 rozhran\u00ed
+view.name.RoutingTable= Routing Table
 view.name.VlanView=VLAN pohled
 view.name.WirelessStations=Bezdr\u00e1tov\u00e9 stanice
index 6449eab..391e67b 100644 (file)
@@ -17,6 +17,8 @@ menu.topology= &Topology
 tab.name.AddressMap= Address Map
 tab.name.Ports= Ports
 view.name.ConnSearch= Connection Search
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs= Radio Interfaces
+view.name.RoutingTable= Routing Table
 view.name.VlanView= VLAN View
 view.name.WirelessStations= Wireless Stations
index e7066f6..0361c35 100644 (file)
@@ -17,6 +17,8 @@ menu.topology=&Topology
 tab.name.AddressMap=Address Map
 tab.name.Ports=Ports
 view.name.ConnSearch=Connection Search
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs=Radio Interfaces
+view.name.RoutingTable= Routing Table
 view.name.VlanView=VLAN View
 view.name.WirelessStations=Wireless Stations
index 6449eab..391e67b 100644 (file)
@@ -17,6 +17,8 @@ menu.topology= &Topology
 tab.name.AddressMap= Address Map
 tab.name.Ports= Ports
 view.name.ConnSearch= Connection Search
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs= Radio Interfaces
+view.name.RoutingTable= Routing Table
 view.name.VlanView= VLAN View
 view.name.WirelessStations= Wireless Stations
index 9d809a0..fb2c7d6 100644 (file)
@@ -17,6 +17,8 @@ menu.topology=&\u0422\u043e\u043f\u043e\u043b\u043e\u0433\u0438\u044f
 tab.name.AddressMap=\u041a\u0430\u0440\u0442\u0430 \u0430\u0434\u0440\u0435\u0441\u043e\u0432
 tab.name.Ports=\u041f\u043e\u0440\u0442\u044b
 view.name.ConnSearch=\u0422\u043e\u0447\u043a\u0438 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs=\u0411\u0435\u0441\u043f\u0440\u043e\u0432\u043e\u0434\u043d\u044b\u0435 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u044b
+view.name.RoutingTable= Routing Table
 view.name.VlanView=\u0421\u043f\u0438\u0441\u043e\u043a VLAN
 view.name.WirelessStations=\u0411\u0435\u0441\u043f\u0440\u043e\u0432\u043e\u0434\u043d\u044b\u0435 \u0441\u0442\u0430\u043d\u0446\u0438\u0438
index e7066f6..0361c35 100644 (file)
@@ -17,6 +17,8 @@ menu.topology=&Topology
 tab.name.AddressMap=Address Map
 tab.name.Ports=Ports
 view.name.ConnSearch=Connection Search
+view.name.MACAddressTable= MAC Address Table
 view.name.RadioIfs=Radio Interfaces
+view.name.RoutingTable= Routing Table
 view.name.VlanView=VLAN View
 view.name.WirelessStations=Wireless Stations
index 0f11f25..2c86146 100644 (file)
             class="org.netxms.ui.eclipse.topology.views.RoutingTableView"
             icon="icons/routing_table.gif"
             id="org.netxms.ui.eclipse.topology.views.RoutingTableView"
-            name="Routing Table"
+            name="%view.name.RoutingTable"
             restorable="true">
       </view>
       <view
             class="org.netxms.ui.eclipse.topology.views.SwitchForwardingDatabaseView"
             icon="icons/routing_table.gif"
             id="org.netxms.ui.eclipse.topology.views.SwitchForwardingDatabaseView"
-            name="MAC Address Table"
+            name="%view.name.MACAddressTable"
             restorable="true">
       </view>
    </extension>
index e2479b3..9afb8dd 100644 (file)
@@ -23,6 +23,9 @@ public class Messages extends NLS
    public String EnterMacAddressDlg_IncorrectMacAddress;
    public String EnterMacAddressDlg_MacAddress;
    public String EnterMacAddressDlg_Title;
+   public String FDBLabelProvider_Dynamic;
+   public String FDBLabelProvider_Static;
+   public String FDBLabelProvider_Unknown;
    public String FindConnectionPoint_JobError;
    public String FindConnectionPoint_JobTitle;
    public String FindIpAddress_JobError;
@@ -92,6 +95,7 @@ public class Messages extends NLS
    public String SwitchForwardingDatabaseView_ColMacAddr;
    public String SwitchForwardingDatabaseView_ColNode;
    public String SwitchForwardingDatabaseView_ColPort;
+   public String SwitchForwardingDatabaseView_ColType;
    public String SwitchForwardingDatabaseView_ColVlan;
    public String SwitchForwardingDatabaseView_ConIface;
    public String SwitchForwardingDatabaseView_JobError;
index 56f27c6..aaee45f 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Error
 EnterMacAddressDlg_IncorrectMacAddress=MAC address entered is incorrect. Please enter correct MAC address.
 EnterMacAddressDlg_MacAddress=MAC address
 EnterMacAddressDlg_Title=Enter MAC Address
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Cannot get conection point information
 FindConnectionPoint_JobTitle=Find connection point for object %d
 FindIpAddress_JobError=Search for IP address %s failed
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index 8ec927b..e9c96b7 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Chyba
 EnterMacAddressDlg_IncorrectMacAddress=Vlo\u017Een\u00E1 MAC adresa je \u0161patn\u00E1. Pros\u00EDm vlo\u017Ete spr\u00E1vnou MAC adresu.
 EnterMacAddressDlg_MacAddress=MAC adressa
 EnterMacAddressDlg_Title=Vlo\u017Ete MAC adresu
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Nelze z\u00EDskat informace p\u0159\u00EDpojn\u00E9ho bodu
 FindConnectionPoint_JobTitle=Nalezen p\u0159\u00EDpojn\u00FD bod pro objekt %d
 FindIpAddress_JobError=Vyhled\u00E1v\u00E1n\u00ED IP adresy %s selhalo
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index 56f27c6..aaee45f 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Error
 EnterMacAddressDlg_IncorrectMacAddress=MAC address entered is incorrect. Please enter correct MAC address.
 EnterMacAddressDlg_MacAddress=MAC address
 EnterMacAddressDlg_Title=Enter MAC Address
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Cannot get conection point information
 FindConnectionPoint_JobTitle=Find connection point for object %d
 FindIpAddress_JobError=Search for IP address %s failed
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index 56f27c6..aaee45f 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Error
 EnterMacAddressDlg_IncorrectMacAddress=MAC address entered is incorrect. Please enter correct MAC address.
 EnterMacAddressDlg_MacAddress=MAC address
 EnterMacAddressDlg_Title=Enter MAC Address
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Cannot get conection point information
 FindConnectionPoint_JobTitle=Find connection point for object %d
 FindIpAddress_JobError=Search for IP address %s failed
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index 56f27c6..aaee45f 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Error
 EnterMacAddressDlg_IncorrectMacAddress=MAC address entered is incorrect. Please enter correct MAC address.
 EnterMacAddressDlg_MacAddress=MAC address
 EnterMacAddressDlg_Title=Enter MAC Address
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Cannot get conection point information
 FindConnectionPoint_JobTitle=Find connection point for object %d
 FindIpAddress_JobError=Search for IP address %s failed
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index e048150..c89a863 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=\u041e\u0448\u0438\u0431\u043a\u0430
 EnterMacAddressDlg_IncorrectMacAddress=\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 MAC \u0430\u0434\u0440\u0435\u0441. \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441.
 EnterMacAddressDlg_MacAddress=MAC -\u0430\u0434\u0440\u0435\u0441
 EnterMacAddressDlg_Title=\u0417\u0430\u0434\u0430\u043d\u0438\u0435 MAC \u0430\u0434\u0440\u0435\u0441\u0430
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043e \u0442\u043e\u0447\u043a\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f
 FindConnectionPoint_JobTitle=\u041f\u043e\u0438\u0441\u043a \u0442\u043e\u0447\u043a\u0438 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043e\u0431\u044a\u0435\u043a\u0442\u0430 %d
 FindIpAddress_JobError=IP \u0430\u0434\u0440\u0435\u0441 %s \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=\u0410\u0434\u0440\u0435\u0441 \u043f\u043e\u0434
 SwitchForwardingDatabaseView_ColMacAddr=MAC \u0430\u0434\u0440\u0435\u0441
 SwitchForwardingDatabaseView_ColNode=\u0423\u0437\u0435\u043b
 SwitchForwardingDatabaseView_ColPort=\u041f\u043e\u0440\u0442
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=\u0418\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441
 SwitchForwardingDatabaseView_JobError=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0431\u0430\u0437\u044b \u0430\u0434\u0440\u0435\u0441\u0430\u0446\u0438\u0438 \u043a\u043e\u043c\u043c\u0443\u0442\u0430\u0442\u043e\u0440\u0430 \u0434\u043b\u044f \u0443\u0437\u043b\u0430 %s
index 56f27c6..aaee45f 100644 (file)
@@ -13,6 +13,9 @@ EnterMacAddressDlg_Error=Error
 EnterMacAddressDlg_IncorrectMacAddress=MAC address entered is incorrect. Please enter correct MAC address.
 EnterMacAddressDlg_MacAddress=MAC address
 EnterMacAddressDlg_Title=Enter MAC Address
+FDBLabelProvider_Dynamic=dynamic
+FDBLabelProvider_Static=static
+FDBLabelProvider_Unknown=unknown
 FindConnectionPoint_JobError=Cannot get conection point information
 FindConnectionPoint_JobTitle=Find connection point for object %d
 FindIpAddress_JobError=Search for IP address %s failed
@@ -82,6 +85,7 @@ SubnetAddressMap_SubnetAddress=Subnet address
 SwitchForwardingDatabaseView_ColMacAddr=MAC Address
 SwitchForwardingDatabaseView_ColNode=Node
 SwitchForwardingDatabaseView_ColPort=Port
+SwitchForwardingDatabaseView_ColType=Type
 SwitchForwardingDatabaseView_ColVlan=VLAN
 SwitchForwardingDatabaseView_ConIface=Interface
 SwitchForwardingDatabaseView_JobError=Cannot get switch forwarding database for node %s
index a6283ca..c68337e 100644 (file)
@@ -104,7 +104,7 @@ public class SwitchForwardingDatabaseView extends ViewPart
                      Messages.get().SwitchForwardingDatabaseView_ConIface, 
                      Messages.get().SwitchForwardingDatabaseView_ColVlan, 
                      Messages.get().SwitchForwardingDatabaseView_ColNode,
-                     "Type"
+                     Messages.get().SwitchForwardingDatabaseView_ColType
                   };
                final int[] widths = { 180, 100, 200, 100, 250, 110 };
                viewer = new SortableTableViewer(parent, names, widths, COLUMN_MAC_ADDRESS, SWT.DOWN, SWT.FULL_SELECTION | SWT.MULTI);
index 27436b5..07de914 100644 (file)
@@ -24,6 +24,7 @@ import org.eclipse.swt.graphics.Image;
 import org.netxms.client.NXCSession;
 import org.netxms.client.topology.FdbEntry;
 import org.netxms.ui.eclipse.shared.ConsoleSharedData;
+import org.netxms.ui.eclipse.topology.Messages;
 import org.netxms.ui.eclipse.topology.views.SwitchForwardingDatabaseView;
 
 /**
@@ -68,7 +69,7 @@ public class FDBLabelProvider extends LabelProvider implements ITableLabelProvid
                return ""; //$NON-NLS-1$
             return Integer.toString(e.getVlanId());
          case SwitchForwardingDatabaseView.COLUMN_TYPE:
-            return (e.getType() == 3) ? "dynamic" : ((e.getType() == 5) ? "static" : "unknown");
+            return (e.getType() == 3) ? Messages.get().FDBLabelProvider_Dynamic : ((e.getType() == 5) ? Messages.get().FDBLabelProvider_Static : Messages.get().FDBLabelProvider_Unknown);
       }
       return null;
    }
index b31ad43..d19156c 100644 (file)
@@ -20,6 +20,7 @@ public class Messages extends NLS
    public String Authentication_CommonName;
        public String Authentication_JobError;
        public String Authentication_JobTitle;
+   public String Authentication_LDAPPassword;
        public String Authentication_MappingData;
        public String Authentication_MustChangePassword;
        public String Authentication_Password;
@@ -106,24 +107,40 @@ public class Messages extends NLS
        public String SystemRights_JobTitle;
        public String SystemRights_LoginAsMobile;
        public String SystemRights_ManageAgents;
+   public String SystemRights_ManageAllScheduledTasks;
    public String SystemRights_ManageDCISummaryTables;
        public String SystemRights_ManageFiles;
        public String SystemRights_ManageMappingTables;
+   public String SystemRights_ManageOwnScheduledTasks;
        public String SystemRights_ManagePackages;
        public String SystemRights_ManageScripts;
        public String SystemRights_ManageUsers;
+   public String SystemRights_ManageUserScheduledTasks;
        public String SystemRights_ReadFiles;
        public String SystemRights_RegisterAgents;
    public String SystemRights_ReportingServerAccess;
-       public String SystemRights_SendSMS;
+       public String SystemRights_ScheduleFileUploadTask;
+   public String SystemRights_ScheduleObjectMaint;
+   public String SystemRights_ScheduleScriptTask;
+   public String SystemRights_SendSMS;
    public String SystemRights_UnlinkTicket;
        public String SystemRights_ViewAuditLog;
        public String SystemRights_ViewEventConfig;
        public String SystemRights_ViewEventLog;
+   public String SystemRights_ViewSyslog;
        public String SystemRights_ViewTrapLog;
-       public String UserLabelProvider_Group;
-       public String UserLabelProvider_User;
+       public String UserLabelProvider_Certificate;
+   public String UserLabelProvider_CertificateOrPassword;
+   public String UserLabelProvider_CertificateOrRADIUS;
+   public String UserLabelProvider_Group;
+   public String UserLabelProvider_LDAP;
+   public String UserLabelProvider_Local;
+   public String UserLabelProvider_Password;
+   public String UserLabelProvider_RADIUS;
+       public String UserLabelProvider_Unknown;
+   public String UserLabelProvider_User;
        public String UserManagementView_7;
+   public String UserManagementView_Authentication;
        public String UserManagementView_CannotChangePassword;
        public String UserManagementView_ChangePassword;
        public String UserManagementView_ConfirmDeletePlural;
@@ -151,6 +168,7 @@ public class Messages extends NLS
        public String UserManagementView_OpenJobError;
        public String UserManagementView_OpenJobName;
        public String UserManagementView_Properties;
+   public String UserManagementView_Source;
        public String UserManagementView_Type;
        public String UserManagementView_UnlockJobError;
        public String UserManagementView_UnlockJobName;
index 7a1b0b9..da6ee99 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certificate or RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Cannot update user account
 Authentication_JobTitle=Update user database object
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Certificate mapping data
 Authentication_MustChangePassword=User must &change password at next logon
 Authentication_Password=NetXMS password
@@ -96,24 +97,40 @@ SystemRights_JobError=Cannot update user object
 SystemRights_JobTitle=Update user database object
 SystemRights_LoginAsMobile=Login as mobile device
 SystemRights_ManageAgents=Manage agent configurations
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Manage server files
 SystemRights_ManageMappingTables=Manage mapping tables
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Manage packages
 SystemRights_ManageScripts=Manage script library
 SystemRights_ManageUsers=Manage users
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ReadFiles=Read server files
 SystemRights_RegisterAgents=Register agents
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Send SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=View audit log
 SystemRights_ViewEventConfig=View event templates configuration
 SystemRights_ViewEventLog=View event log
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=View SNMP trap log
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Group
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=User
 UserManagementView_7=Update user list
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Unable to change password
 UserManagementView_ChangePassword=Change password...
 UserManagementView_ConfirmDeletePlural=Do you really wish to delete selected users
@@ -141,6 +158,7 @@ UserManagementView_Name=Name
 UserManagementView_OpenJobError=Cannot lock user database
 UserManagementView_OpenJobName=Open user database
 UserManagementView_Properties=&Properties
+UserManagementView_Source=Source
 UserManagementView_Type=Type
 UserManagementView_UnlockJobError=Cannot unlock user database
 UserManagementView_UnlockJobName=Unlock user database
index 2a8ea48..118b6a0 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certifik\u00E1t nebo RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Nelze aktualizovat u\u017Eivatelsk\u00FD \u00FA\u010Det
 Authentication_JobTitle=Aktualizovat objekt u\u017Eivatelsk\u00E1 datab\u00E1ze
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Mapov\u00E1n\u00ED \u00FAdaj\u016F certifik\u00E1tu
 Authentication_MustChangePassword=U\u017Eivatel mus\u00ED &zm\u011Bnit heslo p\u0159i p\u0159\u00ED\u0161t\u00EDm p\u0159ihl\u00E1\u0161en\u00ED
 Authentication_Password=NetXMS heslo
@@ -95,25 +96,41 @@ SystemRights_JobError=Nelze aktualizovat objekt u\u017Eivatel
 SystemRights_JobTitle=Aktualizovat objekt u\u017Eivatelsk\u00E1 datab\u00E1ze
 SystemRights_LoginAsMobile=P\u0159ihl\u00E1sit se jako mobiln\u00ED za\u0159\u00EDzen\u00ED
 SystemRights_ManageAgents=Spravovat konfigurace agent\u016F
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Spravovat soubory na serveru
 SystemRights_ManageImageLibrary=Manage Image Library
 SystemRights_ManageMappingTables=Spravovat mapovac\u00ED tabulky
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Spravovat bal\u00ED\u010Dky
 SystemRights_ManageScripts=Spravovat knihovnu skript\u016F
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=Spravovat u\u017Eivatele
 SystemRights_ReadFiles=\u010C\u00EDst soubory na serveru
 SystemRights_RegisterAgents=Registrovat agenty
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Poslat SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=Zobrazit log u\u017Eivatelsk\u00FDch operac\u00ED
 SystemRights_ViewEventConfig=Zobrazit konfiguraci \u0161ablon ud\u00E1lost\u00ED
 SystemRights_ViewEventLog=Zobrazit log ud\u00E1lost\u00ED
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=Zobrazit log SNMP trap\u016F
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Skupina
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=U\u017Eivatel
 UserManagementView_7=Aktualizovat seznam u\u017Eivatel\u016F
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Nelze zm\u011Bnit heslo
 UserManagementView_ChangePassword=Zm\u011Bnit heslo
 UserManagementView_ConfirmDeletePlural=Opravdu chcete smazat ozna\u010Den\u00E9 u\u017Eivatele
@@ -141,6 +158,7 @@ UserManagementView_Name=Jm\u00E9no
 UserManagementView_OpenJobError=Nelze zamknout u\u017Eivatelskou datab\u00E1zi
 UserManagementView_OpenJobName=Otev\u0159\u00EDt u\u017Eivatelskou datab\u00E1zi
 UserManagementView_Properties=&Vlastnosti
+UserManagementView_Source=Source
 UserManagementView_Type=Typ
 UserManagementView_UnlockJobError=Nelze odblokovat u\u017Eivatelskou datab\u00E1zi
 UserManagementView_UnlockJobName=Odblokovat u\u017Eivatelskou datab\u00E1zi
index 49df38e..ce766b8 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certificate or RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Cannot update user account
 Authentication_JobTitle=Update user database object
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Certificate mapping data
 Authentication_MustChangePassword=User must &change password at next logon
 Authentication_Password=NetXMS password
@@ -95,25 +96,41 @@ SystemRights_JobError=Cannot update user object
 SystemRights_JobTitle=Update user database object
 SystemRights_LoginAsMobile=Login as mobile device
 SystemRights_ManageAgents=Manage agent configurations
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Manage server files
 SystemRights_ManageImageLibrary=Manage Image Library
 SystemRights_ManageMappingTables=Manage mapping tables
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Manage packages
 SystemRights_ManageScripts=Manage script library
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=Manage users
 SystemRights_ReadFiles=Read server files
 SystemRights_RegisterAgents=Register agents
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Send SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=View audit log
 SystemRights_ViewEventConfig=View event templates configuration
 SystemRights_ViewEventLog=View event log
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=View SNMP trap log
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Group
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=User
 UserManagementView_7=Update user list
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Unable to change password
 UserManagementView_ChangePassword=Change password...
 UserManagementView_ConfirmDeletePlural=Do you really wish to delete selected users
@@ -141,6 +158,7 @@ UserManagementView_Name=Name
 UserManagementView_OpenJobError=Cannot lock user database
 UserManagementView_OpenJobName=Open user database
 UserManagementView_Properties=&Properties
+UserManagementView_Source=Source
 UserManagementView_Type=Type
 UserManagementView_UnlockJobError=Cannot unlock user database
 UserManagementView_UnlockJobName=Unlock user database
index f038866..7415062 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certificate or RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Cannot update user account
 Authentication_JobTitle=Update user database object
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Certificate mapping data
 Authentication_MustChangePassword=User must &change password at next logon
 Authentication_Password=NetXMS password
@@ -95,25 +96,41 @@ SystemRights_JobError=Cannot update user object
 SystemRights_JobTitle=Update user database object
 SystemRights_LoginAsMobile=Login as mobile device
 SystemRights_ManageAgents=Manage agent configurations
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Manage server files
 SystemRights_ManageImageLibrary=Manage Image Library
 SystemRights_ManageMappingTables=Manage mapping tables
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Manage packages
 SystemRights_ManageScripts=Manage script library
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=Manage users
 SystemRights_ReadFiles=Read server files
 SystemRights_RegisterAgents=Register agents
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Send SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=View audit log
 SystemRights_ViewEventConfig=View event templates configuration
 SystemRights_ViewEventLog=View event log
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=View SNMP trap log
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Group
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=User
 UserManagementView_7=Update user list
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Unable to change password
 UserManagementView_ChangePassword=Change Password
 UserManagementView_ConfirmDeletePlural=Do you really wish to delete selected users
@@ -141,6 +158,7 @@ UserManagementView_Name=Name
 UserManagementView_OpenJobError=Cannot lock user database
 UserManagementView_OpenJobName=Open user database
 UserManagementView_Properties=&Properties
+UserManagementView_Source=Source
 UserManagementView_Type=Type
 UserManagementView_UnlockJobError=Cannot unlock user database
 UserManagementView_UnlockJobName=Unlock user database
index 49df38e..ce766b8 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certificate or RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Cannot update user account
 Authentication_JobTitle=Update user database object
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Certificate mapping data
 Authentication_MustChangePassword=User must &change password at next logon
 Authentication_Password=NetXMS password
@@ -95,25 +96,41 @@ SystemRights_JobError=Cannot update user object
 SystemRights_JobTitle=Update user database object
 SystemRights_LoginAsMobile=Login as mobile device
 SystemRights_ManageAgents=Manage agent configurations
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Manage server files
 SystemRights_ManageImageLibrary=Manage Image Library
 SystemRights_ManageMappingTables=Manage mapping tables
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Manage packages
 SystemRights_ManageScripts=Manage script library
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=Manage users
 SystemRights_ReadFiles=Read server files
 SystemRights_RegisterAgents=Register agents
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Send SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=View audit log
 SystemRights_ViewEventConfig=View event templates configuration
 SystemRights_ViewEventLog=View event log
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=View SNMP trap log
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Group
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=User
 UserManagementView_7=Update user list
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Unable to change password
 UserManagementView_ChangePassword=Change password...
 UserManagementView_ConfirmDeletePlural=Do you really wish to delete selected users
@@ -141,6 +158,7 @@ UserManagementView_Name=Name
 UserManagementView_OpenJobError=Cannot lock user database
 UserManagementView_OpenJobName=Open user database
 UserManagementView_Properties=&Properties
+UserManagementView_Source=Source
 UserManagementView_Type=Type
 UserManagementView_UnlockJobError=Cannot unlock user database
 UserManagementView_UnlockJobName=Unlock user database
index e994bb0..2bdfd3e 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=\u0421\u0435\u0440\u0442\u0438\u0444\u0438\u0
 Authentication_CommonName=\u0418\u043c\u044f (CN)
 Authentication_JobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
 Authentication_JobTitle=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=\u0414\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438
 Authentication_MustChangePassword=\u0422\u0440\u0435\u0431\u043e\u0432\u0430\u0442\u044c &\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u043f\u0430\u0440\u043e\u043b\u044f \u043f\u0440\u0438 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438
 Authentication_Password=\u041f\u0430\u0440\u043e\u043b\u044c
@@ -95,25 +96,41 @@ SystemRights_JobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u04
 SystemRights_JobTitle=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
 SystemRights_LoginAsMobile=\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0442\u044c\u0441\u044f \u043a\u0430\u043a \u043c\u043e\u0431\u0438\u043b\u044c\u043d\u043e\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e
 SystemRights_ManageAgents=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430\u043c\u0438 \u0430\u0433\u0435\u043d\u0442\u0430
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u0432\u043e\u0434\u043d\u044b\u043c\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u043c\u0438 \u043c\u0435\u0442\u0440\u0438\u043a
 SystemRights_ManageFiles=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u0430\u043c\u0438 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435
 SystemRights_ManageImageLibrary=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u043e\u0439 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0439
 SystemRights_ManageMappingTables=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u043c\u0438 \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0439
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u0430\u043a\u0435\u0442\u0430\u043c\u0438
 SystemRights_ManageScripts=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u043e\u0439 \u0441\u0446\u0435\u043d\u0430\u0440\u0438\u0435\u0432
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c\u0438
 SystemRights_ReadFiles=\u0427\u0442\u0435\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u043e\u0432 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430
 SystemRights_RegisterAgents=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u0430\u0433\u0435\u043d\u0442\u043e\u0432
 SystemRights_ReportingServerAccess=\u0414\u043e\u0441\u0442\u0443\u043f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 \u043e\u0442\u0447\u0435\u0442\u043e\u0432
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=\u041e\u0442\u043f\u0440\u0430\u0432\u043a\u0430 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 (SMS)
 SystemRights_UnlinkTicket=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0441\u0432\u044f\u0437\u0438 \u0441 \u0438\u043d\u0446\u0438\u0434\u0435\u043d\u0442\u043e\u043c \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0435 \u0441\u043b\u0443\u0436\u0431\u044b \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0438
 SystemRights_ViewAuditLog=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u0430\u0443\u0434\u0438\u0442\u0430
 SystemRights_ViewEventConfig=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a \u0448\u0430\u0431\u043b\u043e\u043d\u043e\u0432 \u0441\u043e\u0431\u044b\u0442\u0438\u0439
 SystemRights_ViewEventLog=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u0441\u043e\u0431\u044b\u0442\u0438\u0439
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0436\u0443\u0440\u043d\u0430\u043b\u0430 SNMP Traps
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=\u0413\u0440\u0443\u043f\u043f\u0430
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
 UserManagementView_7=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043f\u0438\u0441\u043a\u0430 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c
 UserManagementView_ChangePassword=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c
 UserManagementView_ConfirmDeletePlural=\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439?
@@ -141,6 +158,7 @@ UserManagementView_Name=\u0418\u043c\u044f \u0432\u0445\u043e\u0434\u0430
 UserManagementView_OpenJobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0431\u0430\u0437\u0443 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
 UserManagementView_OpenJobName=\u041e\u0442\u043a\u0440\u044b\u0442\u0438\u0435 \u0431\u0430\u0437\u044b \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
 UserManagementView_Properties=&\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430
+UserManagementView_Source=Source
 UserManagementView_Type=\u0422\u0438\u043f
 UserManagementView_UnlockJobError=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0440\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0431\u0430\u0437\u0443 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
 UserManagementView_UnlockJobName=\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0431\u0430\u0437\u044b \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
index f038866..7415062 100644 (file)
@@ -10,6 +10,7 @@ Authentication_CertificateOrRADIUS=Certificate or RADIUS
 Authentication_CommonName=Common name
 Authentication_JobError=Cannot update user account
 Authentication_JobTitle=Update user database object
+Authentication_LDAPPassword=LDAP password
 Authentication_MappingData=Certificate mapping data
 Authentication_MustChangePassword=User must &change password at next logon
 Authentication_Password=NetXMS password
@@ -95,25 +96,41 @@ SystemRights_JobError=Cannot update user object
 SystemRights_JobTitle=Update user database object
 SystemRights_LoginAsMobile=Login as mobile device
 SystemRights_ManageAgents=Manage agent configurations
+SystemRights_ManageAllScheduledTasks=Manage all scheduled tasks
 SystemRights_ManageDCISummaryTables=Manage DCI summary tables
 SystemRights_ManageFiles=Manage server files
 SystemRights_ManageImageLibrary=Manage Image Library
 SystemRights_ManageMappingTables=Manage mapping tables
+SystemRights_ManageOwnScheduledTasks=Manage own scheduled tasks
 SystemRights_ManagePackages=Manage packages
 SystemRights_ManageScripts=Manage script library
+SystemRights_ManageUserScheduledTasks=Manage user scheduled tasks
 SystemRights_ManageUsers=Manage users
 SystemRights_ReadFiles=Read server files
 SystemRights_RegisterAgents=Register agents
 SystemRights_ReportingServerAccess=Reporting server access
+SystemRights_ScheduleFileUploadTask=Schedule file upload
+SystemRights_ScheduleObjectMaint=Schedule object maintenance
+SystemRights_ScheduleScriptTask=Schedule script execution
 SystemRights_SendSMS=Send SMS
 SystemRights_UnlinkTicket=Unlink helpdesk tickets
 SystemRights_ViewAuditLog=View audit log
 SystemRights_ViewEventConfig=View event templates configuration
 SystemRights_ViewEventLog=View event log
+SystemRights_ViewSyslog=View syslog
 SystemRights_ViewTrapLog=View SNMP trap log
+UserLabelProvider_Certificate=Certificate
+UserLabelProvider_CertificateOrPassword=Certificate or password
+UserLabelProvider_CertificateOrRADIUS=Certificate or RADIUS
 UserLabelProvider_Group=Group
+UserLabelProvider_LDAP=LDAP
+UserLabelProvider_Local=Local
+UserLabelProvider_Password=Password
+UserLabelProvider_RADIUS=RADIUS
+UserLabelProvider_Unknown=Unknown
 UserLabelProvider_User=User
 UserManagementView_7=Update user list
+UserManagementView_Authentication=Authentication
 UserManagementView_CannotChangePassword=Unable to change password
 UserManagementView_ChangePassword=Change Password
 UserManagementView_ConfirmDeletePlural=Do you really wish to delete selected users
@@ -141,6 +158,7 @@ UserManagementView_Name=Name
 UserManagementView_OpenJobError=Cannot lock user database
 UserManagementView_OpenJobName=Open user database
 UserManagementView_Properties=&Properties
+UserManagementView_Source=Source
 UserManagementView_Type=Type
 UserManagementView_UnlockJobError=Cannot unlock user database
 UserManagementView_UnlockJobName=Unlock user database
index 658ee53..b396905 100644 (file)
@@ -146,7 +146,7 @@ public class Authentication extends PropertyPage
          checkChangePassword.setEnabled(false);
          checkFixedPassword.setEnabled(false);
          comboAuthMethod.setEnabled(false);
-         comboAuthMethod.add("LDAP password");
+         comboAuthMethod.add(Messages.get().Authentication_LDAPPassword);
          comboAuthMethod.select(5);
          comboMappingMethod.setEnabled(false);
          textMappingData.setEnabled(false);
index 1318ee7..cd7f4f4 100644 (file)
@@ -77,7 +77,7 @@ public class SystemRights extends PropertyPage
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_EVENT_LOG, Messages.get().SystemRights_ViewEventLog);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_AUDIT_LOG, Messages.get().SystemRights_ViewAuditLog);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_TRAP_LOG, Messages.get().SystemRights_ViewTrapLog);
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_SYSLOG, "View syslog");
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_SYSLOG, Messages.get().SystemRights_ViewSyslog);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_MANAGE_MAPPING_TBLS, Messages.get().SystemRights_ManageMappingTables);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SERVER_CONFIG, Messages.get().SystemRights_EditServerConfig);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_READ_SERVER_FILES, Messages.get().SystemRights_ReadFiles);
@@ -91,12 +91,12 @@ public class SystemRights extends PropertyPage
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_MOBILE_DEVICE_LOGIN, Messages.get().SystemRights_LoginAsMobile);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_MANAGE_IMAGE_LIB, Messages.get().SystemRights_ManageImageLibrary);
       addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_REPORTING_SERVER, Messages.get().SystemRights_ReportingServerAccess);
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_USER_SCHEDULED_TASKS, "Manage user scheduled tasks");
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_OWN_SCHEDULED_TASKS, "Manage own scheduled tasks");
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_ALL_SCHEDULED_TASKS, "Manage all scheduled tasks");
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_SCRIPT, "Schedule script task");
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_FILE_UPLOAD, "Schedule file upload task"); 
-      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_MAINTENANCE, "Schedule object maintenance time interval"); 
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_USER_SCHEDULED_TASKS, Messages.get().SystemRights_ManageUserScheduledTasks);
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_OWN_SCHEDULED_TASKS, Messages.get().SystemRights_ManageOwnScheduledTasks);
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_ALL_SCHEDULED_TASKS, Messages.get().SystemRights_ManageAllScheduledTasks);
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_SCRIPT, Messages.get().SystemRights_ScheduleScriptTask);
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_FILE_UPLOAD, Messages.get().SystemRights_ScheduleFileUploadTask); 
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SCHEDULE_MAINTENANCE, Messages.get().SystemRights_ScheduleObjectMaint); 
                
                return dialogArea;
        }
index 41a4fd4..a0f3494 100644 (file)
@@ -105,8 +105,8 @@ public class UserManagementView extends ViewPart
                      Messages.get().UserManagementView_Type, 
                      Messages.get().UserManagementView_FullName, 
                      Messages.get().UserManagementView_Description, 
-                     "Source"
-                     "Authentication"
+                     Messages.get().UserManagementView_Source
+                     Messages.get().UserManagementView_Authentication
                      Messages.get().UserManagementView_GUID 
                   };
                final int[] widths = { 100, 80, 180, 250, 80, 170, 250 };
index a47bc25..1813138 100644 (file)
@@ -33,12 +33,12 @@ import org.netxms.ui.eclipse.usermanager.views.UserManagementView;
  */
 public class UserLabelProvider extends DecoratingLabelProvider implements ITableLabelProvider
 {
-   private static final String[] AUTH_METHOD = { 
-      "Password"
-      "RADIUS"
-      "Certificate"
-      "Certificate or password"
-      "Certificate or RADIUS" 
+   private final String[] AUTH_METHOD = { 
+      Messages.get().UserLabelProvider_Password
+      Messages.get().UserLabelProvider_RADIUS
+      Messages.get().UserLabelProvider_Certificate
+      Messages.get().UserLabelProvider_CertificateOrPassword
+      Messages.get().UserLabelProvider_CertificateOrRADIUS 
    };
    
    /**