From 768cb98336c3a1d8e7f7ddffe2526e37ef6b206a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 2 Oct 2012 15:07:36 +0200 Subject: [PATCH] Mnemonics and layout fix in Create Patch dialog; cleanup --- .../src/messages/VcsBundle.properties | 10 +++++----- .../changes/patch/ApplyPatchDifferentiatedDialog.java | 2 +- .../changes/patch/CreatePatchConfigurationPanel.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties index 3ccbf770ba6a..1e1d895e7620 100644 --- a/platform/platform-resources-en/src/messages/VcsBundle.properties +++ b/platform/platform-resources-en/src/messages/VcsBundle.properties @@ -323,9 +323,7 @@ changes.action.rollback.text=Rollback changes.action.rollback.description=Rollback changes changes.action.setdefaultchangelist.text=Set Active Changelist changes.action.setdefaultchangelist.description=Set changelist to which new changes are placed by default -create.patch.file.name.field=&Patch file name: -create.patch.commit.action.text=Create Patc_h... -create.patch.commit.action.description=Creates a patch from the selected changes +patch.apply.file.name.field=&Patch file name: create.patch.commit.action.title=Create Patch create.patch.error.title=Error creating patch: {0} patch.apply.dialog.title=Apply Patch @@ -424,7 +422,10 @@ changes.remove.active.prompt=Select the changelist to which the changes should b changes.remove.active.empty.prompt=Select the changelist to make active: changes.remove.active.title=Delete Active Changelist create.patch.loading.content.progress=Loading content revisions -create.patch.reverse.patch.checkbox=&Reverse patch +create.patch.reverse.checkbox=&Reverse patch +create.patch.base.revision=&Include base revision text(s) into patch file +create.patch.file.path=&Patch file: +create.patch.encoding=Encoding: committed.changes.refresh.progress=Refreshing VCS history cache.settings.dialog.title=VCS History Cache Settings diff.commit.message.title=Commit Message @@ -555,7 +556,6 @@ line.annotation.aspect.author=Author line.annotation.aspect.date=Date line.annotation.aspect.revision=Revision annotation.commit.number=Commit number -create.patch.file.path=&Patch file: todo.handler.only.skipped=TODO check has skipped {0,choice, 0#|1#one file|2#{0} files}.
\n\ No new, edited, or located in changed fragments TODO items found. todo.handler.only.added=There {0,choice, 0#|1#was one|2#were {0}} added or edited TODO {0,choice, 0#|1#item|2#items} found.
\ diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java index fa756e694778..979949f29b81 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java @@ -390,7 +390,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper { final GridBagConstraints gb = new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(1, 1, 1, 1), 0, 0); - myPatchFileLabel = new JLabel(VcsBundle.message("create.patch.file.name.field")); + myPatchFileLabel = new JLabel(VcsBundle.message("patch.apply.file.name.field")); myPatchFileLabel.setLabelFor(myPatchFile); myCenterPanel.add(myPatchFileLabel, gb); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchConfigurationPanel.java index 0c9aa4e11379..b3b081c14089 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchConfigurationPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchConfigurationPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -150,16 +150,16 @@ public class CreatePatchConfigurationPanel { private void initMainPanel() { myFileNameField = new TextFieldWithBrowseButton(); - myReversePatchCheckbox = new JCheckBox(VcsBundle.message("create.patch.reverse.patch.checkbox")); + myReversePatchCheckbox = new JCheckBox(VcsBundle.message("create.patch.reverse.checkbox")); myEncoding = new JComboBox(); - myIncludeBaseRevisionTextCheckBox = new JCheckBox("Include base revision text(s) into patch file"); + myIncludeBaseRevisionTextCheckBox = new JCheckBox(VcsBundle.message("create.patch.base.revision")); myErrorLabel = new JLabel(); myMainPanel = FormBuilder.createFormBuilder() .addLabeledComponent(VcsBundle.message("create.patch.file.path"), myFileNameField) .addComponent(myReversePatchCheckbox) - .addLabeledComponent("Encoding:", myEncoding) .addComponent(myIncludeBaseRevisionTextCheckBox) + .addLabeledComponent(VcsBundle.message("create.patch.encoding"), myEncoding) .addComponent(myErrorLabel) .getPanel(); }