Skip to content

Commit

Permalink
Update missing localization strings.
Browse files Browse the repository at this point in the history
  • Loading branch information
myabc committed Jul 28, 2008
1 parent 67b6208 commit b5748fd
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 27 deletions.
36 changes: 28 additions & 8 deletions src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.form
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/subversion/ui/checkout/Bundle.properties" key="BK3001" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
<ResourceString bundle="org/netbeans/modules/git/ui/clone/Bundle.properties" key="BK3001" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<AccessibilityProperties>
<Property name="AccessibleContext.accessibleName" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/git/ui/clone/Bundle.properties" key="BK3001" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</AccessibilityProperties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="3" insetsBottom="3" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
Expand All @@ -28,7 +33,10 @@
<Component class="javax.swing.JCheckBox" name="againCheckBox">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/subversion/ui/checkout/Bundle.properties" key="BK3002" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
<ResourceString bundle="" key="BK3002" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="label" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/git/ui/clone/Bundle.properties" key="BK3002" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Constraints>
Expand All @@ -49,10 +57,16 @@
<Component class="javax.swing.JButton" name="openButton">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/subversion/ui/checkout/Bundle.properties" key="BK3003" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
<ResourceString bundle="" key="BK3003" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/subversion/ui/checkout/Bundle.properties" key="TT_OpenProject" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
<ResourceString bundle="" key="TT_OpenProject" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
<Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/git/ui/clone/Bundle.properties" key="BK3003" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="label" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/git/ui/clone/Bundle.properties" key="BK3003" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Constraints>
Expand All @@ -64,10 +78,13 @@
<Component class="javax.swing.JButton" name="createButton">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/subversion/ui/checkout/Bundle.properties" key="BK3004" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
<ResourceString bundle="" key="BK3004" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/subversion/ui/checkout/Bundle.properties" key="TT_CreateProject" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
<ResourceString bundle="" key="TT_CreateProject" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
<Property name="label" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/git/ui/clone/Bundle.properties" key="BK3004" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Constraints>
Expand All @@ -79,10 +96,13 @@
<Component class="javax.swing.JButton" name="closeButton">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/subversion/ui/checkout/Bundle.properties" key="BK3005" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
<ResourceString bundle="" key="BK3005" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/subversion/ui/checkout/Bundle.properties" key="TT_Close" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
<ResourceString bundle="" key="TT_Close" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
<Property name="label" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/git/ui/clone/Bundle.properties" key="BK3005" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Constraints>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,17 @@ private void initComponents() {

setLayout(new java.awt.GridBagLayout());

org.openide.awt.Mnemonics.setLocalizedText(jLabel1, "null");
org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3001")); // NOI18N
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new java.awt.Insets(0, 3, 3, 0);
add(jLabel1, gridBagConstraints);
jLabel1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3001")); // NOI18N

org.openide.awt.Mnemonics.setLocalizedText(againCheckBox, "null");
againCheckBox.setLabel(org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3002")); // NOI18N
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
Expand All @@ -86,6 +88,8 @@ private void initComponents() {

org.openide.awt.Mnemonics.setLocalizedText(openButton, "null");
openButton.setToolTipText("null");
openButton.setActionCommand(org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3003")); // NOI18N
openButton.setLabel(org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3003")); // NOI18N
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
gridBagConstraints.weightx = 1.0;
Expand All @@ -94,12 +98,14 @@ private void initComponents() {

org.openide.awt.Mnemonics.setLocalizedText(createButton, "null");
createButton.setToolTipText("null");
createButton.setLabel(org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3004")); // NOI18N
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(3, 3, 0, 3);
add(createButton, gridBagConstraints);

org.openide.awt.Mnemonics.setLocalizedText(closeButton, "null");
closeButton.setToolTipText("null");
closeButton.setLabel(org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3005")); // NOI18N
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
gridBagConstraints.insets = new java.awt.Insets(3, 3, 0, 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@
import org.netbeans.modules.versioning.spi.VCSContext;

/**
* Clone action for Git:
* Clone an external repository. This invokes a wizard to determine the
* location of the repository and the target location of the repository.
* Clone External action for Git
*
* Cloning an external repository invokes a wizard to determine the location of
* the repository, and to set parameters such as the target location.
*
* @author Padraig O'Briain
*/
Expand Down
11 changes: 3 additions & 8 deletions src/org/netbeans/modules/git/ui/pull/FetchAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,8 @@

/**
* Fetch action for Git:
* git fetch - launch git show (?? -- TODO verify this) to view the dependency tree for the repository
* Pull changes from a remote repository, merge new changes if needed.
* This finds all changes from the repository at the specified path
* or URL and adds them to the local repository.
*
* If the pulled changes add a new head, the head is automatically
* merged, and the result of the merge is committed. Otherwise, the
* working directory is updated.
* git fetch - fetch changes from a specified repository, then execute the
* show command to view the dependency tree for the repository.
*
* @author John Rice
*/
Expand Down Expand Up @@ -115,6 +109,7 @@ static void performFetch(File root, OutputLogger logger) {
}
}

@Override
public boolean isEnabled() {
return GitUtils.getRootFile(context) != null;
}
Expand Down
8 changes: 3 additions & 5 deletions src/org/netbeans/modules/git/ui/pull/PullAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,27 +76,25 @@

/**
* Pull action for Git:
* git pull - pull changes from the specified source
* git pull - fetch from, and merge changes with the specified repository and
* branch.
*
* @author John Rice
*/
public class PullAction extends ContextAction {
private static final String CHANGESET_FILES_PREFIX = "files:"; //NOI18N

public enum PullType {

LOCAL, OTHER
}
{
}

private final VCSContext context;

public PullAction(String name, VCSContext context) {
this.context = context;
putValue(Action.NAME, name);
}

public void performAction(ActionEvent e) {
final File root = GitUtils.getRootFile(context);
if (root == null) {
Expand Down
2 changes: 1 addition & 1 deletion src/org/netbeans/modules/git/ui/pull/PullOtherAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

/**
* Pull Other action for Git:
* git pull - pull changes from the specified source
* git pull - fetch from, and merge changes from an other repository or branch.
*
* @author John Rice
*/
Expand Down
2 changes: 1 addition & 1 deletion src/org/netbeans/modules/git/ui/push/PushAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

/**
* Push action for Git:
* git push - push changes to the specified destination
* git push - push changes to the default destination
*
* @author John Rice
*/
Expand Down

0 comments on commit b5748fd

Please sign in to comment.