Skip to content

Commit 8c667d0

Browse files
Merge branch 'abapGit:master' into feature/background-job-implementation
2 parents c09cf6d + c2dc022 commit 8c667d0

File tree

6 files changed

+376
-122
lines changed

6 files changed

+376
-122
lines changed

org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/i18n/Messages.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ public class Messages extends NLS {
7676
public static String AbapGitWizardPageApack_task_validating_package;
7777
public static String AbapGitWizardPageApack_text_no_information_available;
7878
public static String AbapGitWizardPageApack_title;
79-
public static String AbapGitWizardPageBranchAndPackage_chbox_activate;
80-
public static String AbapGitWizardPageBranchAndPackage_chbox_activate_tooltip;
79+
public static String AbapGitWizardPageBranchAndPackage_chbox_pull_after_link;
80+
public static String AbapGitWizardPageBranchAndPackage_chbox_pull_after_link_tooltip;
8181
public static String AbapGitWizardPageBranchAndPackage_btn_browse;
8282
public static String AbapGitWizardPageBranchAndPackage_combobox_branch_message;
8383
public static String AbapGitWizardPageBranchAndPackage_description;
@@ -145,6 +145,7 @@ public class Messages extends NLS {
145145
public static String AbapGitWizardPageSwitch_credentials_description;
146146
public static String AbapGitWizardSwitch_branch_wizard_title;
147147
public static String AbapGitWizardSwitch_branch_package_ref_not_found_error;
148+
public static String AbapGitWizardPageTransportSelection_transport_check;
148149

149150
//ABAPGIT STAGING MESSAGES
150151
public static String AbapGitStaging_no_repository_selected;

org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/i18n/messages.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ AbapGitWizardPageApack_task_transport_layers_differ=Transport layers of packages
7474
AbapGitWizardPageApack_task_validating_package=Validating package {0}
7575
AbapGitWizardPageApack_text_no_information_available=No information available
7676
AbapGitWizardPageApack_title=Package Dependency Resolution
77-
AbapGitWizardPageBranchAndPackage_chbox_activate=Pull after link
78-
AbapGitWizardPageBranchAndPackage_chbox_activate_tooltip=Try to activate all objects during import
77+
AbapGitWizardPageBranchAndPackage_chbox_pull_after_link=Pull after link
78+
AbapGitWizardPageBranchAndPackage_chbox_pull_after_link_tooltip=Pull repository objects after linking completes.
7979
AbapGitWizardPageBranchAndPackage_btn_browse=Browse...
8080
AbapGitWizardPageBranchAndPackage_combobox_branch_message=Specify a branch
8181
AbapGitWizardPageBranchAndPackage_description=Select repository branch, target ABAP package
@@ -138,6 +138,7 @@ AbapGitWizardPageRepositoryAndCredentials_title=Link abapGit Repository
138138
AbapGitWizardPageRepositoryAndCredentials_validate_password_error=Specify password or personal access token
139139
AbapGitWizardPageRepositoryAndCredentials_validate_url_error=Enter a valid Git URL
140140
AbapGitWizardPageRepositoryAndCredentials_validate_user_error=Specify user
141+
AbapGitWizardPageTransportSelection_transport_check=Performing Transport Checks..
141142
AbapGitWizardSwitch_branch_package_ref_not_found_error=Could not find package ref for {0}
142143

143144
AbapGitStaging_no_repository_selected=No Repository Selected

org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizardPageBranchAndPackage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ public void widgetSelected(SelectionEvent e) {
175175
if (!this.pullAction) {
176176
// checkbox for executing pull after repository linking
177177
this.checkbox_lnp = new Button(container, SWT.CHECK);
178-
this.checkbox_lnp.setText(Messages.AbapGitWizardPageBranchAndPackage_chbox_activate);
179-
this.checkbox_lnp.setToolTipText(Messages.AbapGitWizardPageBranchAndPackage_chbox_activate_tooltip);
178+
this.checkbox_lnp.setText(Messages.AbapGitWizardPageBranchAndPackage_chbox_pull_after_link);
179+
this.checkbox_lnp.setToolTipText(Messages.AbapGitWizardPageBranchAndPackage_chbox_pull_after_link_tooltip);
180180
GridDataFactory.swtDefaults().applyTo(this.checkbox_lnp);
181181

182182
this.checkbox_lnp.addSelectionListener(new SelectionAdapter() {

0 commit comments

Comments
 (0)