diff options
9 files changed, 11 insertions, 11 deletions
diff --git a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/UIText.java b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/UIText.java index a436b088e1..fd70717a6e 100644 --- a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/UIText.java +++ b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/UIText.java @@ -72,7 +72,7 @@ public class UIText extends NLS { public static String FeatureRebaseHandler_rebasingFeature; /** */ - public static String FeatureRebaseHandler_problemsOcccurredDuringRebase; + public static String FeatureRebaseHandler_problemsOccurredDuringRebase; /** */ public static String FeatureRebaseHandler_statusWas; diff --git a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureRebaseHandler.java b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureRebaseHandler.java index e8a8b7caae..1c097bc5aa 100644 --- a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureRebaseHandler.java +++ b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/FeatureRebaseHandler.java @@ -84,7 +84,7 @@ public class FeatureRebaseHandler extends AbstractGitFlowHandler { RebaseResult.Status status = operationResult.getStatus(); String pluginId = Activator.getPluginId(); MultiStatus info = new MultiStatus(pluginId, 1, - UIText.FeatureRebaseHandler_problemsOcccurredDuringRebase, null); + UIText.FeatureRebaseHandler_problemsOccurredDuringRebase, null); info.add(new Status(IStatus.WARNING, pluginId, NLS.bind( UIText.FeatureRebaseHandler_statusWas, status.name()))); if (operationResult.getConflicts() != null && !operationResult.getConflicts().isEmpty()) { diff --git a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/uitext.properties b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/uitext.properties index cf3258e26a..634dce78a0 100644 --- a/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/uitext.properties +++ b/org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/uitext.properties @@ -22,7 +22,7 @@ FeatureFinishHandler_rewordSquashedCommitMessage=Reword squashed commit message FeatureRebaseHandler_problemsOccurred=Problems occurred FeatureRebaseHandler_rebaseFailed=Rebase failed. FeatureRebaseHandler_rebasingFeature=Rebasing feature... -FeatureRebaseHandler_problemsOcccurredDuringRebase=Problems occurred during rebase. +FeatureRebaseHandler_problemsOccurredDuringRebase=Problems occurred during rebase. FeatureRebaseHandler_statusWas=Rebase result status was ''{0}''. FeatureStartHandler_pleaseProvideANameForTheNewFeature=Please provide a name for the new feature. FeatureStartHandler_provideFeatureName=Provide feature name diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java index ba6b96436c..185e8b128b 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java @@ -105,7 +105,7 @@ public class GitRepositoriesViewRepoHandlingTest extends refreshAndWait(); final Exception[] exceptions = new Exception[1]; final SWTBotLabel label = getOrOpenView().bot().label( - UIText.RepositoriesView_messsageEmpty); + UIText.RepositoriesView_messageEmpty); Display.getDefault().syncExec(new Runnable() { @Override diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java index 50f4480abf..030550874c 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestBase.java @@ -133,7 +133,7 @@ public abstract class GitRepositoriesViewTestBase extends protected void assertEmpty() throws Exception { final SWTBotView view = getOrOpenView(); - view.bot().label(UIText.RepositoriesView_messsageEmpty); + view.bot().label(UIText.RepositoriesView_messageEmpty); } protected void refreshAndWait() throws Exception { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index 0a66b89de2..8cd3af53cf 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -1654,7 +1654,7 @@ public class UIText extends NLS { public static String ReflogView_CommitMessageColumnHeader; /** */ - public static String RefSelectionDialog_Messsage; + public static String RefSelectionDialog_Message; /** */ public static String RefSelectionDialog_Title; @@ -3741,7 +3741,7 @@ public class UIText extends NLS { public static String RepositoriesView_linkCreate; /** */ - public static String RepositoriesView_messsageEmpty; + public static String RepositoriesView_messageEmpty; /** */ public static String RepositoriesView_NothingToPasteMessage; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/RefSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/RefSelectionDialog.java index 8c673c0584..499f275a2e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/RefSelectionDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/RefSelectionDialog.java @@ -73,6 +73,6 @@ public class RefSelectionDialog extends AbstractBranchSelectionDialog { @Override protected String getMessageText() { - return UIText.RefSelectionDialog_Messsage; + return UIText.RefSelectionDialog_Message; } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java index bf1aade2af..47dea973c4 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java @@ -291,7 +291,7 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource, .grab(true, true).applyTo(infoArea); GridLayoutFactory.swtDefaults().applyTo(infoArea); Label messageLabel = new Label(infoArea, SWT.WRAP); - messageLabel.setText(UIText.RepositoriesView_messsageEmpty); + messageLabel.setText(UIText.RepositoriesView_messageEmpty); messageLabel.setMenu(menu); GridDataFactory.swtDefaults().align(SWT.FILL, SWT.FILL) .grab(true, false).applyTo(messageLabel); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index b98720551b..6bab3fcb28 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -571,7 +571,7 @@ ReflogView_ErrorOnOpenCommit=Error opening commit ReflogView_MessageColumnHeader=Reflog Message ReflogView_CommitColumnHeader=Commit ReflogView_CommitMessageColumnHeader=Commit Message -RefSelectionDialog_Messsage=Select a branch to show the reflog for +RefSelectionDialog_Message=Select a branch to show the reflog for RefSelectionDialog_Title=Reflog Branch Selection RefSpecDialog_AutoSuggestCheckbox=&Automatically suggest a name for the remote tracking branch RefSpecDialog_DestinationFetchLabel=&Tracking branch: @@ -1322,7 +1322,7 @@ RepositoriesView_ExceptionLookingUpRepoMessage=An exception occurred while looki RepositoriesView_linkAdd=Add an existing local Git repository RepositoriesView_linkClone=Clone a Git repository RepositoriesView_linkCreate=Create a new local Git repository -RepositoriesView_messsageEmpty=Select one of the following to add a repository to this view: +RepositoriesView_messageEmpty=Select one of the following to add a repository to this view: RepositoriesView_NothingToPasteMessage=Clipboard contains no data to paste RepositoriesView_PasteRepoAlreadyThere=Repository at location {0} is already in the list RepositoriesView_RemotesNodeText=Remotes |