diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-09-20 19:44:02 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-09-20 19:44:02 +0000 |
| commit | c826e5a3416c1f3c8dbb7033620b86752d75f87a (patch) | |
| tree | 24788a89af4f22b77d4795bc494ba83e5fd42dd3 /archiva-modules/archiva-web/archiva-web-common/src | |
| parent | 95e33a55340c3315e3d7547da0ead9e22707ca74 (diff) | |
| download | archiva-c826e5a3416c1f3c8dbb7033620b86752d75f87a.tar.gz archiva-c826e5a3416c1f3c8dbb7033620b86752d75f87a.zip | |
missing i18n change modal header title when asking skipping conflict or not
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1388179 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-web-common/src')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties index 2848daa57..e475ff8e3 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties @@ -100,6 +100,14 @@ skipPackedIndexCreation.help.content=Will prevent creating packed and incrementa 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 |