1.1 --- a/modulemanager/src/org/netbeans/modules/modulemanager/ModuleEnableDisablePanel.form	Tue Oct 11 10:26:58 2011 -0400
     1.2 +++ b/modulemanager/src/org/netbeans/modules/modulemanager/ModuleEnableDisablePanel.form	Tue Oct 11 10:45:01 2011 -0400
     1.3 @@ -25,7 +25,7 @@
     1.4      <Component class="javax.swing.JLabel" name="enableDisableConfirmation">
     1.5        <Properties>
     1.6          <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
     1.7 -          <ResourceString bundle="org/netbeans/modules/autoupdate/catalog/Bundle.properties" key="LBL_ModuleEnableDisablePanel_EnableConfirmation" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;, {arguments})"/>
     1.8 +          <ResourceString bundle="org/netbeans/modules/modulemanager/Bundle.properties" key="LBL_ModuleEnableDisablePanel_EnableConfirmation" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;, {arguments})"/>
     1.9          </Property>
    1.10        </Properties>
    1.11        <Constraints>

     2.1 --- a/modulemanager/src/org/netbeans/modules/modulemanager/ModuleSelectionPanel.form	Tue Oct 11 10:26:58 2011 -0400
     2.2 +++ b/modulemanager/src/org/netbeans/modules/modulemanager/ModuleSelectionPanel.form	Tue Oct 11 10:45:01 2011 -0400
     2.3 @@ -3,7 +3,7 @@
     2.4  <Form version="1.0" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
     2.5    <Properties>
     2.6      <Property name="name" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
     2.7 -      <ResourceString bundle="org/netbeans/modules/autoupdate/catalog/Bundle.properties" key="LBL_ModuleSelectionPanel_Name" replaceFormat="NbBundle.getMessage(ModuleSelectionPanel.class, &quot;{key}&quot;)"/>
     2.8 +      <ResourceString bundle="org/netbeans/modules/modulemanager/Bundle.properties" key="LBL_ModuleSelectionPanel_Name" replaceFormat="NbBundle.getMessage(ModuleSelectionPanel.class, &quot;{key}&quot;)"/>
     2.9      </Property>
    2.10    </Properties>
    2.11    <AuxValues>
    2.12 @@ -22,7 +22,7 @@
    2.13            <ComponentRef name="modulesPane"/>
    2.14          </Property>
    2.15          <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
    2.16 -          <ResourceString bundle="org/netbeans/modules/autoupdate/catalog/Bundle.properties" key="ModuleSelectionPanel_ModuleLabel_text" replaceFormat="org.openide.util.NbBundle.getBundle({sourceFileName}.class).getString(&quot;{key}&quot;)"/>
    2.17 +          <ResourceString bundle="org/netbeans/modules/modulemanager/Bundle.properties" key="ModuleSelectionPanel_ModuleLabel_text" replaceFormat="org.openide.util.NbBundle.getBundle({sourceFileName}.class).getString(&quot;{key}&quot;)"/>
    2.18          </Property>
    2.19        </Properties>
    2.20        <Constraints>
    2.21 @@ -34,7 +34,7 @@
    2.22      <Component class="javax.swing.JButton" name="uninstallButton">
    2.23        <Properties>
    2.24          <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
    2.25 -          <ResourceString bundle="org/netbeans/modules/autoupdate/catalog/Bundle.properties" key="BTN_ModuleSelectionPanel_Uninstall" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    2.26 +          <ResourceString bundle="org/netbeans/modules/modulemanager/Bundle.properties" key="BTN_ModuleSelectionPanel_Uninstall" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    2.27          </Property>
    2.28        </Properties>
    2.29        <Events>
    2.30 @@ -52,7 +52,7 @@
    2.31            <ComponentRef name="descriptionPane"/>
    2.32          </Property>
    2.33          <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
    2.34 -          <ResourceString bundle="org/netbeans/modules/autoupdate/catalog/Bundle.properties" key="LBL_ModuleSelectionPanel_descriptionLabel" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    2.35 +          <ResourceString bundle="org/netbeans/modules/modulemanager/Bundle.properties" key="LBL_ModuleSelectionPanel_descriptionLabel" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    2.36          </Property>
    2.37        </Properties>
    2.38        <Constraints>

     3.1 --- a/modulemanager/src/org/netbeans/modules/modulemanager/ModuleUninstallPanel.form	Tue Oct 11 10:26:58 2011 -0400
     3.2 +++ b/modulemanager/src/org/netbeans/modules/modulemanager/ModuleUninstallPanel.form	Tue Oct 11 10:45:01 2011 -0400
     3.3 @@ -25,7 +25,7 @@
     3.4      <Component class="javax.swing.JLabel" name="uninstallConfirmation">
     3.5        <Properties>
     3.6          <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
     3.7 -          <ResourceString bundle="org/netbeans/modules/autoupdate/catalog/Bundle.properties" key="LBL_ModuleUninstallPanel_UninstallConfirmation" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;, {arguments})"/>
     3.8 +          <ResourceString bundle="org/netbeans/modules/modulemanager/Bundle.properties" key="LBL_ModuleUninstallPanel_UninstallConfirmation" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;, {arguments})"/>
     3.9          </Property>
    3.10        </Properties>
    3.11        <Constraints>

     4.1 --- a/modulemanager/src/org/netbeans/modules/modulemanager/ModulesAndDescription.form	Tue Oct 11 10:26:58 2011 -0400
     4.2 +++ b/modulemanager/src/org/netbeans/modules/modulemanager/ModulesAndDescription.form	Tue Oct 11 10:45:01 2011 -0400
     4.3 @@ -29,10 +29,10 @@
     4.4            </Properties>
     4.5            <AccessibilityProperties>
     4.6              <Property name="AccessibleContext.accessibleName" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
     4.7 -              <ResourceString bundle="org/netbeans/modules/autoupdate/catalog/Bundle.properties" key="ACN_ModulesAndDescription_moduleList" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
     4.8 +              <ResourceString bundle="org/netbeans/modules/modulemanager/Bundle.properties" key="ACN_ModulesAndDescription_moduleList" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
     4.9              </Property>
    4.10              <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
    4.11 -              <ResourceString bundle="org/netbeans/modules/autoupdate/catalog/Bundle.properties" key="ACD_ModulesAndDescription_moduleList" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    4.12 +              <ResourceString bundle="org/netbeans/modules/modulemanager/Bundle.properties" key="ACD_ModulesAndDescription_moduleList" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    4.13              </Property>
    4.14            </AccessibilityProperties>
    4.15            <Events>
    4.16 @@ -76,10 +76,10 @@
    4.17            </Properties>
    4.18            <AccessibilityProperties>
    4.19              <Property name="AccessibleContext.accessibleName" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
    4.20 -              <ResourceString bundle="org/netbeans/modules/autoupdate/catalog/Bundle.properties" key="ACN_ModulesAndiDescription_description" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    4.21 +              <ResourceString bundle="org/netbeans/modules/modulemanager/Bundle.properties" key="ACN_ModulesAndiDescription_description" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    4.22              </Property>
    4.23              <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
    4.24 -              <ResourceString bundle="org/netbeans/modules/autoupdate/catalog/Bundle.properties" key="ACD_ModulesAndiDescription_description" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    4.25 +              <ResourceString bundle="org/netbeans/modules/modulemanager/Bundle.properties" key="ACD_ModulesAndiDescription_description" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    4.26              </Property>
    4.27            </AccessibilityProperties>
    4.28          </Component>
    4.29 @@ -91,7 +91,7 @@
    4.30            <ComponentRef name="description"/>
    4.31          </Property>
    4.32          <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
    4.33 -          <ResourceString bundle="org/netbeans/modules/autoupdate/catalog/Bundle.properties" key="LBL_ModulesAndDescription" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    4.34 +          <ResourceString bundle="org/netbeans/modules/modulemanager/Bundle.properties" key="LBL_ModulesAndDescription" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    4.35          </Property>
    4.36        </Properties>
    4.37        <Constraints>