diff options
author | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
commit | e5266e2343c8d275d79fa0be725180d0fe3a993c (patch) | |
tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /platform/platform-impl/src/com/intellij/ide/passwordSafe/HelpID.java | |
parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
download | idea-e5266e2343c8d275d79fa0be725180d0fe3a993c.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143
Diffstat (limited to 'platform/platform-impl/src/com/intellij/ide/passwordSafe/HelpID.java')
-rw-r--r-- | platform/platform-impl/src/com/intellij/ide/passwordSafe/HelpID.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/HelpID.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/HelpID.java index b05021ff7d72..a805638501be 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/HelpID.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/HelpID.java @@ -24,6 +24,8 @@ import org.jetbrains.annotations.NonNls; * Time: 2:09 PM */ public interface HelpID { - @NonNls String RESET_PASSWORD = "reference_ide_settings_master_password_reset"; - @NonNls String CHANGE_PASSWORD = "reference_settings_password_safe_master_password"; + @NonNls String INIT_PASSWORD = "settings_passwords_master_password_init"; + @NonNls String ENTER_PASSWORD = "settings_passwords_master_password_enter"; + @NonNls String RESET_PASSWORD = "settings_passwords_master_password_reset"; + @NonNls String CHANGE_PASSWORD = "settings_passwords_master_password_change"; } |