MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

vcs: rename "Files Merged with Conflicts" to simply "Conflicts" IDEA-194881

Browse Source 
New name is more easy to read and to understand, while the meaning stays clear.
This commit is contained in:
Kirill Likhodedov
2018-07-03 17:10:06 +03:00
parent 97abc3c5f7
commit b57e22a5ac
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/platform-resources-en/src/messages/VcsBundle.properties
View File

@@ -387,7 +387,7 @@ button.configure.ignored.files=Configure &Ignored Files...
directory.mapping.add.title=Add VCS Directory Mapping
unshelve.changelist.chooser.title=Unshelve Changes to Changelist
retrieving.annotations=Loading Annotations
multiple.file.merge.title=Files Merged with Conflicts
multiple.file.merge.title=Conflicts
multiple.file.merge.properties.title=Files Merged with Property Conflicts
multiple.file.merge.accept.yours=Accept &Yours
multiple.file.merge.accept.theirs=Accept &Theirs

2
plugins/settings-repository/src/BaseRepositoryManager.kt
View File

@@ -169,7 +169,7 @@ fun resolveConflicts(files: List<VirtualFile>, mergeProvider: MergeProvider2): L
var processedFiles: List<VirtualFile>? = null
invokeAndWaitIfNeed {
val fileMergeDialog = MultipleFileMergeDialog(ProjectManager.getInstance().defaultProject, files, mergeProvider, object : MergeDialogCustomizer() {
override fun getMultipleFileDialogTitle() = "Settings Repository: Files Merged with Conflicts"
override fun getMultipleFileDialogTitle() = "Settings Repository: Conflicts"
})
fileMergeDialog.show()
processedFiles = fileMergeDialog.processedFiles