Start Internationalizing PHPeclipse Plug-In
authorkhartlage <khartlage>
Sat, 8 Nov 2003 19:04:33 +0000 (19:04 +0000)
committerkhartlage <khartlage>
Sat, 8 Nov 2003 19:04:33 +0000 (19:04 +0000)
16 files changed:
net.sourceforge.phpeclipse/plugin.xml
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/internal/model/ExternalToolsModelMessages.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/internal/model/ToolMessages.java with 90% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/internal/model/ExternalToolsModelMessages.properties [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/internal/model/messages.properties with 91% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/internal/registry/ExternalToolVariable.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/launchConfigurations/ExternalToolsUtil.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/model/ToolUtil.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/variable/ResourceComponent.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/variable/SpecificFileResourceComponent.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/variable/SpecificFolderResourceComponent.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_DE.properties [deleted file]
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_FR.properties [deleted file]
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_JA.properties [deleted file]
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_en_GB.properties [deleted file]
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_es_ES.properties [deleted file]
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPPreferencesMessages.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPPreferencesMessages.properties

index 9b42be6..a94138f 100644 (file)
          </action>
       </viewerContribution>
    </extension>
+   
    <extension
          point="org.eclipse.ui.editorActions">
       <editorContribution
-            targetID="net.sourceforge.phpeclipse.PHPEditor"
-            id="org.eclipse.ui.texteditor.ruler.actions">
-         <action
-               label="%Dummy.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction">
-         </action>
+            id="org.eclipse.ui.texteditor.ruler.actions"
+            targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
+
+               <action
+                       id="org.eclipse.ui.texteditor.BookmarkRulerAction"
+                       actionID="RulerDoubleClick"
+                       label="%Dummy.label"
+            helpContextId="org.eclipse.ui.bookmark_action_context"
+                       class="org.eclipse.ui.texteditor.BookmarkRulerAction">
+               </action>
       </editorContribution>
    </extension>
+   
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
             class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage">
       </page>
-      <page
+ <!--     <page
             name="Language Settings"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
-      </page>
+      </page> -->
    </extension>
    <extension
          point="org.eclipse.ui.documentProviders">
@@ -16,11 +16,11 @@ import java.util.ResourceBundle;
 /**
  * Utility class which helps managing messages
  */
-public final class ToolMessages {
-       private static final String RESOURCE_BUNDLE= "net.sourceforge.phpdt.externaltools.internal.model.messages"; //$NON-NLS-1$
+public final class ExternalToolsModelMessages {
+       private static final String RESOURCE_BUNDLE= "net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsModelMessages"; //$NON-NLS-1$
        private static ResourceBundle bundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
        
-       private ToolMessages(){
+       private ExternalToolsModelMessages(){
                // prevent instantiation of class
        }
        
@@ -142,38 +142,6 @@ ProgramRunner.workDir = Working Directory: {0}\n
 
 
 # =======================================================================
-# Ant Build File External Tool Type
-# =======================================================================
-
-AntFileRunner.callingAntRunner = Calling Ant runner with:\n
-AntFileRunner.antFile = Ant build file: {0}\n
-AntFileRunner.argument = Argument: {0}\n
-AntFileRunner.target = Target: {0}\n
-
-AntTargetsGroup.availableTargetsLabel = A&vailable targets:
-AntTargetsGroup.activeTargetsLabel = A&ctive targets:
-AntTargetsGroup.addLabel = >
-AntTargetsGroup.removeLabel = <
-AntTargetsGroup.addAllLabel = >>
-AntTargetsGroup.removeAllLabel = <<
-AntTargetsGroup.descriptionLabel = &Target description:
-AntTargetsGroup.upLabel = U&p
-AntTargetsGroup.downLabel = D&own
-AntTargetsGroup.getTargetsTitle = Problem retrieving targets
-AntTargetsGroup.getTargetsProblem = Could not retrieve targets.
-AntTargetsGroup.runDefaultTargetLabel = R&un default target ({0})
-AntTargetsGroup.runDefaultTargetUnknownLabel = R&un default target
-AntTargetsGroup.showSubTargetsLabel = S&how sub-targets
-
-AntExternalToolNewWizard.antTargetsPageTitle = Ant Targets
-AntExternalToolNewWizard.antTargetsPageDescription = Specify which Ant targets to execute when the external tool is run.
-AntExternalToolNewWizard.promptForArgumentLabel = &Prompt for targets and arguments before running tool
-
-AntOptionGroupPropertyPage.promptForArgumentLabel = &Prompt for targets and arguments before running tool
-
-
-
-# =======================================================================
 # OLD STUFF
 # =======================================================================
 
index d427e2d..52f3a12 100644 (file)
@@ -10,7 +10,7 @@ Contributors:
 **********************************************************************/
 
 import net.sourceforge.phpdt.externaltools.group.IGroupDialogPage;
-import net.sourceforge.phpdt.externaltools.internal.model.ToolMessages;
+import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsModelMessages;
 import net.sourceforge.phpdt.externaltools.variable.IVariableComponent;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
@@ -122,7 +122,7 @@ public abstract class ExternalToolVariable {
                                GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
                                message.setLayoutData(data);
                                message.setFont(parent.getFont());
-                               message.setText(ToolMessages.getString("ExternalToolVariable.componentErrorMessage")); //$NON-NLS-1$
+                               message.setText(ExternalToolsModelMessages.getString("ExternalToolVariable.componentErrorMessage")); //$NON-NLS-1$
                                message.setForeground(JFaceColors.getErrorText(message.getDisplay()));
                        }
                }
index dbc7e6e..6bf4a73 100644 (file)
@@ -14,7 +14,7 @@ import java.text.MessageFormat;
 import java.util.Map;
 
 import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsPlugin;
-import net.sourceforge.phpdt.externaltools.internal.model.ToolMessages;
+import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsModelMessages;
 import net.sourceforge.phpdt.externaltools.internal.model.VariableContextManager;
 import net.sourceforge.phpdt.externaltools.internal.registry.ExternalToolMigration;
 import net.sourceforge.phpdt.externaltools.internal.registry.RefreshScopeVariable;
@@ -96,18 +96,18 @@ public class ExternalToolsUtil {
     if (location == null) {
       abort(MessageFormat.format(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Location_not_specified_by_{0}_1"), new String[] { configuration.getName()}), null, 0); //$NON-NLS-1$
     } else {
-      MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ToolMessages.getString("RunExternalToolAction.runProblem"), null); //$NON-NLS-1$;
+      MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsModelMessages.getString("RunExternalToolAction.runProblem"), null); //$NON-NLS-1$;
       String expandedLocation = ToolUtil.expandFileLocation(location, context, status);
       if (status.isOK()) {
         if (expandedLocation == null || expandedLocation.length() == 0) {
-          String msg = ToolMessages.format("DefaultRunnerContext.invalidLocation", new Object[] { configuration.getName()}); //$NON-NLS-1$
+          String msg = ExternalToolsModelMessages.format("DefaultRunnerContext.invalidLocation", new Object[] { configuration.getName()}); //$NON-NLS-1$
           abort(msg, null, 0);
         } else {
           File file = new File(expandedLocation);
           if (file.isFile()) {
             return new Path(expandedLocation);
           } else {
-            String msg = ToolMessages.format("DefaultRunnerContext.invalidLocation", new Object[] { configuration.getName()}); //$NON-NLS-1$
+            String msg = ExternalToolsModelMessages.format("DefaultRunnerContext.invalidLocation", new Object[] { configuration.getName()}); //$NON-NLS-1$
             abort(msg, null, 0);
           }
         }
@@ -138,7 +138,7 @@ public class ExternalToolsUtil {
   public static IPath getWorkingDirectory(ILaunchConfiguration configuration, ExpandVariableContext context) throws CoreException {
     String location = configuration.getAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, (String) null);
     if (location != null) {
-      MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ToolMessages.getString("RunExternalToolAction.runProblem"), null); //$NON-NLS-1$;
+      MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsModelMessages.getString("RunExternalToolAction.runProblem"), null); //$NON-NLS-1$;
       String expandedLocation = ToolUtil.expandDirectoryLocation(location, context, status);
       if (status.isOK()) {
         if (expandedLocation != null && expandedLocation.length() > 0) {
@@ -146,7 +146,7 @@ public class ExternalToolsUtil {
           if (path.isDirectory()) {
             return new Path(expandedLocation);
           } else {
-            String msg = ToolMessages.format("DefaultRunnerContext.invalidDirectory", new Object[] { configuration.getName()}); //$NON-NLS-1$
+            String msg = ExternalToolsModelMessages.format("DefaultRunnerContext.invalidDirectory", new Object[] { configuration.getName()}); //$NON-NLS-1$
             abort(msg, null, 0);
           }
         }
@@ -172,7 +172,7 @@ public class ExternalToolsUtil {
   public static String[] getArguments(ILaunchConfiguration configuration, ExpandVariableContext context) throws CoreException {
     String args = configuration.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, (String) null);
     if (args != null) {
-      MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ToolMessages.getString("RunExternalToolAction.runProblem"), null); //$NON-NLS-1$;
+      MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsModelMessages.getString("RunExternalToolAction.runProblem"), null); //$NON-NLS-1$;
       String[] expandedArgs = ToolUtil.expandArguments(args, context, status);
       if (status.isOK()) {
         return expandedArgs;
@@ -223,14 +223,14 @@ public class ExternalToolsUtil {
 
     ToolUtil.VariableDefinition varDef = ToolUtil.extractVariableTag(scope, 0);
     if (varDef.start == -1 || varDef.end == -1 || varDef.name == null) {
-      String msg = ToolMessages.format("DefaultRunnerContext.invalidRefreshVarFormat", new Object[] { configuration.getName()}); //$NON-NLS-1$
+      String msg = ExternalToolsModelMessages.format("DefaultRunnerContext.invalidRefreshVarFormat", new Object[] { configuration.getName()}); //$NON-NLS-1$
       abort(msg, null, 0);
     }
 
     RefreshScopeVariableRegistry registry = ExternalToolsPlugin.getDefault().getRefreshVariableRegistry();
     RefreshScopeVariable variable = registry.getRefreshVariable(varDef.name);
     if (variable == null) {
-      String msg = ToolMessages.format("DefaultRunnerContext.noRefreshVarNamed", new Object[] { configuration.getName(), varDef.name }); //$NON-NLS-1$
+      String msg = ExternalToolsModelMessages.format("DefaultRunnerContext.noRefreshVarNamed", new Object[] { configuration.getName(), varDef.name }); //$NON-NLS-1$
       abort(msg, null, 0);
     }
 
@@ -245,7 +245,7 @@ public class ExternalToolsUtil {
     if (resources == null || resources.length == 0)
       return;
 
-    monitor.beginTask(ToolMessages.getString("DefaultRunnerContext.refreshResources"), //$NON-NLS-1$
+    monitor.beginTask(ExternalToolsModelMessages.getString("DefaultRunnerContext.refreshResources"), //$NON-NLS-1$
     resources.length);
 
     MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Exception(s)_occurred_during_refresh._2"), null); //$NON-NLS-1$
index 09dc895..be61b92 100644 (file)
@@ -12,7 +12,7 @@ Contributors:
 import java.util.ArrayList;
 
 import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsPlugin;
-import net.sourceforge.phpdt.externaltools.internal.model.ToolMessages;
+import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsModelMessages;
 import net.sourceforge.phpdt.externaltools.internal.registry.ArgumentVariable;
 import net.sourceforge.phpdt.externaltools.internal.registry.ArgumentVariableRegistry;
 import net.sourceforge.phpdt.externaltools.internal.registry.PathLocationVariable;
@@ -107,7 +107,7 @@ public final class ToolUtil {
 
                        // Invalid variable format
                        if (varDef.end == -1 || varDef.name == null || varDef.name.length() == 0) {
-                               String msg = ToolMessages.getString("ToolUtil.argumentVarFormatWrong"); //$NON-NLS-1$
+                               String msg = ExternalToolsModelMessages.getString("ToolUtil.argumentVarFormatWrong"); //$NON-NLS-1$
                                status.merge(ExternalToolsPlugin.newErrorStatus(msg, null));
                                return null;
                        }
@@ -122,7 +122,7 @@ public final class ToolUtil {
                        registry = ExternalToolsPlugin.getDefault().getArgumentVariableRegistry();
                        ArgumentVariable variable = registry.getArgumentVariable(varDef.name);
                        if (variable == null) {
-                               String msg = ToolMessages.format("ToolUtil.argumentVarMissing", new Object[] {varDef.name}); //$NON-NLS-1$
+                               String msg = ExternalToolsModelMessages.format("ToolUtil.argumentVarMissing", new Object[] {varDef.name}); //$NON-NLS-1$
                                status.merge(ExternalToolsPlugin.newErrorStatus(msg, null));
                                return null;
                        }
@@ -130,7 +130,7 @@ public final class ToolUtil {
                        // Expand the variable as text if possible
                        String text = variable.getExpander().getText(varDef.name, varDef.argument, context);
                        if (text == null) {
-                               String msg = ToolMessages.format("ToolUtil.argumentVarExpandFailed", new Object[] {varDef.name}); //$NON-NLS-1$
+                               String msg = ExternalToolsModelMessages.format("ToolUtil.argumentVarExpandFailed", new Object[] {varDef.name}); //$NON-NLS-1$
                                status.merge(ExternalToolsPlugin.newErrorStatus(msg, null));
                                return null;
                        }
@@ -184,14 +184,14 @@ public final class ToolUtil {
                
                // Disallow text before/after variable
                if (varDef.start != 0 || (varDef.end < dirLocation.length() && varDef.end != -1)) {
-                       String msg = ToolMessages.getString("ToolUtil.dirLocVarBetweenText"); //$NON-NLS-1$
+                       String msg = ExternalToolsModelMessages.getString("ToolUtil.dirLocVarBetweenText"); //$NON-NLS-1$
                        status.merge(ExternalToolsPlugin.newErrorStatus(msg, null));
                        return null;
                }
                
                // Invalid variable format
                if (varDef.name == null || varDef.name.length() == 0 || varDef.end == -1) {
-                       String msg = ToolMessages.getString("ToolUtil.dirLocVarFormatWrong"); //$NON-NLS-1$
+                       String msg = ExternalToolsModelMessages.getString("ToolUtil.dirLocVarFormatWrong"); //$NON-NLS-1$
                        status.merge(ExternalToolsPlugin.newErrorStatus(msg, null));
                        return null;
                }
@@ -201,7 +201,7 @@ public final class ToolUtil {
                registry = ExternalToolsPlugin.getDefault().getDirectoryLocationVariableRegistry();
                PathLocationVariable variable = registry.getPathLocationVariable(varDef.name);
                if (variable == null) {
-                       String msg = ToolMessages.format("ToolUtil.dirLocVarMissing", new Object[] {varDef.name}); //$NON-NLS-1$
+                       String msg = ExternalToolsModelMessages.format("ToolUtil.dirLocVarMissing", new Object[] {varDef.name}); //$NON-NLS-1$
                        status.merge(ExternalToolsPlugin.newErrorStatus(msg, null));
                        return null;
                }
@@ -209,7 +209,7 @@ public final class ToolUtil {
                // Expand the variable into a IPath if possible
                IPath path = variable.getExpander().getPath(varDef.name, varDef.argument, context);
                if (path == null) {
-                       String msg = ToolMessages.format("ToolUtil.dirLocVarExpandFailed", new Object[] {varDef.name}); //$NON-NLS-1$
+                       String msg = ExternalToolsModelMessages.format("ToolUtil.dirLocVarExpandFailed", new Object[] {varDef.name}); //$NON-NLS-1$
                        status.merge(ExternalToolsPlugin.newErrorStatus(msg, null));
                        return null;
                }
@@ -239,14 +239,14 @@ public final class ToolUtil {
                
                // Disallow text before/after variable
                if (varDef.start != 0 || (varDef.end < fileLocation.length() && varDef.end != -1)) {
-                       String msg = ToolMessages.getString("ToolUtil.fileLocVarBetweenText"); //$NON-NLS-1$
+                       String msg = ExternalToolsModelMessages.getString("ToolUtil.fileLocVarBetweenText"); //$NON-NLS-1$
                        status.merge(ExternalToolsPlugin.newErrorStatus(msg, null));
                        return null;
                }
                
                // Invalid variable format
                if (varDef.name == null || varDef.name.length() == 0 || varDef.end == -1) {
-                       String msg = ToolMessages.getString("ToolUtil.fileLocVarFormatWrong"); //$NON-NLS-1$
+                       String msg = ExternalToolsModelMessages.getString("ToolUtil.fileLocVarFormatWrong"); //$NON-NLS-1$
                        status.merge(ExternalToolsPlugin.newErrorStatus(msg, null));
                        return null;
                }
@@ -256,7 +256,7 @@ public final class ToolUtil {
                registry = ExternalToolsPlugin.getDefault().getFileLocationVariableRegistry();
                PathLocationVariable variable = registry.getPathLocationVariable(varDef.name);
                if (variable == null) {
-                       String msg = ToolMessages.format("ToolUtil.fileLocVarMissing", new Object[] {varDef.name}); //$NON-NLS-1$
+                       String msg = ExternalToolsModelMessages.format("ToolUtil.fileLocVarMissing", new Object[] {varDef.name}); //$NON-NLS-1$
                        status.merge(ExternalToolsPlugin.newErrorStatus(msg, null));
                        return null;
                }
@@ -264,7 +264,7 @@ public final class ToolUtil {
                // Expand the variable into a IPath if possible
                IPath path = variable.getExpander().getPath(varDef.name, varDef.argument, context);
                if (path == null) {
-                       String msg = ToolMessages.format("The variable {0} with argument {1} could not be expanded to a valid path.", new Object[] {varDef.name, varDef.argument});
+                       String msg = ExternalToolsModelMessages.format("The variable {0} with argument {1} could not be expanded to a valid path.", new Object[] {varDef.name, varDef.argument});
                        status.merge(ExternalToolsPlugin.newErrorStatus(msg, null));
                        return null;
                }
index d0ddf4a..143a6e6 100644 (file)
@@ -10,7 +10,7 @@ Contributors:
 **********************************************************************/
 
 import net.sourceforge.phpdt.externaltools.group.IGroupDialogPage;
-import net.sourceforge.phpdt.externaltools.internal.model.ToolMessages;
+import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsModelMessages;
 import net.sourceforge.phpdt.externaltools.model.ToolUtil;
 
 import org.eclipse.core.resources.IResource;
@@ -111,7 +111,7 @@ public class ResourceComponent implements IVariableComponent {
         */
        protected void createSelectedResourceOption() {
                selectedResourceButton = new Button(mainGroup, SWT.RADIO);
-               selectedResourceButton.setText(ToolMessages.getString("ResourceComponent.selectedResLabel")); //$NON-NLS-1$
+               selectedResourceButton.setText(ExternalToolsModelMessages.getString("ResourceComponent.selectedResLabel")); //$NON-NLS-1$
                GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
                selectedResourceButton.setLayoutData(data);
                selectedResourceButton.setFont(mainGroup.getFont());
@@ -124,7 +124,7 @@ public class ResourceComponent implements IVariableComponent {
         */
        protected void createSpecificResourceOption() {
                specificResourceButton = new Button(mainGroup, SWT.RADIO);
-               specificResourceButton.setText(ToolMessages.getString("ResourceComponent.specificResLabel")); //$NON-NLS-1$
+               specificResourceButton.setText(ExternalToolsModelMessages.getString("ResourceComponent.specificResLabel")); //$NON-NLS-1$
                GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
                specificResourceButton.setLayoutData(data);
                specificResourceButton.setFont(mainGroup.getFont());
@@ -255,7 +255,7 @@ public class ResourceComponent implements IVariableComponent {
                        return true;
 
                if (resourceList.getSelection().isEmpty()) {
-                       getPage().setMessage(ToolMessages.getString("ResourceComponent.selectionRequired"), IMessageProvider.WARNING); //$NON-NLS-1$
+                       getPage().setMessage(ExternalToolsModelMessages.getString("ResourceComponent.selectionRequired"), IMessageProvider.WARNING); //$NON-NLS-1$
                        setIsValid(false);
                        return false;
                }
index 010cd13..cdeb292 100644 (file)
@@ -9,7 +9,7 @@ http://www.eclipse.org/legal/cpl-v10.html
 Contributors:
 **********************************************************************/
 
-import net.sourceforge.phpdt.externaltools.internal.model.ToolMessages;
+import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsModelMessages;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.dialogs.IMessageProvider;
@@ -50,7 +50,7 @@ public class SpecificFileResourceComponent extends ResourceComponent {
                GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
                label.setLayoutData(data);
                label.setFont(mainGroup.getFont());
-               label.setText(ToolMessages.getString("ResourceComponent.specificResLabel")); //$NON-NLS-1$
+               label.setText(ExternalToolsModelMessages.getString("ResourceComponent.specificResLabel")); //$NON-NLS-1$
        }
 
        /* (non-Javadoc)
@@ -63,7 +63,7 @@ public class SpecificFileResourceComponent extends ResourceComponent {
                IStructuredSelection sel = (IStructuredSelection) resourceList.getSelection();
                IResource resource = (IResource) sel.getFirstElement();
                if (resource == null || resource.getType() != IResource.FILE) {
-                       getPage().setMessage(ToolMessages.getString("ResourceComponent.selectionRequired"), IMessageProvider.WARNING); //$NON-NLS-1$
+                       getPage().setMessage(ExternalToolsModelMessages.getString("ResourceComponent.selectionRequired"), IMessageProvider.WARNING); //$NON-NLS-1$
                        setIsValid(false);
                        return false;
                }
index 2fd80c0..e0b4aa7 100644 (file)
@@ -9,7 +9,7 @@ http://www.eclipse.org/legal/cpl-v10.html
 Contributors:
 **********************************************************************/
 
-import net.sourceforge.phpdt.externaltools.internal.model.ToolMessages;
+import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsModelMessages;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
@@ -62,7 +62,7 @@ public class SpecificFolderResourceComponent extends ResourceComponent {
                GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
                label.setLayoutData(data);
                label.setFont(mainGroup.getFont());
-               label.setText(ToolMessages.getString("ResourceComponent.specificResLabel")); //$NON-NLS-1$
+               label.setText(ExternalToolsModelMessages.getString("ResourceComponent.specificResLabel")); //$NON-NLS-1$
        }
 
        /* (non-Javadoc)
@@ -75,7 +75,7 @@ public class SpecificFolderResourceComponent extends ResourceComponent {
                IStructuredSelection sel = (IStructuredSelection) resourceList.getSelection();
                IResource resource = (IResource) sel.getFirstElement();
                if (resource == null || resource.getType() == IResource.FILE) {
-                       getPage().setMessage(ToolMessages.getString("ResourceComponent.selectionRequired"), IMessageProvider.WARNING); //$NON-NLS-1$
+                       getPage().setMessage(ExternalToolsModelMessages.getString("ResourceComponent.selectionRequired"), IMessageProvider.WARNING); //$NON-NLS-1$
                        setIsValid(false);
                        return false;
                }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_DE.properties b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_DE.properties
deleted file mode 100644 (file)
index 1bf6296..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-#########################################
-# PHPProjectLibraryPage
-#########################################
-
-PHPProjectLibraryPage.elementNotIProject=FEHLER: Element ist kein IProject
-PHPProjectLibraryPage.project=Projekt
-PHPProjectLibraryPage.tabName=Projekte
-
-
-#########################################
-# Property Pages
-#########################################
-
-PHPProjectPropertyPage.phpProjectClosed=Das ausgewählte Projekt ist ein PHP Projekt, aber es ist geschlossen.
-PHPProjectPropertyPage.performOkExceptionDialogTitle=Kann nicht sichern
-PHPProjectPropertyPage.performOkExceptionDialogMessage=FEHLER: Kann die Projekt Eigenschaften nicht sichern
-
-PHPObfuscatorPropertyPage.hasnature=PHP Projekt.
-PHPObfuscatorPropertyPage.publish=Obfuscator Ausgabe Verzeichnis:
-PHPObfuscatorPropertyPage.dialogtitle=PHP 
-PHPObfuscatorPropertyPage.projecterror=Kann das neue Projekt nicht anlegen.
-PHPObfuscatorPropertyPage.properties=PHP Obfuscator Projekt Eigenschaften
-
-#########################################
-# Preference Pages
-#########################################
-PHPBasePreferencePage.description=PHP Voreinstellungen
-PHPBasePreferencePage.websettingsGroup=Webserver Einstellungen
-PHPBasePreferencePage.websettingsGroup.localhost=Localhost
-PHPBasePreferencePage.websettingsGroup.docroot=DocumentRoot
-PHPBasePreferencePage.websettingsGroup.browser=Externes Browser Kommando
-PHPBasePreferencePage.websettingsGroup.useexternal=Benutze externen Browser
-PHPBasePreferencePage.websettingsGroup.showexternalpreview=Vorschau beim Öffnen des Editors (nur win32)
-PHPBasePreferencePage.apacheGroup=Apache Einstellungen
-PHPBasePreferencePage.apacheGroup.run=Apache
-PHPBasePreferencePage.apacheGroup.start=Start Apache
-PHPBasePreferencePage.apacheGroup.start_background=Im Hintergrund ausführen?
-PHPBasePreferencePage.apacheGroup.stop=Stop Apache
-PHPBasePreferencePage.apacheGroup.stop_background=Im Hintergrund ausführen?
-PHPBasePreferencePage.apacheGroup.restart=Restart Apache
-PHPBasePreferencePage.apacheGroup.restart_background=Im Hintergrund ausführen?
-PHPBasePreferencePage.console.php=Run PHP command
-PHPBasePreferencePage.mySQLGroup=MySQL Einstellungen
-PHPBasePreferencePage.mySQLGroup.run=MySQL
-PHPBasePreferencePage.mySQLGroup.start_background=Im Hintergrund ausführen?
-PHPBasePreferencePage.mySQLGroup.command=Start MySQL
-
-PHPBasePreferencePage.parsers=Parser Einstellungen
-PHPBasePreferencePage.parsers.pos=Parse beim Sichern
-PHPBasePreferencePage.parsers.external=Externer Parser
-PHPBasePreferencePage.parsers.internal=Interner Parser
-PHPBasePreferencePage.parsers.extcommand=Parser command
-PHPBasePreferencePage.parsers.choose=PHP Parser auswählen
-
-PHPEditorSyntaxPreferencePage.description:PHP Editor Preferences
-PHPEditorSyntaxPreferencePage.background:Background settings
-PHPEditorSyntaxPreferencePage.foreground:Foreground settings
-PHPEditorSyntaxPreferencePage.syntax:Syntax highlighting
-PHPEditorSyntaxPreferencePage.color:Colour
-PHPEditorSyntaxPreferencePage.bold:Bold
-PHPEditorSyntaxPreferencePage.italic:Italic
-PHPEditorSyntaxPreferencePage.underline:Underline
-PHPEditorSyntaxPreferencePage.multiLineComment=Multi-line comment
-PHPEditorSyntaxPreferencePage.singleLineComment=Single-line comment
-PHPEditorSyntaxPreferencePage.keywords=Schlüsslworte
-PHPEditorSyntaxPreferencePage.tags=PHP Tags
-PHPEditorSyntaxPreferencePage.variables=Variablen
-PHPEditorSyntaxPreferencePage.types=Typen
-PHPEditorSyntaxPreferencePage.functions=Functionen
-PHPEditorSyntaxPreferencePage.constants=Konstanten
-PHPEditorSyntaxPreferencePage.strings=Strings
-PHPEditorSyntaxPreferencePage.others=Andere
-PHPEditorSyntaxPreferencePage.syntaxdialog=Custom PHP Syntax File:
-PHPEditorSyntaxPreferencePage.browse=Browse..
-PHPEditorSyntaxPreferencePage.textfont=Text font
-
-PHPLanguagePreferencePage.description=PHP Editor Sprache
-PHPLanguagePreferencePage.preflingo=PHP Sprach Voreinstellungen
-PHPLanguagePreferencePage.choose=Wähle Sprache
-PHPLanguagePreferencePage.english=Englisch
-PHPLanguagePreferencePage.german=Deutsch
-PHPLanguagePreferencePage.french=Francais
-PHPLanguagePreferencePage.spanish=Spanish
-PHPLanguagePreferencePage.japanese=Japanisch
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_FR.properties b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_FR.properties
deleted file mode 100644 (file)
index 133f9eb..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-#########################################
-# PHPProjectLibraryPage
-#########################################
-
-PHPProjectLibraryPage.elementNotIProject=ERREUR: L'élément n'est pas un IProject
-PHPProjectLibraryPage.project=Projet
-PHPProjectLibraryPage.tabName=Projets
-
-
-#########################################
-# Property Pages
-#########################################
-
-PHPProjectPropertyPage.phpProjectClosed=Le project choisi est un projet PHP, mais est fermé.
-PHPProjectPropertyPage.performOkExceptionDialogTitle=Impossible de sauver
-PHPProjectPropertyPage.performOkExceptionDialogMessage=ERREUR: Impossible de sauver les propriétés du projet.
-
-PHPObfuscatorPropertyPage.hasnature=Is PHP project.
-PHPObfuscatorPropertyPage.publish=Obfuscator directory:
-PHPObfuscatorPropertyPage.dialogtitle=PHP 
-PHPObfuscatorPropertyPage.projecterror=Could not create the new project.
-PHPObfuscatorPropertyPage.properties=PHP Obfuscator Project Properties
-
-#########################################
-# Preference Pages
-#########################################
-PHPBasePreferencePage.description=PHP Preferences
-PHPBasePreferencePage.websettingsGroup=Configuration du serveur Web
-PHPBasePreferencePage.websettingsGroup.localhost=Localhost
-PHPBasePreferencePage.websettingsGroup.docroot=DocumentRoot
-PHPBasePreferencePage.websettingsGroup.browser=Commande du navigateur externe
-PHPBasePreferencePage.websettingsGroup.useexternal=Utiliser navigateur externe
-PHPBasePreferencePage.websettingsGroup.showexternalpreview=Show preview on editor load (win32 only)
-PHPBasePreferencePage.apacheGroup=Configuration Apache
-PHPBasePreferencePage.apacheGroup.run=Apache
-PHPBasePreferencePage.apacheGroup.start=Lancer Apache
-PHPBasePreferencePage.apacheGroup.start_background=Run in background mode
-PHPBasePreferencePage.apacheGroup.stop=Stopper Apache
-PHPBasePreferencePage.apacheGroup.stop_background=Run in background mode
-PHPBasePreferencePage.apacheGroup.restart=Relancer Apache
-PHPBasePreferencePage.apacheGroup.restart_background=Run in background mode
-PHPBasePreferencePage.console.php=Run PHP command
-PHPBasePreferencePage.mySQLGroup=Configuration MySQL
-PHPBasePreferencePage.mySQLGroup.run=MySQL
-PHPBasePreferencePage.mySQLGroup.start_background=Run in background mode
-PHPBasePreferencePage.mySQLGroup.command=Lancer MySQL
-
-PHPBasePreferencePage.parsers=Configuration de parsing
-PHPBasePreferencePage.parsers.pos=Parser à la sauvegarde
-PHPBasePreferencePage.parsers.external=Externe
-PHPBasePreferencePage.parsers.internal=Interne
-PHPBasePreferencePage.parsers.extcommand=Parser command
-PHPBasePreferencePage.parsers.choose=Choisissez un parseur PHP
-
-PHPEditorSyntaxPreferencePage.description:Configuration de l'éditeur PHP
-PHPEditorSyntaxPreferencePage.background:Paramètres d'arrière plan
-PHPEditorSyntaxPreferencePage.foreground:Paramètres d'avant plan
-PHPEditorSyntaxPreferencePage.syntax:Coloration syntaxique
-PHPEditorSyntaxPreferencePage.color:Couleur
-PHPEditorSyntaxPreferencePage.bold:Gras
-PHPEditorSyntaxPreferencePage.italic:Italique
-PHPEditorSyntaxPreferencePage.underline:Sousligné
-PHPEditorSyntaxPreferencePage.multiLineComment=Commentaire Multi-ligne
-PHPEditorSyntaxPreferencePage.singleLineComment=Commenaire Mono-ligne
-PHPEditorSyntaxPreferencePage.keywords=Mots clef
-PHPEditorSyntaxPreferencePage.tags=PHP Tags
-PHPEditorSyntaxPreferencePage.variables=Variables
-PHPEditorSyntaxPreferencePage.types=Types
-PHPEditorSyntaxPreferencePage.functions=Fonctions
-PHPEditorSyntaxPreferencePage.constants=Constantes
-PHPEditorSyntaxPreferencePage.strings=Strings
-PHPEditorSyntaxPreferencePage.others=Autres
-PHPEditorSyntaxPreferencePage.syntaxdialog=Fichier de syntaxe PHP personnalisé :
-PHPEditorSyntaxPreferencePage.browse=Parcourir..
-PHPEditorSyntaxPreferencePage.textfont=Text font
-
-PHPLanguagePreferencePage.description=PHP Langue de l'éditeur
-PHPLanguagePreferencePage.preflingo=PHP Configuration de langue
-PHPLanguagePreferencePage.choose=Choisissez une langue
-PHPLanguagePreferencePage.english=English
-PHPLanguagePreferencePage.german=Deutsch
-PHPLanguagePreferencePage.french=Francais
-PHPLanguagePreferencePage.spanish=Spanish
-PHPLanguagePreferencePage.japanese=Japanese
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_JA.properties b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_JA.properties
deleted file mode 100644 (file)
index 39c0dcc..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-#########################################
-# PHPProjectLibraryPage
-#########################################
-
-PHPProjectLibraryPage.elementNotIProject=\u30a8\u30e9\u30fc: \u30a8\u30ec\u30e1\u30f3\u30c8\u306fIProject\u3067\u306f\u3042\u308a\u307e\u305b\u3093
-PHPProjectLibraryPage.project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
-PHPProjectLibraryPage.tabName=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
-
-
-#########################################
-# Property Pages
-#########################################
-
-PHPProjectPropertyPage.phpProjectClosed=\u9078\u629e\u3055\u308c\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306fPHP\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u3059\u304c\u9589\u3058\u3089\u308c\u3066\u3044\u307e\u3059
-PHPProjectPropertyPage.performOkExceptionDialogTitle=\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093
-PHPProjectPropertyPage.performOkExceptionDialogMessage=\u30a8\u30e9\u30fc: \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u3092\u9078\u629e\u3067\u304d\u307e\u305b\u3093
-
-PHPObfuscatorPropertyPage.hasnature=PHP\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u3059
-PHPObfuscatorPropertyPage.publish=Obfuscator\u30c7\u30a3\u30ec\u30af\u30c8\u30ea:
-PHPObfuscatorPropertyPage.dialogtitle=PHP 
-PHPObfuscatorPropertyPage.projecterror=\u65b0\u3057\u3044\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-PHPObfuscatorPropertyPage.properties=PHP Obfuscator \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d7\u30ed\u30d1\u30c6\u30a3
-
-#########################################
-# Preference Pages
-#########################################
-PHPBasePreferencePage.description=PHP\u8a2d\u5b9a
-PHPBasePreferencePage.websettingsGroup=\u30a6\u30a7\u30d6\u30b5\u30fc\u30d0\u30fc\u306e\u8a2d\u5b9a
-PHPBasePreferencePage.websettingsGroup.localhost=Localhost
-PHPBasePreferencePage.websettingsGroup.docroot=DocumentRoot
-PHPBasePreferencePage.websettingsGroup.browser=\u5916\u90e8\u30d6\u30e9\u30a6\u30b6\u30b3\u30de\u30f3\u30c9
-PHPBasePreferencePage.websettingsGroup.useexternal=\u5916\u90e8\u30d6\u30e9\u30a6\u30b6\u3092\u4f7f\u3046
-PHPBasePreferencePage.websettingsGroup.showexternalpreview=\u30a8\u30c7\u30a3\u30bf\u306b\u30ed\u30fc\u30c9\u6642\u30d7\u30ec\u30d3\u30e5\u30fc\u3092\u8868\u793a\u3059\u308b(win32\u306e\u307f)
-PHPBasePreferencePage.apacheGroup=Apache\u306e\u8a2d\u5b9a
-PHPBasePreferencePage.apacheGroup.run=Apache
-PHPBasePreferencePage.apacheGroup.start=Apache\u3092\u8d77\u52d5
-PHPBasePreferencePage.apacheGroup.start_background=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30e2\u30fc\u30c9\u3067\u8d77\u52d5
-PHPBasePreferencePage.apacheGroup.stop=Apache\u3092\u505c\u6b62
-PHPBasePreferencePage.apacheGroup.stop_background=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30e2\u30fc\u30c9\u3067\u8d77\u52d5
-PHPBasePreferencePage.apacheGroup.restart=Apache\u3092\u518d\u8d77\u52d5
-PHPBasePreferencePage.apacheGroup.restart_background=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30e2\u30fc\u30c9\u3067\u8d77\u52d5
-PHPBasePreferencePage.console.php=PHP\u8d77\u52d5\u30b3\u30de\u30f3\u30c9
-PHPBasePreferencePage.mySQLGroup=MySQL \u8a2d\u5b9a
-PHPBasePreferencePage.mySQLGroup.command=MySQL \u8d77\u52d5
-PHPBasePreferencePage.mySQLGroup.run=MySQL
-PHPBasePreferencePage.mySQLGroup.start_background=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30e2\u30fc\u30c9\u3067\u8d77\u52d5
-PHPBasePreferencePage.parsers=\u30d1\u30fc\u30b5\u306e\u8a2d\u5b9a
-PHPBasePreferencePage.parsers.pos=\u4fdd\u5b58\u6642\u306b\u30d1\u30fc\u30b9
-PHPBasePreferencePage.parsers.external=\u5916\u90e8\u30d1\u30fc\u30b5\u3092\u4f7f\u7528
-PHPBasePreferencePage.parsers.internal=\u5185\u90e8\u30d1\u30fc\u30b5\u3092\u4f7f\u7528
-PHPBasePreferencePage.parsers.extcommand=\u30d1\u30fc\u30b5\u30b3\u30de\u30f3\u30c9
-PHPBasePreferencePage.parsers.choose=PHP \u30d1\u30fc\u30b5\u3092\u9078\u629e
-
-PHPEditorSyntaxPreferencePage.description:PHP \u30a8\u30c7\u30a3\u30bf\u8a2d\u5b9a
-PHPEditorSyntaxPreferencePage.background:\u80cc\u666f\u8a2d\u5b9a
-PHPEditorSyntaxPreferencePage.foreground:\u524d\u666f\u8a2d\u5b9a
-PHPEditorSyntaxPreferencePage.syntax:\u69cb\u6587\u30cf\u30a4\u30e9\u30a4\u30c8
-PHPEditorSyntaxPreferencePage.color:\u8272
-PHPEditorSyntaxPreferencePage.bold:\u30dc\u30fc\u30eb\u30c9
-PHPEditorSyntaxPreferencePage.italic:\u30a4\u30bf\u30ea\u30c3\u30af
-PHPEditorSyntaxPreferencePage.underline:\u4e0b\u7dda
-PHPEditorSyntaxPreferencePage.multiLineComment=\u8907\u6570\u884c\u30b3\u30e1\u30f3\u30c8
-PHPEditorSyntaxPreferencePage.singleLineComment=\u5358\u4e00\u884c\u30b3\u30e1\u30f3\u30c8
-PHPEditorSyntaxPreferencePage.tags=PHP \u30bf\u30b0
-PHPEditorSyntaxPreferencePage.keywords=\u30ad\u30fc\u30ef\u30fc\u30c9
-PHPEditorSyntaxPreferencePage.variables=\u5909\u6570
-PHPEditorSyntaxPreferencePage.types=\u578b
-PHPEditorSyntaxPreferencePage.functions=\u95a2\u6570
-PHPEditorSyntaxPreferencePage.constants=\u5b9a\u6570
-PHPEditorSyntaxPreferencePage.strings=\u6587\u5b57\u5217
-PHPEditorSyntaxPreferencePage.others=\u4ed6
-PHPEditorSyntaxPreferencePage.syntaxdialog=\u30ab\u30b9\u30bf\u30e0PHP\u69cb\u6587\u30d5\u30a1\u30a4\u30eb:
-PHPEditorSyntaxPreferencePage.browse=\u53c2\u7167...
-PHPEditorSyntaxPreferencePage.textfont=\u30c6\u30ad\u30b9\u30c8\u30d5\u30a9\u30f3\u30c8
-
-PHPLanguagePreferencePage.description=PHP \u30a8\u30c7\u30a3\u30bf\u306e\u8a00\u8a9e
-PHPLanguagePreferencePage.preflingo=PHP \u8a00\u8a9e\u8a2d\u5b9a
-PHPLanguagePreferencePage.choose=\u8a00\u8a9e\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044
-PHPLanguagePreferencePage.english=\u82f1\u8a9e
-PHPLanguagePreferencePage.german=\u30c9\u30a4\u30c4\u8a9e
-PHPLanguagePreferencePage.french=\u30d5\u30e9\u30f3\u30b9\u8a9e
-PHPLanguagePreferencePage.spanish=\u30b9\u30da\u30a4\u30f3\u8a9e
-PHPLanguagePreferencePage.japanese=\u65e5\u672c\u8a9e
-
-PHPOutlinePreferencePage.classes=\u30af\u30e9\u30b9\u3092\u30a2\u30a6\u30c8\u30e9\u30a4\u30f3\u306b\u8868\u793a
-PHPOutlinePreferencePage.functions=\u95a2\u6570\u3092\u30a2\u30a6\u30c8\u30e9\u30a4\u30f3\u306b\u8868\u793a
-PHPOutlinePreferencePage.variables=\u5909\u6570\u3092\u30a2\u30a6\u30c8\u30e9\u30a4\u30f3\u306b\u8868\u793a
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_en_GB.properties b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_en_GB.properties
deleted file mode 100644 (file)
index c3f8d11..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-#########################################
-# PHPProjectLibraryPage
-#########################################
-
-PHPProjectLibraryPage.elementNotIProject=ERROR: Element not IProject
-PHPProjectLibraryPage.project=Project
-PHPProjectLibraryPage.tabName=Projects
-
-
-#########################################
-# Property Pages
-#########################################
-
-PHPProjectPropertyPage.phpProjectClosed=The project selected is a PHP project, but is closed.
-PHPProjectPropertyPage.performOkExceptionDialogTitle=Unable to save
-PHPProjectPropertyPage.performOkExceptionDialogMessage=ERROR: Unable to save project properties.
-
-PHPObfuscatorPropertyPage.hasnature=Is PHP project.
-PHPObfuscatorPropertyPage.publish=Obfuscator directory:
-PHPObfuscatorPropertyPage.dialogtitle=PHP 
-PHPObfuscatorPropertyPage.projecterror=Could not create the new project.
-PHPObfuscatorPropertyPage.properties=PHP Obfuscator Project Properties
-
-#########################################
-# Preference Pages
-#########################################
-PHPBasePreferencePage.description=PHP Preferences
-PHPBasePreferencePage.websettingsGroup=Webserver Settings
-PHPBasePreferencePage.websettingsGroup.localhost=Localhost
-PHPBasePreferencePage.websettingsGroup.docroot=DocumentRoot
-PHPBasePreferencePage.websettingsGroup.browser=External browser command
-PHPBasePreferencePage.websettingsGroup.useexternal=Use external browser
-PHPBasePreferencePage.websettingsGroup.showexternalpreview=Show preview on editor load (win32 only)
-PHPBasePreferencePage.apacheGroup=Apache Settings
-PHPBasePreferencePage.apacheGroup.run=Apache
-PHPBasePreferencePage.apacheGroup.start=Start Apache
-PHPBasePreferencePage.apacheGroup.start_background=Run in background mode
-PHPBasePreferencePage.apacheGroup.stop=Stop Apache
-PHPBasePreferencePage.apacheGroup.stop_background=Run in background mode
-PHPBasePreferencePage.apacheGroup.restart=Restart Apache
-PHPBasePreferencePage.apacheGroup.restart_background=Run in background mode
-PHPBasePreferencePage.console.php=Run PHP command
-PHPBasePreferencePage.mySQLGroup=MySQL Settings
-PHPBasePreferencePage.mySQLGroup.run=MySQL
-PHPBasePreferencePage.mySQLGroup.start_background=Run in background mode
-PHPBasePreferencePage.mySQLGroup.command=Start MySQL
-PHPBasePreferencePage.parsers=Parsing settings
-PHPBasePreferencePage.parsers.pos=Parse on save
-PHPBasePreferencePage.parsers.external=External
-PHPBasePreferencePage.parsers.internal=Internal
-PHPBasePreferencePage.parsers.extcommand=Parser command
-PHPBasePreferencePage.parsers.choose=Choose PHP Parser
-
-PHPEditorSyntaxPreferencePage.description:PHP Editor Preferences
-PHPEditorSyntaxPreferencePage.background:Background settings
-PHPEditorSyntaxPreferencePage.foreground:Foreground settings
-PHPEditorSyntaxPreferencePage.syntax:Syntax highlighting
-PHPEditorSyntaxPreferencePage.color:Colour
-PHPEditorSyntaxPreferencePage.bold:Bold
-PHPEditorSyntaxPreferencePage.italic:Italic
-PHPEditorSyntaxPreferencePage.underline:Underline
-PHPEditorSyntaxPreferencePage.multiLineComment=Multi-line comment
-PHPEditorSyntaxPreferencePage.singleLineComment=Single-line comment
-PHPEditorSyntaxPreferencePage.tags=PHP Tags
-PHPEditorSyntaxPreferencePage.keywords=Keywords
-PHPEditorSyntaxPreferencePage.variables=Variables
-PHPEditorSyntaxPreferencePage.types=Types
-PHPEditorSyntaxPreferencePage.functions=Functions
-PHPEditorSyntaxPreferencePage.constants=Constants
-PHPEditorSyntaxPreferencePage.strings=Strings
-PHPEditorSyntaxPreferencePage.others=Others
-PHPEditorSyntaxPreferencePage.syntaxdialog=Custom PHP Syntax File:
-PHPEditorSyntaxPreferencePage.browse=Browse..
-PHPEditorSyntaxPreferencePage.textfont=Text font
-
-PHPLanguagePreferencePage.description=PHP Editor Language
-PHPLanguagePreferencePage.preflingo=PHP Language Preference
-PHPLanguagePreferencePage.choose=Choose Language
-PHPLanguagePreferencePage.english=English
-PHPLanguagePreferencePage.german=German
-PHPLanguagePreferencePage.french=French
-PHPLanguagePreferencePage.spanish=Spanish
-PHPLanguagePreferencePage.japanese=Japanese
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_es_ES.properties b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/newPHPPreferencesMessages_es_ES.properties
deleted file mode 100644 (file)
index 7b50c6c..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-#########################################
-# PHPProjectLibraryPage
-#########################################
-
-PHPProjectLibraryPage.elementNotIProject=ERROR: El elemento no es IProject
-PHPProjectLibraryPage.project=Proyecto
-PHPProjectLibraryPage.tabName=Proyectos
-
-
-#########################################
-# Property Pages
-#########################################
-
-PHPProjectPropertyPage.phpProjectClosed=El proyecto seleccionado es un proyecto PHP, pero está cerrado.
-PHPProjectPropertyPage.performOkExceptionDialogTitle=No se pudo guardar.
-PHPProjectPropertyPage.performOkExceptionDialogMessage=ERROR: No se pudo guardar las propiedades del proyecto.
-
-PHPObfuscatorPropertyPage.hasnature=Is PHP project.
-PHPObfuscatorPropertyPage.publish=Obfuscator directory:
-PHPObfuscatorPropertyPage.dialogtitle=PHP 
-PHPObfuscatorPropertyPage.projecterror=Could not create the new project.
-PHPObfuscatorPropertyPage.properties=PHP Obfuscator Project Properties
-
-#########################################
-# Preference Pages
-#########################################
-PHPBasePreferencePage.description=Preferencias PHP
-PHPBasePreferencePage.websettingsGroup=Configuración Webserver
-PHPBasePreferencePage.websettingsGroup.localhost=Localhost
-PHPBasePreferencePage.websettingsGroup.docroot=DocumentRoot
-PHPBasePreferencePage.websettingsGroup.browser=Comando navegador externo
-PHPBasePreferencePage.websettingsGroup.useexternal=Usar navegador externo
-PHPBasePreferencePage.websettingsGroup.showexternalpreview=Show preview on editor load (win32 only)
-PHPBasePreferencePage.apacheGroup=Configuración Apache
-PHPBasePreferencePage.apacheGroup.run=Apache
-PHPBasePreferencePage.apacheGroup.start=Arranchar Apache
-PHPBasePreferencePage.apacheGroup.start_background=Run in background mode
-PHPBasePreferencePage.apacheGroup.stop=Parar Apache
-PHPBasePreferencePage.apacheGroup.stop_background=Run in background mode
-PHPBasePreferencePage.apacheGroup.restart=Reiniciar Apache
-PHPBasePreferencePage.apacheGroup.restart_background=Run in background mode
-PHPBasePreferencePage.console.php=Run PHP command
-PHPBasePreferencePage.mySQLGroup=Configuración MySQL
-PHPBasePreferencePage.mySQLGroup.run=MySQL
-PHPBasePreferencePage.mySQLGroup.start_background=Run in background mode
-PHPBasePreferencePage.mySQLGroup.command=Arranchar MySQL
-
-PHPBasePreferencePage.console.php=Run PHP command
-
-PHPBasePreferencePage.parsers=Configuración Parser
-PHPBasePreferencePage.parsers.pos=Parsear al guardar
-PHPBasePreferencePage.parsers.external=Externo
-PHPBasePreferencePage.parsers.internal=Interno
-PHPBasePreferencePage.parsers.extcommand=Parser command
-PHPBasePreferencePage.parsers.choose=Escoja Parser PHP
-
-PHPEditorSyntaxPreferencePage.description:Preferencias Editor PHP
-PHPEditorSyntaxPreferencePage.background:Background settings
-PHPEditorSyntaxPreferencePage.foreground:Preferencias primer plano
-PHPEditorSyntaxPreferencePage.syntax:Resaltar sintaxis
-PHPEditorSyntaxPreferencePage.color:Color
-PHPEditorSyntaxPreferencePage.bold:Negrita
-PHPEditorSyntaxPreferencePage.italic:Cursiva
-PHPEditorSyntaxPreferencePage.underline:Subrayado
-PHPEditorSyntaxPreferencePage.multiLineComment=Comentario varias líneas
-PHPEditorSyntaxPreferencePage.singleLineComment=Comentario una línia
-PHPEditorSyntaxPreferencePage.keywords=Palabras clave
-PHPEditorSyntaxPreferencePage.variables=Variables
-PHPEditorSyntaxPreferencePage.tags=PHP Tags
-PHPEditorSyntaxPreferencePage.types=Tipos
-PHPEditorSyntaxPreferencePage.functions=Funciones
-PHPEditorSyntaxPreferencePage.constants=Constantes
-PHPEditorSyntaxPreferencePage.strings=Cadenas
-PHPEditorSyntaxPreferencePage.others=Otros
-PHPEditorSyntaxPreferencePage.syntaxdialog=Fichero de sintaxis personalizado:
-PHPEditorSyntaxPreferencePage.browse=Examinar..
-PHPEditorSyntaxPreferencePage.textfont=Fuente del texto
-
-PHPLanguagePreferencePage.description=Idioma editor PHP
-PHPLanguagePreferencePage.preflingo=Configuración idioma PHP
-PHPLanguagePreferencePage.choose=Escoja idioma
-PHPLanguagePreferencePage.english=Inglés
-PHPLanguagePreferencePage.german=Alemán
-PHPLanguagePreferencePage.french=Francés
-PHPLanguagePreferencePage.spanish=Español
-PHPLanguagePreferencePage.japanese=Japonese
\ No newline at end of file
index 3ef3d5f..69e0c0d 100644 (file)
@@ -4,49 +4,36 @@ import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import net.sourceforge.phpeclipse.IPreferenceConstants;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
 public class PHPPreferencesMessages {
 
-  static IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
-  static String resourceBundleName;
-  static {
-    resourceBundleName = store.getString(IPreferenceConstants.RESOURCE_BUNDLE);
-  }
-  private static ResourceBundle resourceBundle = ResourceBundle.getBundle(resourceBundleName);
-
-  private PHPPreferencesMessages() {
-  }
-
-  public static String getString(String key) {
-    try {
-      return resourceBundle.getString(key);
-    } catch (MissingResourceException e) {
-      return '!' + key + '!';
-    }
-  }
-  public static void setResourceBundle(String newResourceBundle) {
-    resourceBundle = ResourceBundle.getBundle(newResourceBundle);
-  }
-
-  public static String getFormattedString(String key, String arg) {
-    return getFormattedString(key, new String[] { arg });
-  }
-
-  public static String getFormattedString(String key, String[] args) {
-    return MessageFormat.format(getString(key), args);
-  }
-
-  public static ResourceBundle getResourceBundle() {
-    return resourceBundle;
-  }
-  
-  public static void switchBundle() {
-       String resourceBundleName = store.getString(IPreferenceConstants.RESOURCE_BUNDLE);
-       resourceBundle = ResourceBundle.getBundle(resourceBundleName);
-       
-  }
+       private static final String RESOURCE_BUNDLE= PHPPreferencesMessages.class.getName();
+       private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
+
+       private PHPPreferencesMessages() {
+       }
+
+       public static String getString(String key) {
+               try {
+                       return fgResourceBundle.getString(key);
+               } catch (MissingResourceException e) {
+                       return '!' + key + '!';
+               }
+       }
+       
+       /**
+        * Gets a string from the resource bundle and formats it with the argument
+        * 
+        * @param key   the string used to get the bundle value, must not be null
+        */
+       public static String getFormattedString(String key, Object arg) {
+               return MessageFormat.format(getString(key), new Object[] { arg });
+       }
+
+
+       /**
+        * Gets a string from the resource bundle and formats it with arguments
+        */     
+       public static String getFormattedString(String key, Object[] args) {
+               return MessageFormat.format(getString(key), args);
+       }
 }
index 058c0da..c3f8d11 100644 (file)
@@ -15,3 +15,69 @@ PHPProjectPropertyPage.phpProjectClosed=The project selected is a PHP project, b
 PHPProjectPropertyPage.performOkExceptionDialogTitle=Unable to save
 PHPProjectPropertyPage.performOkExceptionDialogMessage=ERROR: Unable to save project properties.
 
+PHPObfuscatorPropertyPage.hasnature=Is PHP project.
+PHPObfuscatorPropertyPage.publish=Obfuscator directory:
+PHPObfuscatorPropertyPage.dialogtitle=PHP 
+PHPObfuscatorPropertyPage.projecterror=Could not create the new project.
+PHPObfuscatorPropertyPage.properties=PHP Obfuscator Project Properties
+
+#########################################
+# Preference Pages
+#########################################
+PHPBasePreferencePage.description=PHP Preferences
+PHPBasePreferencePage.websettingsGroup=Webserver Settings
+PHPBasePreferencePage.websettingsGroup.localhost=Localhost
+PHPBasePreferencePage.websettingsGroup.docroot=DocumentRoot
+PHPBasePreferencePage.websettingsGroup.browser=External browser command
+PHPBasePreferencePage.websettingsGroup.useexternal=Use external browser
+PHPBasePreferencePage.websettingsGroup.showexternalpreview=Show preview on editor load (win32 only)
+PHPBasePreferencePage.apacheGroup=Apache Settings
+PHPBasePreferencePage.apacheGroup.run=Apache
+PHPBasePreferencePage.apacheGroup.start=Start Apache
+PHPBasePreferencePage.apacheGroup.start_background=Run in background mode
+PHPBasePreferencePage.apacheGroup.stop=Stop Apache
+PHPBasePreferencePage.apacheGroup.stop_background=Run in background mode
+PHPBasePreferencePage.apacheGroup.restart=Restart Apache
+PHPBasePreferencePage.apacheGroup.restart_background=Run in background mode
+PHPBasePreferencePage.console.php=Run PHP command
+PHPBasePreferencePage.mySQLGroup=MySQL Settings
+PHPBasePreferencePage.mySQLGroup.run=MySQL
+PHPBasePreferencePage.mySQLGroup.start_background=Run in background mode
+PHPBasePreferencePage.mySQLGroup.command=Start MySQL
+PHPBasePreferencePage.parsers=Parsing settings
+PHPBasePreferencePage.parsers.pos=Parse on save
+PHPBasePreferencePage.parsers.external=External
+PHPBasePreferencePage.parsers.internal=Internal
+PHPBasePreferencePage.parsers.extcommand=Parser command
+PHPBasePreferencePage.parsers.choose=Choose PHP Parser
+
+PHPEditorSyntaxPreferencePage.description:PHP Editor Preferences
+PHPEditorSyntaxPreferencePage.background:Background settings
+PHPEditorSyntaxPreferencePage.foreground:Foreground settings
+PHPEditorSyntaxPreferencePage.syntax:Syntax highlighting
+PHPEditorSyntaxPreferencePage.color:Colour
+PHPEditorSyntaxPreferencePage.bold:Bold
+PHPEditorSyntaxPreferencePage.italic:Italic
+PHPEditorSyntaxPreferencePage.underline:Underline
+PHPEditorSyntaxPreferencePage.multiLineComment=Multi-line comment
+PHPEditorSyntaxPreferencePage.singleLineComment=Single-line comment
+PHPEditorSyntaxPreferencePage.tags=PHP Tags
+PHPEditorSyntaxPreferencePage.keywords=Keywords
+PHPEditorSyntaxPreferencePage.variables=Variables
+PHPEditorSyntaxPreferencePage.types=Types
+PHPEditorSyntaxPreferencePage.functions=Functions
+PHPEditorSyntaxPreferencePage.constants=Constants
+PHPEditorSyntaxPreferencePage.strings=Strings
+PHPEditorSyntaxPreferencePage.others=Others
+PHPEditorSyntaxPreferencePage.syntaxdialog=Custom PHP Syntax File:
+PHPEditorSyntaxPreferencePage.browse=Browse..
+PHPEditorSyntaxPreferencePage.textfont=Text font
+
+PHPLanguagePreferencePage.description=PHP Editor Language
+PHPLanguagePreferencePage.preflingo=PHP Language Preference
+PHPLanguagePreferencePage.choose=Choose Language
+PHPLanguagePreferencePage.english=English
+PHPLanguagePreferencePage.german=German
+PHPLanguagePreferencePage.french=French
+PHPLanguagePreferencePage.spanish=Spanish
+PHPLanguagePreferencePage.japanese=Japanese
\ No newline at end of file