diff --git a/java/openapi/resources/messages/JavaBundle.properties b/java/openapi/resources/messages/JavaBundle.properties index a4a34b1ab503..42426036d817 100644 --- a/java/openapi/resources/messages/JavaBundle.properties +++ b/java/openapi/resources/messages/JavaBundle.properties @@ -1627,7 +1627,7 @@ progress.title.detect.overridden.methods=Check overriding methods intention.name.iterate.over=Iterate over {0} advanced.settings.group.compiler=Compiler advanced.setting.compiler.automake.allow.when.app.running=Allow auto-make to start even if developed application is currently running -advanced.setting.compiler.automake.allow.when.app.running.description=Note that automatically started make may eventually delete some classes that are required by the application. +advanced.setting.compiler.automake.allow.when.app.running.description=Automatically started make may eventually delete some classes that are required by the application dialog.title.check.functional.interface.candidates=Check Functional Interface Candidates... popup.title.select.target.code.block=Select Target Code Block target.code.block.presentable.text=Containing block diff --git a/platform/diff-api/resources/messages/DiffBundle.properties b/platform/diff-api/resources/messages/DiffBundle.properties index 63095a3838a2..c79e8daf3ccf 100644 --- a/platform/diff-api/resources/messages/DiffBundle.properties +++ b/platform/diff-api/resources/messages/DiffBundle.properties @@ -254,4 +254,4 @@ blank.diff.recent.content.summary.text.date={0} ({1}) blank.diff.recent.content.summary.text.length.date={0} ({1} symbols, {2}) advanced.settings.vcs=Version Control advanced.setting.show.diff.as.editor.tab=Open Diff as Editor Tab -advanced.setting.show.diff.as.editor.tab.description=If enabled, use editor tabs instead of frame windows to show diff. +advanced.setting.show.diff.as.editor.tab.description=If enabled, use editor tabs instead of frame windows to show Diff diff --git a/platform/platform-api/resources/messages/ApplicationBundle.properties b/platform/platform-api/resources/messages/ApplicationBundle.properties index 64fdbdb52720..6acea9a4658a 100644 --- a/platform/platform-api/resources/messages/ApplicationBundle.properties +++ b/platform/platform-api/resources/messages/ApplicationBundle.properties @@ -781,17 +781,17 @@ search.advanced.settings.nothing.found=Nothing found button.advanced.settings.reset=Reset Setting checkbox.advanced.settings.modified=Show modified only advanced.setting.ide.show.fileType.icon.in.titleBar=Show file type icon in IDE frame header -advanced.setting.ide.show.fileType.icon.in.titleBar.description=On macOS the icon can be used to drag the file to a different application +advanced.setting.ide.show.fileType.icon.in.titleBar.description=On macOS, the icon can be used to drag a file to a different application advanced.setting.ide.max.recent.projects=Maximum number of recent projects advanced.setting.temporary.configurations.limit=Temporary Run/Debug configurations limit -advanced.setting.localHistory.daysToKeep=Duration of storing changes in local history -advanced.setting.localHistory.daysToKeep.description=WARNING: Do not use local history as the primary version control system since it may become corrupted if the IDE hangs. +advanced.setting.localHistory.daysToKeep=Duration of storing changes in Local History +advanced.setting.localHistory.daysToKeep.description=Do not use Local History as the primary version control system since it may become corrupted if the IDE hangs advanced.setting.localHistory.daysToKeep.trailingLabel=days advanced.setting.edit.source.on.enter.key.request.focus.in.editor=Move focus to editor when Enter is pressed advanced.setting.ide.open.readme.md.on.startup=Open README.md file if there are no open files on project startup -advanced.setting.editor.skip.copy.and.cut.for.empty.selection=Don't copy/cut current line when Copy or Cut action is invoked with no selection +advanced.setting.editor.skip.copy.and.cut.for.empty.selection=Don't copy/cut the current line when invoking the Copy or Cut action with no selection advanced.setting.ide.cycle.scrolling=Cyclic scrolling in lists and trees -advanced.setting.ide.cycle.scrolling.description=Select last element when pressing Up on first element, and vice versa +advanced.setting.ide.cycle.scrolling.description=Select the last element when pressing Up on the first element, and vice versa advanced.setting.editor.tab.painting=Tab character rendering advanced.setting.ide.suppress.double.click.handler=Disable double modifier key shortcuts advanced.setting.ide.suppress.double.click.handler.description=Shift-Shift for Search Everywhere, Ctrl-Ctrl for Run Anything @@ -800,7 +800,7 @@ advanced.setting.bigger.font.in.project.view.description=Requires IDE restart advanced.setting.ide.settings.move.mouse.on.default.button=Position mouse cursor on default button in dialogs advanced.setting.ide.usages.page.size=Maximum number of results to show in Find in Path/Show Usages preview advanced.setting.ide.usages.page.size.description=Increasing this limit can significantly increase IDE memory usage -advanced.setting.editor.show.special.chars=Render special characters (control codes, etc) using their Unicode name abbreviations +advanced.setting.editor.show.special.chars=Render special characters, such as control codes, using their Unicode name abbreviations advanced.setting.ide.tree.collapse.recursively=When collapsing a node, also collapse all expanded nodes under it advanced.setting.ide.max.recent.files=Maximum number of recent files advanced.setting.ide.max.recent.locations=Maximum number of recent locations @@ -818,9 +818,9 @@ advanced.setting.terminal.buffer.max.lines.count=Terminal scrollback buffer size advanced.setting.terminal.buffer.max.lines.count.trailingLabel=lines advanced.setting.terminal.escape.moves.focus.to.editor=Move focus to the editor with Escape advanced.setting.editor.reuse.not.modified.tabs=Open declaration source in the same tab -advanced.setting.editor.reuse.not.modified.tabs.description=When navigating to a method/class/variable declaration, the source file that contains the declaration will replace the current tab if there are no changes. +advanced.setting.editor.reuse.not.modified.tabs.description=When navigating to a method/class/variable declaration, the source file that contains the declaration will replace the current tab if there are no changes advanced.setting.editor.open.tabs.in.main.window=Open declaration source called from a detached window in the main IDE window -advanced.setting.editor.open.tabs.in.main.window.description=When navigating to a method/class/variable declaration from a tab in the detached window, new tabs will be opened in the main IDE window. Overrides "Open declaration source in the same tab". +advanced.setting.editor.open.tabs.in.main.window.description=When navigating to a method/class/variable declaration from a tab in the detached window, new tabs will be opened in the main IDE window. Overrides 'Open declaration source in the same tab'. group.advanced.settings.other=Other group.advanced.settings.ide=IDE group.advanced.settings.ui=User Interface diff --git a/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties b/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties index 00c8e58d8165..8f93405a8783 100644 --- a/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties +++ b/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties @@ -1168,15 +1168,15 @@ show.diff.in.editor.tab.got.it.tooltip=To show diff in an editor tab again, use intention.name.rollback.changes.in.current.line=Rollback changes in current line advanced.settings.vcs=Version Control advanced.setting.vcs.annotations.preload=Load file annotations from VCS when file is opened in editor -advanced.setting.vcs.annotations.preload.description=This allows to show them faster on demand. +advanced.setting.vcs.annotations.preload.description=This allows showing them faster on demand advanced.setting.vcs.process.ignored=Highlight ignored files -advanced.setting.vcs.process.ignored.description=Request the list of the ignored files from the VCS and show their status in the IDE. -advanced.setting.vcs.commit.tool.window=Enable Commit toolwindow -advanced.setting.vcs.commit.tool.window.description=Show Local Changes and Shelf tabs in the separate Commit tool window +advanced.setting.vcs.process.ignored.description=Request the list of the ignored files from the VCS and show their status in the IDE +advanced.setting.vcs.commit.tool.window=Enable Commit tool window +advanced.setting.vcs.commit.tool.window.description=Show the Local Changes and Shelf tabs in the separate Commit tool window advanced.setting.vcs.non.modal.commit.toggle.ui=Toggle commit controls -advanced.setting.vcs.non.modal.commit.toggle.ui.description=Hide commit panel and checkboxes after commit is performed, and allow toggling commit UI in Local Changes. +advanced.setting.vcs.non.modal.commit.toggle.ui.description=Hide commit panel and checkboxes after commit is performed and allow toggling commit UI in Local Changes advanced.setting.vcs.push.all.with.commits=Select all repositories with new commits for push -advanced.setting.vcs.push.all.with.commits.description=Preselect all repositories with commits to be pushed by default. +advanced.setting.vcs.push.all.with.commits.description=Preselect all repositories with commits to be pushed by default # sequence.concatenation used to construct generic "A, B, C and D" descriptions. sequence.concatenation.a.and.b={0} and {1} diff --git a/plugins/git4idea/resources/messages/GitBundle.properties b/plugins/git4idea/resources/messages/GitBundle.properties index 489f9353ae4f..554dffdeaca9 100644 --- a/plugins/git4idea/resources/messages/GitBundle.properties +++ b/plugins/git4idea/resources/messages/GitBundle.properties @@ -1392,15 +1392,15 @@ branch.direction.panel.warning.not.synced=Local branch is not in sync with remot advanced.settings.git=Version Control. Git advanced.setting.git.clone.recurse.submodules=Recursively clone submodules in the project -advanced.setting.git.clone.recurse.submodules.description=When enabled, Checkout from Git calls 'git clone --recurse-submodules', i.e. clones the main repository with all submodules if there are any. +advanced.setting.git.clone.recurse.submodules.description=When enabled, Checkout from Git calls 'git clone --recurse-submodules', i.e. clones the main repository with all submodules if there are any advanced.setting.git.use.push.force.with.lease=Use Safe Force Push -advanced.setting.git.use.push.force.with.lease.description=Use '--force-with-lease' when calling force push from IDE instead of just '--force'. +advanced.setting.git.use.push.force.with.lease.description=Use '--force-with-lease' when calling force push from IDE instead of just '--force' advanced.setting.git.update.incoming.outgoing.info=Check for incoming and outgoing commits -advanced.setting.git.update.incoming.outgoing.info.description=Update branches info that have incoming/outgoing commits in the Branches popup. -advanced.setting.git.read.content.with=Apply content transformation when reading from git -advanced.setting.git.read.content.with.description=Use --filters or --textconv flags for git cat-file command when reading file content from git +advanced.setting.git.update.incoming.outgoing.info.description=Update branches info that have incoming/outgoing commits in the Branches popup +advanced.setting.git.read.content.with=Apply content transformation when reading from Git +advanced.setting.git.read.content.with.description=Use '--filters' or '--textconv' flags for 'git cat-file' command when reading file content from Git advanced.setting.git.use.schannel.on.windows=Use Windows certificate store -advanced.setting.git.use.schannel.on.windows.description=Force git to use Windows certificate store to verify SSL connections. Works for Git 2.14 and above. +advanced.setting.git.use.schannel.on.windows.description=Force Git to use Windows certificate store to verify SSL connections. Works for Git 2.14 and above. git.content.transform.none=None git.content.transform.filters=Filters git.content.transform.textconv=TextConv \ No newline at end of file