managedrepository.actions=Actions
managedrepository.repomerge.dialog.header=Choose a target repository for merging
managedrepository.mergerepo=Merge this repository
+managedrepository.merge.success={0} merged to {1}
+managedrepository.merge.noartifacts=No artifacts to merge from repository {0}
+managedrepository.merge.conflicts.header=Merging {0} to {1}
+managedrepository.merge.conflicts=Merge has {0} conflicts
+managedrepository.merge.domerge=Merge
+managedrepository.merge.domerge.skipconflicts=Merge with skipping conflicts
+
+
# remote repositories screen
remoterepository.downloadremoteindex.now=Download Remote Index Now
}
);
-
-
}
$.tmpl($("#merge-repo-skip-conflicts").html(),
{ artifacts:artifacts, sourceRepository: sourceRepository, targetRepository:targetRepository })
.appendTo( "#dialog-modal-merge-repo-body-text" );
+ $("#dialog-modal-merge-repo-header-title" ).html($.i18n.prop("managedrepository.merge.conflicts.header",sourceRepository,targetRepository));
} else {
doMerge(sourceRepository,targetRepository,false);
}