diff options
Diffstat (limited to 'org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/UIText.java')
| -rw-r--r-- | org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/UIText.java | 30 |
1 files changed, 30 insertions, 0 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 a43b81d763..ac3ecd76fa 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 @@ -28,6 +28,18 @@ public class UIText extends NLS { } /** */ + public static String DynamicHistoryMenu_startGitflowReleaseFrom; + + /** */ + public static String FeatureFinishHandler_Conflicts; + + /** */ + public static String FeatureFinishHandler_conflictsWhileMergingFromTo; + + /** */ + public static String FeatureFinishHandler_featureFinishConflicts; + + /** */ public static String FeatureFinishHandler_finishingFeature; /** */ @@ -70,9 +82,15 @@ public class UIText extends NLS { public static String FeatureTrackHandler_trackingFeature; /** */ + public static String HotfixFinishHandler_Conflicts; + + /** */ public static String HotfixFinishHandler_finishingHotfix; /** */ + public static String HotfixFinishHandler_hotfixFinishConflicts; + + /** */ public static String HotfixStartHandler_pleaseProvideANameForTheNewHotfix; /** */ @@ -85,9 +103,15 @@ public class UIText extends NLS { public static String InitHandler_initializing; /** */ + public static String ReleaseFinishHandler_Conflicts; + + /** */ public static String ReleaseFinishHandler_finishingRelease; /** */ + public static String ReleaseFinishHandler_releaseFinishConflicts; + + /** */ public static String ReleaseStartHandler_provideANameForTheNewRelease; /** */ @@ -125,4 +149,10 @@ public class UIText extends NLS { /** */ public static String FeatureCheckoutHandler_cleanupDialog_text; + + /** */ + public static String HotfixFinishOperation_unexpectedConflictsHotfixAborted; + + /** */ + public static String ReleaseFinishOperation_unexpectedConflictsReleaseAborted; } |