diff --git a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java
index 932a5cc61a3b..b12f45dcf35a 100644
--- a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java
+++ b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java
@@ -4,6 +4,7 @@ package com.intellij.openapi.keymap;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.InvalidDataException;
+import com.intellij.openapi.util.NlsSafe;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.registry.RegistryValue;
@@ -55,7 +56,7 @@ public final class KeymapUtil {
   }
 
   @NotNull
-  public static String getShortcutText(@NotNull Shortcut shortcut) {
+  public static @NlsSafe String getShortcutText(@NotNull Shortcut shortcut) {
     String s = "";
 
     if (shortcut instanceof KeyboardShortcut) {
@@ -237,7 +238,7 @@ public final class KeymapUtil {
   }
 
   @NotNull
-  public static String getFirstKeyboardShortcutText(@NotNull AnAction action) {
+  public static @NlsSafe String getFirstKeyboardShortcutText(@NotNull AnAction action) {
     return getFirstKeyboardShortcutText(action.getShortcutSet());
   }
 
diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/Library.java b/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/Library.java
index 70635b6341a6..f9ec99ac6179 100644
--- a/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/Library.java
+++ b/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/Library.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.ProjectModelElement;
 import com.intellij.openapi.roots.RootProvider;
 import com.intellij.openapi.util.JDOMExternalizable;
+import com.intellij.openapi.util.NlsSafe;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
@@ -33,7 +34,7 @@ import org.jetbrains.annotations.Nullable;
 public interface Library extends JDOMExternalizable, Disposable, ProjectModelElement {
   Library[] EMPTY_ARRAY = new Library[0];
 
-  @Nullable
+  @Nullable @NlsSafe
   String getName();
 
   String @NotNull [] getUrls(@NotNull OrderRootType rootType);
diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
index 05d8e1e0126b..8320692a1d02 100644
--- a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
+++ b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
@@ -21,6 +21,8 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.NlsContexts;
+import com.intellij.openapi.util.NlsSafe;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.BranchChangeListener;
@@ -89,7 +91,7 @@ abstract class GitBranchOperation {
   protected abstract void rollback();
 
   @NotNull
-  public abstract String getSuccessMessage();
+  public abstract @NlsContexts.NotificationContent String getSuccessMessage();
 
   @NotNull
   @Nls(capitalization = Nls.Capitalization.Sentence)
@@ -161,7 +163,7 @@ abstract class GitBranchOperation {
   }
 
   @NotNull
-  protected String successfulRepositoriesJoined() {
+  protected @NlsSafe String successfulRepositoriesJoined() {
     return GitUtil.joinToHtml(mySuccessfulRepositories);
   }
   
@@ -177,7 +179,7 @@ abstract class GitBranchOperation {
     return repositories;
   }
 
-  protected void notifySuccess(@NotNull String message) {
+  protected void notifySuccess(@NotNull @NlsContexts.NotificationContent String message) {
     VcsNotifier.getInstance(myProject).notifySuccess(message);
   }