diff --git a/platform/dvcs-impl/resources/messages/DvcsBundle.properties b/platform/dvcs-impl/resources/messages/DvcsBundle.properties
index 8c6bf4a39203..ada319d3fd6a 100644
--- a/platform/dvcs-impl/resources/messages/DvcsBundle.properties
+++ b/platform/dvcs-impl/resources/messages/DvcsBundle.properties
@@ -28,4 +28,18 @@ clone.test.success.message=Connection successful
 clone.destination.exists.error=The directory {0} already exists. Please choose another directory.
 clone.parent.dir=&Parent Directory:
 clone.parent.missing.error=The parent path {0} must exist.
-clone.testing=Testing {0}
\ No newline at end of file
+clone.testing=Testing {0}
+settings.commit.automatically.on.cherry.pick=Commit automatically on cherry-pick
+settings.add.suffix=Add the 'cherry-picked from <hash>' suffix when picking commits pushed to protected branches
+settings.crlf=Warn if CRLF line separators are about to be committed
+settings.detached.head=Warn when committing in detached HEAD or during rebase
+settings.update.method=Update method:
+settings.auto.update.on.push.rejected=Auto-update if push of the current branch was rejected
+settings.push.dialog=Show Push dialog for Commit and Push
+settings.push.dialog.for.protected.branches=Show Push dialog only when committing to protected branches
+settings.protected.branched=Protected branches:
+settings.credential.helper=Use credential helper
+settings.filter.update.info=Filter Update Project information by paths: 
+settings.supported.for.2.9=Supported for Git 2.9+
+settings.explicitly.check=Explicitly check for incoming commits on remotes: 
+settings.clean.working.tree=Clean working tree using:
\ No newline at end of file
diff --git a/plugins/git4idea/src/git4idea/config/GitVcsPanel.kt b/plugins/git4idea/src/git4idea/config/GitVcsPanel.kt
index e9ec03b039ff..0d9d8978eedc 100644
--- a/plugins/git4idea/src/git4idea/config/GitVcsPanel.kt
+++ b/plugins/git4idea/src/git4idea/config/GitVcsPanel.kt
@@ -190,9 +190,9 @@ internal class GitVcsPanel(private val project: Project,
 
   private fun LayoutBuilder.branchUpdateInfoRow() {
     branchUpdateInfoRow = row {
-      supportedBranchUpLabel = JBLabel("Supported for Git 2.9+")
+      supportedBranchUpLabel = JBLabel(message("settings.supported.for.2.9"))
       cell {
-        label("Explicitly check for incoming commits on remotes: ")
+        label(message("settings.explicitly.check"))
         comboBox(
           EnumComboBoxModel(GitIncomingCheckStrategy::class.java),
           {
@@ -225,29 +225,29 @@ internal class GitVcsPanel(private val project: Project,
       }
     }
     row {
-      checkBox("Commit automatically on cherry-pick",
+      checkBox(message("settings.commit.automatically.on.cherry.pick"),
                { applicationSettings.isAutoCommitOnCherryPick },
                { applicationSettings.isAutoCommitOnCherryPick = it })
     }
     row {
-      checkBox("Add the 'cherry-picked from <hash>' suffix when picking commits pushed to protected branches",
+      checkBox(message("settings.add.suffix"),
                { projectSettings.shouldAddSuffixToCherryPicksOfPublishedCommits() },
                { projectSettings.setAddSuffixToCherryPicks(it) })
     }
     row {
-      checkBox("Warn if CRLF line separators are about to be committed",
+      checkBox(message("settings.crlf"),
                { projectSettings.warnAboutCrlf() },
                { projectSettings.setWarnAboutCrlf(it) })
     }
     row {
-      checkBox("Warn when committing in detached HEAD or during rebase",
+      checkBox(message("settings.detached.head"),
                { projectSettings.warnAboutDetachedHead() },
                { projectSettings.setWarnAboutDetachedHead(it) })
     }
     branchUpdateInfoRow()
     row {
       cell {
-        label("Update method:")
+        label(message("settings.update.method"))
         comboBox(
           CollectionComboBoxModel(getUpdateMethods()),
           { projectSettings.updateMethod },
@@ -258,7 +258,7 @@ internal class GitVcsPanel(private val project: Project,
     }
     row {
       cell {
-        label("Clean working tree using:")
+        label(message("settings.clean.working.tree"))
         buttonGroup({ projectSettings.saveChangesPolicy }, { projectSettings.saveChangesPolicy = it }) {
           GitSaveChangesPolicy.values().forEach { saveSetting ->
             radioButton(saveSetting.name.toLowerCase().capitalize(), saveSetting)
@@ -267,16 +267,16 @@ internal class GitVcsPanel(private val project: Project,
       }
     }
     row {
-      checkBox("Auto-update if push of the current branch was rejected",
+      checkBox(message("settings.auto.update.on.push.rejected"),
                { projectSettings.autoUpdateIfPushRejected() },
                { projectSettings.setAutoUpdateIfPushRejected(it) })
     }
     row {
-      val previewPushOnCommitAndPush = checkBox("Show Push dialog for Commit and Push",
+      val previewPushOnCommitAndPush = checkBox(message("settings.push.dialog"),
                                                 { projectSettings.shouldPreviewPushOnCommitAndPush() },
                                                 { projectSettings.setPreviewPushOnCommitAndPush(it) })
       row {
-        checkBox("Show Push dialog only when committing to protected branches",
+        checkBox(message("settings.push.dialog.for.protected.branches"),
                  { projectSettings.isPreviewPushProtectedOnly },
                  { projectSettings.isPreviewPushProtectedOnly = it })
           .enableIf(previewPushOnCommitAndPush.selected)
@@ -284,7 +284,7 @@ internal class GitVcsPanel(private val project: Project,
     }
     row {
       cell {
-        label("Protected branches:")
+        label(message("settings.protected.branched"))
         val protectedBranchesField = ExpandableTextField(ParametersListUtil.COLON_LINE_PARSER, ParametersListUtil.COLON_LINE_JOINER)
         protectedBranchesField(growX)
           .withBinding<List<String>>(
@@ -297,7 +297,7 @@ internal class GitVcsPanel(private val project: Project,
       }
     }
     row {
-      checkBox("Use credential helper",
+      checkBox(message("settings.credential.helper"),
                { applicationSettings.isUseCredentialHelper },
                { applicationSettings.isUseCredentialHelper = it })
     }
@@ -319,7 +319,7 @@ internal class GitVcsPanel(private val project: Project,
           override fun getDefaultSelectorForeground(): Color = UIUtil.getLabelForeground()
         }.initUi()
 
-        label("Filter Update Project information by paths: ")
+        label(message("settings.filter.update.info"))
 
         component()
           .onIsModified {