1.1 --- a/autoproject.core/src/org/netbeans/modules/autoproject/core/Bundle.properties	Wed Nov 16 16:01:54 2011 -0500
     1.2 +++ b/autoproject.core/src/org/netbeans/modules/autoproject/core/Bundle.properties	Wed Nov 16 16:15:27 2011 -0500
     1.3 @@ -9,8 +9,4 @@
     1.4  CMD_deploy=Deploy
     1.5  CMD_redeploy=Redeploy
     1.6  Templates/Project/Standard/auto-project=Automatic Project
     1.7 -DeregisterAction.label=Deregister Automatic Project
     1.8 -DeregisterAction.manual_restore=\
     1.9 -    NetBeans has saved a copy of your old (freeform?) project metadata in nbproject.bak. \
    1.10 -    To use the old metadata, rename this folder back to nbproject and use File > Open.
    1.11  options-export-displayName=Automatic Projects

     2.1 --- a/autoproject.core/src/org/netbeans/modules/autoproject/core/DeregisterAction.java	Wed Nov 16 16:01:54 2011 -0500
     2.2 +++ b/autoproject.core/src/org/netbeans/modules/autoproject/core/DeregisterAction.java	Wed Nov 16 16:15:27 2011 -0500
     2.3 @@ -53,8 +53,9 @@
     2.4  import org.openide.filesystems.FileLock;
     2.5  import org.openide.filesystems.FileObject;
     2.6  import org.openide.filesystems.FileUtil;
     2.7 -import org.openide.util.NbBundle;
     2.8  import org.openide.util.RequestProcessor;
     2.9 +import static org.netbeans.modules.autoproject.core.Bundle.*;
    2.10 +import org.openide.util.NbBundle.Messages;
    2.11  
    2.12  /**
    2.13   * Removes mark that this is an automatic project.
    2.14 @@ -66,11 +67,13 @@
    2.15  
    2.16      private final AutomaticProject p;
    2.17  
    2.18 +    @Messages("DeregisterAction.label=Deregister Automatic Project")
    2.19      public DeregisterAction(AutomaticProject p) {
    2.20 -        super(NbBundle.getMessage(DeregisterAction.class, "DeregisterAction.label"));
    2.21 +        super(DeregisterAction_label());
    2.22          this.p = p;
    2.23      }
    2.24  
    2.25 +    @Messages("DeregisterAction.manual_restore=NetBeans has saved a copy of your old (freeform?) project metadata in nbproject.bak. To use the old metadata, rename this folder back to nbproject and use File > Open.")
    2.26      public void actionPerformed(ActionEvent e) {
    2.27          RequestProcessor.getDefault().post(new Runnable() {
    2.28              public void run() {
    2.29 @@ -92,7 +95,7 @@
    2.30                              // Impossible to even copy children one by one (because parent is marked deleted).
    2.31                              // Punt and ask user to fix it!
    2.32                              DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(
    2.33 -                                    NbBundle.getMessage(DeregisterAction.class, "DeregisterAction.manual_restore"),
    2.34 +                                    DeregisterAction_manual_restore(),
    2.35                                      NotifyDescriptor.WARNING_MESSAGE));
    2.36                          }
    2.37                      }

     3.1 --- a/autoproject.core/src/org/netbeans/modules/autoproject/wizard/AutoProjectPanelVisual.java	Wed Nov 16 16:01:54 2011 -0500
     3.2 +++ b/autoproject.core/src/org/netbeans/modules/autoproject/wizard/AutoProjectPanelVisual.java	Wed Nov 16 16:15:27 2011 -0500
     3.3 @@ -51,7 +51,8 @@
     3.4  import org.openide.WizardDescriptor;
     3.5  import org.openide.WizardValidationException;
     3.6  import org.openide.filesystems.FileUtil;
     3.7 -import org.openide.util.NbBundle;
     3.8 +import static org.netbeans.modules.autoproject.wizard.Bundle.*;
     3.9 +import org.openide.util.NbBundle.Messages;
    3.10  
    3.11  public class AutoProjectPanelVisual extends JPanel implements DocumentListener {
    3.12  
    3.13 @@ -152,9 +153,10 @@
    3.14          panel.fireChangeEvent();
    3.15      }//GEN-LAST:event_browseButtonActionPerformed
    3.16  
    3.17 +    @Messages("AutoProjectPanelVisual.configureDetectors.title=Configure Auto-Detection")
    3.18      private void configureDetectorsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_configureDetectorsButtonActionPerformed
    3.19          DialogDescriptor dd = new DialogDescriptor(new ConfigureDetectorsDialog(),
    3.20 -                NbBundle.getMessage(AutoProjectPanelVisual.class, "AutoProjectPanelVisual.configureDetectors.title"));
    3.21 +                AutoProjectPanelVisual_configureDetectors_title());
    3.22          dd.setOptions(new Object[] {NotifyDescriptor.OK_OPTION});
    3.23          DialogDisplayer.getDefault().createDialog(dd).setVisible(true);
    3.24      }//GEN-LAST:event_configureDetectorsButtonActionPerformed
    3.25 @@ -176,16 +178,20 @@
    3.26          projectLocationLabel.requestFocus();
    3.27      }
    3.28  
    3.29 +    @Messages({
    3.30 +        "ERR_not_a_dir=Project location is not an existing directory.",
    3.31 +        "AutoProjectPanelVisual.nbproject=Already contains NetBeans (freeform?) project metadata; nbproject directory will be moved aside."
    3.32 +    })
    3.33      boolean valid(WizardDescriptor wizardDescriptor) {
    3.34          File f = FileUtil.normalizeFile(new File(projectLocationTextField.getText()).getAbsoluteFile());
    3.35          if (!f.isDirectory()) {
    3.36 -            wizardDescriptor.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, NbBundle.getMessage(AutoProjectPanelVisual.class, "ERR_not_a_dir"));
    3.37 +            wizardDescriptor.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, ERR_not_a_dir());
    3.38              return false;
    3.39          }
    3.40          wizardDescriptor.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, null);
    3.41          if (new File(f, "nbproject/project.xml").isFile()) { // #153232
    3.42              wizardDescriptor.putProperty(WizardDescriptor.PROP_WARNING_MESSAGE,
    3.43 -                    NbBundle.getMessage(AutoProjectPanelVisual.class, "AutoProjectPanelVisual.nbproject"));
    3.44 +                    AutoProjectPanelVisual_nbproject());
    3.45          }
    3.46          return true;
    3.47      }

     4.1 --- a/autoproject.core/src/org/netbeans/modules/autoproject/wizard/AutoProjectWizardIterator.java	Wed Nov 16 16:01:54 2011 -0500
     4.2 +++ b/autoproject.core/src/org/netbeans/modules/autoproject/wizard/AutoProjectWizardIterator.java	Wed Nov 16 16:15:27 2011 -0500
     4.3 @@ -57,8 +57,9 @@
     4.4  import org.openide.filesystems.FileLock;
     4.5  import org.openide.filesystems.FileObject;
     4.6  import org.openide.filesystems.FileUtil;
     4.7 -import org.openide.util.NbBundle;
     4.8  import org.openide.util.RequestProcessor;
     4.9 +import static org.netbeans.modules.autoproject.wizard.Bundle.*;
    4.10 +import org.openide.util.NbBundle.Messages;
    4.11  
    4.12  public class AutoProjectWizardIterator implements WizardDescriptor.InstantiatingIterator {
    4.13      private int index;
    4.14 @@ -76,9 +77,10 @@
    4.15          };
    4.16      }
    4.17  
    4.18 +    @Messages("LBL_CreateProjectStep=Location")
    4.19      private String[] createSteps() {
    4.20          return new String[] {
    4.21 -            NbBundle.getMessage(AutoProjectWizardIterator.class, "LBL_CreateProjectStep")
    4.22 +            LBL_CreateProjectStep()
    4.23          };
    4.24      }
    4.25  

     5.1 --- a/autoproject.core/src/org/netbeans/modules/autoproject/wizard/AutoProjectWizardPanel.java	Wed Nov 16 16:01:54 2011 -0500
     5.2 +++ b/autoproject.core/src/org/netbeans/modules/autoproject/wizard/AutoProjectWizardPanel.java	Wed Nov 16 16:15:27 2011 -0500
     5.3 @@ -56,7 +56,7 @@
     5.4      public Component getComponent() {
     5.5          if (component == null) {
     5.6              component = new AutoProjectPanelVisual(this);
     5.7 -            component.setName(NbBundle.getMessage(AutoProjectWizardPanel.class, "LBL_CreateProjectStep"));
     5.8 +            component.setName(Bundle.LBL_CreateProjectStep());
     5.9          }
    5.10          return component;
    5.11      }

     6.1 --- a/autoproject.core/src/org/netbeans/modules/autoproject/wizard/Bundle.properties	Wed Nov 16 16:01:54 2011 -0500
     6.2 +++ b/autoproject.core/src/org/netbeans/modules/autoproject/wizard/Bundle.properties	Wed Nov 16 16:15:27 2011 -0500
     6.3 @@ -1,11 +1,7 @@
     6.4 -LBL_CreateProjectStep=Location
     6.5  AutoProjectPanelVisual.projectLocationLabel.text=Project &Location:
     6.6  AutoProjectPanelVisual.browseButton.text=Br&owse...
     6.7 -ERR_not_a_dir=Project location is not an existing directory.
     6.8  AutoProjectPanelVisual.configureDetectorsButton.text=&Configure Auto-Detection...
     6.9  AutoProjectPanelVisual.configureDetectorsLabel.text=You can configure the IDE to automatically recognize certain folders as projects.
    6.10 -AutoProjectPanelVisual.configureDetectors.title=Configure Auto-Detection
    6.11 -AutoProjectPanelVisual.nbproject=Already contains NetBeans (freeform?) project metadata; nbproject directory will be moved aside.
    6.12  ConfigureDetectorsDialog.noOption.text=&Disable automatic project detection
    6.13  ConfigureDetectorsDialog.yesOption.text=&Enable automatic project detection
    6.14  ConfigureDetectorsDialog.explanation.text=<html>\